|
@@ -108,10 +108,10 @@
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_badge_title" />
|
|
|
|
|
|
<TextView
|
|
|
- android:layout_marginStart="15dp"
|
|
|
android:id="@+id/tv_score_title"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:layout_marginStart="15dp"
|
|
|
android:includeFontPadding="false"
|
|
|
android:text="评分:"
|
|
|
android:textColor="@color/color_666666"
|
|
@@ -454,13 +454,46 @@
|
|
|
app:layout_constraintRight_toRightOf="@+id/view_top_bg"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_mine_style" />
|
|
|
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_sheet_music"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="17dp"
|
|
|
+ android:drawableTop="@drawable/icon_mine_sheet_music"
|
|
|
+ android:drawablePadding="@dimen/dp_3"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:minWidth="@dimen/dp_52"
|
|
|
+ android:text="我的乐谱"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_13"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_mine_page"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_mine_page"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_mine_course"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:drawableTop="@drawable/icon_mine_course"
|
|
|
+ android:drawablePadding="@dimen/dp_3"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:minWidth="@dimen/dp_52"
|
|
|
+ android:text="我的课程"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_13"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_mine_income"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_mine_income"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_sheet_music" />
|
|
|
+
|
|
|
<View
|
|
|
android:id="@+id/top_bottom_view"
|
|
|
android:layout_width="1px"
|
|
|
android:layout_height="1px"
|
|
|
android:layout_marginTop="24dp"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_sheet_music" />
|
|
|
|
|
|
<View
|
|
|
android:id="@+id/view_bottom_bg"
|
|
@@ -493,13 +526,13 @@
|
|
|
android:id="@+id/tv_open_live"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="13dp"
|
|
|
android:drawableTop="@drawable/icon_open_live"
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
android:includeFontPadding="false"
|
|
|
android:text="我的直播"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
- android:layout_marginTop="13dp"
|
|
|
app:layout_constraintLeft_toLeftOf="@+id/view_bottom_bg"
|
|
|
app:layout_constraintRight_toLeftOf="@+id/tv_live_course"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tv_tools_teaching" />
|
|
@@ -513,7 +546,7 @@
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:minWidth="@dimen/dp_48"
|
|
|
+ android:minWidth="@dimen/dp_52"
|
|
|
android:text="直播课"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
@@ -529,61 +562,46 @@
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:minWidth="@dimen/dp_48"
|
|
|
+ android:minWidth="@dimen/dp_52"
|
|
|
android:text="视频课"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/tv_live_course"
|
|
|
- app:layout_constraintRight_toLeftOf="@+id/tv_sheet_music"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_piano_course"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
|
|
|
-
|
|
|
<TextView
|
|
|
- android:id="@+id/tv_sheet_music"
|
|
|
+ android:id="@+id/tv_piano_course"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:drawableTop="@drawable/icon_mine_sheet_music"
|
|
|
+ android:drawableTop="@drawable/icon_mine_piano_course"
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:minWidth="@dimen/dp_48"
|
|
|
- android:text="我的乐谱"
|
|
|
+ android:minWidth="48dp"
|
|
|
+ android:text="云库琴房"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/tv_video_course"
|
|
|
app:layout_constraintRight_toRightOf="@+id/view_bottom_bg"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
|
|
|
|
|
|
+
|
|
|
<TextView
|
|
|
android:id="@+id/tv_sparing_course_set"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="@dimen/dp_17"
|
|
|
android:drawableTop="@drawable/icon_sparing_course_set"
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
+ android:gravity="center"
|
|
|
+ android:layout_marginTop="17dp"
|
|
|
android:includeFontPadding="false"
|
|
|
android:text="陪练课设置"
|
|
|
- android:gravity="center"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
app:layout_constraintLeft_toLeftOf="@+id/tv_open_live"
|
|
|
app:layout_constraintRight_toRightOf="@+id/tv_open_live"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tv_open_live" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_piano_course"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:drawableTop="@drawable/icon_mine_piano_course"
|
|
|
- android:drawablePadding="@dimen/dp_3"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:minWidth="48dp"
|
|
|
- android:text="琴房课"
|
|
|
- android:gravity="center"
|
|
|
- android:textColor="@color/color_333333"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
- app:layout_constraintLeft_toLeftOf="@+id/tv_live_course"
|
|
|
- app:layout_constraintRight_toRightOf="@+id/tv_live_course"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_homework"
|
|
@@ -591,14 +609,14 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:drawableTop="@drawable/icon_mine_homework"
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
+ android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
|
android:minWidth="48dp"
|
|
|
android:text="课后作业"
|
|
|
- android:gravity="center"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
- app:layout_constraintLeft_toLeftOf="@+id/tv_video_course"
|
|
|
- app:layout_constraintRight_toRightOf="@+id/tv_video_course"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_live_course"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_live_course"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
|
|
|
|
|
|
<TextView
|
|
@@ -607,14 +625,14 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:drawableTop="@drawable/icon_mine_course_comment"
|
|
|
android:drawablePadding="@dimen/dp_3"
|
|
|
+ android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
|
android:minWidth="48dp"
|
|
|
- android:gravity="center"
|
|
|
android:text="课后评价"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
- app:layout_constraintLeft_toLeftOf="@+id/tv_sheet_music"
|
|
|
- app:layout_constraintRight_toRightOf="@+id/tv_sheet_music"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_video_course"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_video_course"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
|
|
|
|
|
|
<View
|
|
@@ -632,10 +650,10 @@
|
|
|
android:layout_marginStart="14dp"
|
|
|
android:layout_marginTop="12dp"
|
|
|
android:layout_marginEnd="14dp"
|
|
|
- android:paddingTop="12dp"
|
|
|
- android:paddingBottom="12dp"
|
|
|
android:background="@drawable/bg_white_10dp"
|
|
|
android:orientation="vertical"
|
|
|
+ android:paddingTop="12dp"
|
|
|
+ android:paddingBottom="12dp"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
app:layout_constraintRight_toRightOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/view_bottom_bg">
|
|
@@ -711,15 +729,15 @@
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
<LinearLayout
|
|
|
- android:background="@drawable/shape_8dp_white"
|
|
|
- android:paddingBottom="10dp"
|
|
|
- android:paddingTop="10dp"
|
|
|
- android:orientation="vertical"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="14dp"
|
|
|
android:layout_marginTop="12dp"
|
|
|
android:layout_marginEnd="14dp"
|
|
|
+ android:background="@drawable/shape_8dp_white"
|
|
|
+ android:orientation="vertical"
|
|
|
+ android:paddingTop="10dp"
|
|
|
+ android:paddingBottom="10dp"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/cs_menu_usually">
|
|
|
|
|
|
<TextView
|