Browse Source

1.添加训练内容UI

王鹏鹏 2 years ago
parent
commit
7ba09cc2d4

+ 3 - 1
.idea/misc.xml

@@ -40,6 +40,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_right.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_times.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_title.xml" value="0.2165" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_training_content_list.xml" value="0.2345" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_training_content_title.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_work_benches_btn.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/layer_tab_indicator.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio.xml" value="0.2265" />
@@ -56,7 +58,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_brain_ability.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_free_training.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_task.xml" value="0.6" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_content.xml" value="0.21014492753623187" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_content.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.536" />

+ 10 - 0
workbenches/src/main/res/drawable/bg_training_content.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_18px" />
+    <stroke
+        android:width="@dimen/divider_2px"
+        android:color="@color/color_FF4773FF" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 9 - 0
workbenches/src/main/res/drawable/bg_training_content_list.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:bottomLeftRadius="@dimen/divider_20px"
+        android:bottomRightRadius="@dimen/divider_20px" />
+    <solid android:color="@color/color_FFE6ECFF" />
+</shape>

+ 9 - 0
workbenches/src/main/res/drawable/bg_training_content_title.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:topLeftRadius="@dimen/divider_20px"
+        android:topRightRadius="@dimen/divider_20px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 77 - 6
workbenches/src/main/res/layout/fragment_train_content.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
     <data>
@@ -12,14 +12,85 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="训练内容"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/courselayout"
+            style="@style/training_content_title_layout"
+            android:layout_marginStart="@dimen/divider_78px"
+            android:layout_marginEnd="@dimen/divider_40px"
+            android:background="@drawable/bg_training_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@id/weekLayout"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                style="@style/training_content_title_textview"
+                android:text="第一个疗程"
+                app:layout_constraintLeft_toLeftOf="parent"
+                tools:text="第一个疗程" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/training_content_title_arrow"
+                android:src="@mipmap/icon_arrow" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/weekLayout"
+            style="@style/training_content_title_layout"
+            android:layout_marginStart="@dimen/divider_40px"
+            android:layout_marginEnd="@dimen/divider_78px"
+            android:background="@drawable/bg_training_content"
+            app:layout_constraintLeft_toRightOf="@id/courselayout"
+            app:layout_constraintRight_toRightOf="parent"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                style="@style/training_content_title_textview"
+                android:text="第一个疗程"
+                app:layout_constraintLeft_toLeftOf="parent"
+                tools:text="第一个疗程" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/training_content_title_arrow"
+                android:src="@mipmap/icon_arrow" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/contentTitleLayout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_70px"
+            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_marginTop="@dimen/divider_26px"
+            android:layout_marginEnd="@dimen/divider_32px"
+            android:background="@drawable/bg_training_content_title"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/courselayout">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvDate"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_marginEnd="@dimen/divider_32px"
+            android:layout_marginBottom="@dimen/divider_32px"
+            android:background="@drawable/bg_training_content_list"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/contentTitleLayout" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

BIN
workbenches/src/main/res/mipmap-xxhdpi/icon_arrow.png


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

@@ -31,4 +31,6 @@
     <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
     <color name="color_FF416AFF" tools:ignore="ResourceName">#FF416AFF</color>
     <color name="color_B33E3F3E" tools:ignore="ResourceName">#B33E3F3E</color>
+    <color name="color_FF4773FF" tools:ignore="ResourceName">#FF4773FF</color>
+    <color name="color_FFE6ECFF" tools:ignore="ResourceName">#FFE6ECFF</color>
 </resources>

+ 28 - 0
workbenches/src/main/res/values/themes.xml

@@ -70,4 +70,32 @@
         <item name="android:paddingBottom">@dimen/divider_14px</item>
         <item name="android:paddingStart">@dimen/divider_25px</item>
     </style>
+
+    <style name="training_content_title_layout" tools:ignore="ResourceName">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">@dimen/divider_62px</item>
+        <item name="android:layout_marginTop">@dimen/divider_60px</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="background">@drawable/bg_training_content</item>
+    </style>
+
+    <style name="training_content_title_arrow" tools:ignore="ResourceName">
+        <item name="android:layout_width">@dimen/divider_12px</item>
+        <item name="android:layout_height">@dimen/divider_23px</item>
+        <item name="android:layout_marginEnd">@dimen/divider_21px</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+        <item name="layout_constraintRight_toRightOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+    </style>
+
+    <style name="training_content_title_textview" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">@dimen/divider_32px</item>
+        <item name="android:textSize">@dimen/divider_28px</item>
+        <item name="android:textColor">@color/color_FF4A76FF</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+        <item name="layout_constraintLeft_toLeftOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+    </style>
 </resources>