Browse Source

修改学生端我的课程页面部分样式

Pq 1 year ago
parent
commit
95be7c34e9

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/LiveCourseFragment.java

@@ -113,7 +113,7 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/MinePracticeCourseFragment.java

@@ -152,7 +152,7 @@ public class MinePracticeCourseFragment extends BaseMVPFragment<FragmentPractice
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseFragment.java

@@ -93,7 +93,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));

+ 36 - 9
student/src/main/res/layout/fragment_live_course_layout.xml

@@ -14,11 +14,24 @@
         android:layout_width="0dp"
         android:layout_height="0dp"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.33" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.66" />
+
     <TextView
         android:id="@+id/tv_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
         android:gravity="center"
@@ -27,15 +40,20 @@
         android:paddingBottom="12dp"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_course_status"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line1"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="2021年9月" />
 
     <TextView
         android:id="@+id/tv_course_status"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
@@ -46,17 +64,21 @@
         android:text="课程状态"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_time"
-        app:layout_constraintRight_toLeftOf="@+id/tv_agency"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line1"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line2"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />
 
     <TextView
         android:id="@+id/tv_agency"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="23dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
         android:gravity="center"
@@ -64,10 +86,15 @@
         android:paddingTop="18dp"
         android:paddingBottom="12dp"
         android:text="全部声部"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_course_status"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line2"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />

+ 36 - 9
student/src/main/res/layout/fragment_piano_room_course_layout.xml

@@ -15,11 +15,24 @@
         android:layout_width="0dp"
         android:layout_height="0dp"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.33" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.66" />
+
     <TextView
         android:id="@+id/tv_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
         android:gravity="center"
@@ -28,15 +41,20 @@
         android:paddingBottom="12dp"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_course_status"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line1"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="2021年9月" />
 
     <TextView
         android:id="@+id/tv_course_status"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
@@ -47,17 +65,21 @@
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         android:text="课程状态"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_time"
-        app:layout_constraintRight_toLeftOf="@+id/tv_agency"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line1"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line2"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />
 
     <TextView
         android:id="@+id/tv_agency"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="23dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
         android:gravity="center"
@@ -67,8 +89,13 @@
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         android:text="全部声部"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_course_status"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line2"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />

+ 36 - 7
student/src/main/res/layout/fragment_practice_course_layout.xml

@@ -14,9 +14,23 @@
         android:layout_width="0dp"
         android:layout_height="0dp"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.33" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.66" />
+
     <TextView
         android:id="@+id/tv_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
@@ -26,14 +40,19 @@
         android:paddingBottom="12dp"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_course_status"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line1"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="2021年9月" />
 
     <TextView
         android:id="@+id/tv_course_status"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
@@ -44,15 +63,20 @@
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         android:text="课程状态"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_time"
-        app:layout_constraintRight_toLeftOf="@+id/tv_agency"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line1"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line2"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />
 
     <TextView
         android:id="@+id/tv_agency"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="6dp"
@@ -63,8 +87,13 @@
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         android:text="全部声部"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-        app:layout_constraintLeft_toRightOf="@+id/tv_course_status"
+        app:layout_constraintLeft_toRightOf="@+id/guide_line2"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_time"
         tools:text="课程状态" />

+ 21 - 2
student/src/main/res/layout/fragment_video_course_layout.xml

@@ -15,11 +15,24 @@
         android:layout_width="0dp"
         android:layout_height="0dp"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.33" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guide_line2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.66" />
+
     <TextView
         android:id="@+id/tv_subject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:drawablePadding="4dp"
         android:gravity="center"
@@ -29,6 +42,12 @@
         android:text="全部声部"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingEnd="10dp"
+        android:paddingStart="10dp"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_constraintRight_toLeftOf="@+id/guide_line1"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/LiveCourseFragment.java

@@ -103,7 +103,7 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java

@@ -108,7 +108,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java

@@ -102,7 +102,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
 
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
-        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
+        mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部状态"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_HAS_NOT_STARTED, "未开始"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_IN_PROGRESS, "进行中"));
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_COMPLETED, "已结束"));