Browse Source

修改样式

Pq 3 months ago
parent
commit
8fbd528226

+ 1 - 1
student/src/main/res/layout/fg_interest_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fg_piano_course_group_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fg_vip_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fragment_group_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fragment_live_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fragment_video_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -146,7 +146,8 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             viewBinding.tvSetHomework.setVisibility(View.VISIBLE);
         }
         //tv_homework_video_empty_text
-        if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT && bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NOT_OVERDUE) {
+        boolean isHomeworkStatusNormal = (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT && bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NOT_OVERDUE);
+        if (isHomeworkStatusNormal) {
             //学员已提交课后作业
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
             viewBinding.llHomeworkVideoContent.removeAllViews();
@@ -172,7 +173,7 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
         } else {
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
-            viewBinding.tvHomeworkSetComment.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkSetComment.setVisibility(isHomeworkStatusNormal ? View.VISIBLE : View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
     }

+ 1 - 1
teacher/src/main/res/layout/activity_assign_homework.xml

@@ -389,7 +389,7 @@
                     android:text="点评作业"
                     android:textColor="@color/color_2dc7aa"
                     android:textSize="@dimen/sp_14"
-                    android:visibility="visible"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

+ 2 - 2
teacher/src/main/res/layout/activity_homework.xml

@@ -35,8 +35,8 @@
         app:tabIndicatorFullWidth="false"
         app:tabIndicatorHeight="4dp"
         app:tabMode="scrollable"
-        app:tabPaddingEnd="16dp"
-        app:tabPaddingStart="16dp"
+        app:tabPaddingEnd="20dp"
+        app:tabPaddingStart="20dp"
         app:tabRippleColor="@null"
         app:tabSelectedTextColor="@color/black_333"
         app:tabTextAppearance="@style/tab_layout_style"

+ 1 - 1
teacher/src/main/res/layout/fg_interest_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
teacher/src/main/res/layout/fg_piano_course_group_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
teacher/src/main/res/layout/fg_vip_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 2 - 2
teacher/src/main/res/layout/fragment_course_comment_no_reply_layout.xml

@@ -121,10 +121,10 @@
         app:layout_constraintLeft_toLeftOf="@+id/view_search_bg"
         app:layout_constraintTop_toTopOf="@+id/view_search_bg" />
 
-    <EditText
+    <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 2 - 2
teacher/src/main/res/layout/fragment_course_received_comment_layout.xml

@@ -97,10 +97,10 @@
         app:layout_constraintLeft_toLeftOf="@+id/view_search_bg"
         app:layout_constraintTop_toTopOf="@+id/view_search_bg" />
 
-    <EditText
+    <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 2 - 2
teacher/src/main/res/layout/fragment_homework.xml

@@ -49,11 +49,11 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"
-        android:hint="请输入学生名称"
+        android:hint="请输入学员昵称"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:paddingStart="8dp"

+ 1 - 1
teacher/src/main/res/layout/fragment_live_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
teacher/src/main/res/layout/fragment_video_course_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"