Browse Source

修改部分样式问题

Pq 3 months ago
parent
commit
d28b9abdf3

+ 6 - 6
student/src/main/res/layout/activity_group_course_detail_layout.xml

@@ -201,10 +201,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -285,10 +285,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
@@ -377,10 +377,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

+ 6 - 6
student/src/main/res/layout/activity_homework_detail_layout.xml

@@ -201,10 +201,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -285,10 +285,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
@@ -387,10 +387,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

+ 6 - 6
student/src/main/res/layout/activity_piano_room_course_detail_layout.xml

@@ -201,10 +201,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -285,10 +285,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
@@ -377,10 +377,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

+ 5 - 5
student/src/main/res/layout/activity_sparring_course_detail_layout.xml

@@ -200,7 +200,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="老师评价"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_14"
@@ -268,7 +268,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="学员评价"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_14"
@@ -366,7 +366,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_14"
@@ -450,7 +450,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_14"
@@ -541,7 +541,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_14"

+ 2 - 2
student/src/main/res/layout/fg_new_home_v2_layout.xml

@@ -85,8 +85,8 @@
         android:id="@+id/view_unread_message"
         android:layout_width="@dimen/dp_7"
         android:layout_height="@dimen/dp_7"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginTop="9dp"
+        android:layout_marginRight="9dp"
         android:background="@drawable/bg_red_ovil"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="@+id/im_message"

+ 2 - 2
student/src/main/res/layout/item_piano_course_group_layout.xml

@@ -39,8 +39,8 @@
     <ImageView
         android:src="@drawable/icon_piano_room_course"
         android:id="@+id/iv_avatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title"

+ 2 - 2
student/src/main/res/layout/view_mine_course_tab_layout.xml

@@ -5,8 +5,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
     <TextView
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         tools:text="哈哈"
         android:gravity="center"
         android:layout_gravity="center"

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

@@ -88,7 +88,7 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "琴房课详情");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程组详情");
         viewBinding.toolbarInclude.toolbar.setBackgroundColor(Color.TRANSPARENT);
         viewBinding.scCoursePlan.setOnTouchListener(new SolveEditTextScrollClash(viewBinding.scCoursePlan));
         viewBinding.scCoursePlan.setVerticalScrollBarEnabled(true);

+ 6 - 7
teacher/src/main/res/layout/activity_assign_homework.xml

@@ -208,10 +208,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -297,11 +297,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
-                    android:textStyle="bold"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_video_work_line"
                     app:layout_constraintLeft_toRightOf="@+id/view_video_work_line"
                     app:layout_constraintTop_toTopOf="@+id/view_video_work_line" />
@@ -371,10 +370,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

+ 4 - 4
teacher/src/main/res/layout/activity_group_course_detail_layout.xml

@@ -199,10 +199,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -282,10 +282,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="上课学生"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_student"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_student"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_student" />

+ 4 - 4
teacher/src/main/res/layout/activity_piano_room_detail_layout.xml

@@ -199,10 +199,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -282,10 +282,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="上课学生"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_student"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_student"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_student" />

+ 9 - 9
teacher/src/main/res/layout/activity_sparring_course_detail_layout.xml

@@ -212,7 +212,7 @@
                     android:paddingStart="6dp"
                     android:text="老师评价"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line" />
@@ -293,10 +293,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="学员评价"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_stu_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_stu_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_stu_comment" />
@@ -376,10 +376,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="课后作业"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -460,10 +460,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
@@ -528,10 +528,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="作业点评"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />

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

@@ -78,8 +78,8 @@
             android:id="@+id/view_unread_message"
             android:layout_width="@dimen/dp_7"
             android:layout_height="@dimen/dp_7"
-            android:layout_marginTop="6dp"
-            android:layout_marginRight="6dp"
+            android:layout_marginTop="9dp"
+            android:layout_marginRight="9dp"
             android:background="@drawable/bg_red_ovil"
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="@+id/im_message"

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

@@ -44,7 +44,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/iv_clock_icon" />
 
-    <ImageView
+    <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"

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

@@ -39,8 +39,8 @@
     <ImageView
         android:src="@drawable/icon_piano_room_course"
         android:id="@+id/iv_avatar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title"

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

@@ -5,8 +5,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
     <TextView
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         tools:text="哈哈"
         android:gravity="center"
         android:layout_gravity="center"

+ 1 - 1
teacher/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="menu_mine">我的</string>
     <string name="pay_count_str">%1$s人已购买</string>
     <string name="home_mine_course_str">我的课程</string>
-    <string name="appraisal_str">评价</string>
+    <string name="appraisal_str">评价学员</string>
     <string name="course_not_start_str">未开始</string>
     <string name="course_ing_str">进行中</string>
     <string name="course_is_completed">已结束</string>