|
@@ -200,113 +200,115 @@
|
|
|
android:background="@drawable/shape_8dp_white"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:id="@+id/ll_fans"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_fans_title"
|
|
|
+ android:layout_width="58dp"
|
|
|
+ android:layout_height="28dp"
|
|
|
+ android:layout_marginStart="29dp"
|
|
|
+ android:layout_marginTop="1dp"
|
|
|
android:gravity="center"
|
|
|
- android:orientation="vertical"
|
|
|
+ android:layout_marginBottom="10dp"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="粉丝"
|
|
|
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
|
|
|
+ android:textColor="@color/color_999999"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_other_info_bg"
|
|
|
app:layout_constraintLeft_toLeftOf="@+id/view_other_info_bg"
|
|
|
- app:layout_constraintRight_toLeftOf="@+id/ll_course_num_completed"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/view_other_info_bg">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_fans_num"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:paddingStart="3dp"
|
|
|
- android:text="0"
|
|
|
- android:textColor="@color/color_333333"
|
|
|
- android:textSize="@dimen/sp_22"
|
|
|
- android:textStyle="bold"
|
|
|
- tools:text="1181" />
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_fans_title"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="28dp"
|
|
|
- android:layout_marginTop="1dp"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="粉丝"
|
|
|
- android:textColor="@color/color_999999"
|
|
|
- android:textSize="@dimen/sp_14" />
|
|
|
-
|
|
|
- </LinearLayout>
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_course_num_completed_title" />
|
|
|
|
|
|
+ <View
|
|
|
+ android:background="@color/color_eaeaea"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/view_other_info_bg"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/view_other_info_bg"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_course_num_completed_title"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_fans_title"
|
|
|
+ android:layout_width="0.5dp"
|
|
|
+ android:layout_height="24dp"/>
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:id="@+id/ll_course_num_completed"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_course_num_completed_title"
|
|
|
+ android:layout_width="58dp"
|
|
|
+ android:layout_height="28dp"
|
|
|
+ android:layout_marginTop="1dp"
|
|
|
android:gravity="center"
|
|
|
- android:orientation="vertical"
|
|
|
- app:layout_constraintLeft_toRightOf="@+id/ll_fans"
|
|
|
- app:layout_constraintRight_toLeftOf="@+id/ll_course_num_not_start"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/ll_fans">
|
|
|
-
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_course_num_completed"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:paddingStart="3dp"
|
|
|
- android:text="0"
|
|
|
- android:textColor="@color/color_333333"
|
|
|
- android:textSize="@dimen/sp_22"
|
|
|
- android:textStyle="bold"
|
|
|
- tools:text="118" />
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="已上课时"
|
|
|
+ android:textColor="@color/color_999999"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_fans_title"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_course_num_not_start_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_course_num_completed_title"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="28dp"
|
|
|
- android:layout_marginTop="1dp"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="已上课时"
|
|
|
- android:textColor="@color/color_999999"
|
|
|
- android:textSize="@dimen/sp_14" />
|
|
|
+ <View
|
|
|
+ android:background="@color/color_eaeaea"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/view_other_info_bg"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/view_other_info_bg"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_course_num_not_start_title"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_course_num_completed_title"
|
|
|
+ android:layout_width="0.5dp"
|
|
|
+ android:layout_height="24dp"/>
|
|
|
|
|
|
|
|
|
- </LinearLayout>
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_course_num_not_start_title"
|
|
|
+ android:layout_width="58dp"
|
|
|
+ android:layout_height="28dp"
|
|
|
+ android:layout_marginEnd="29dp"
|
|
|
+ android:layout_marginTop="1dp"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="未上课时"
|
|
|
+ android:textColor="@color/color_999999"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_course_num_completed_title"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/view_other_info_bg"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:id="@+id/ll_course_num_not_start"
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_fans_num"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:gravity="center"
|
|
|
- android:orientation="vertical"
|
|
|
- app:layout_constraintLeft_toRightOf="@+id/ll_course_num_completed"
|
|
|
- app:layout_constraintRight_toRightOf="@+id/view_other_info_bg"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/ll_fans">
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="0"
|
|
|
+ android:layout_marginBottom="1dp"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/tv_fans_title"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_fans_title"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_fans_title"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_22"
|
|
|
+ android:textStyle="bold"
|
|
|
+ tools:text="1181" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_course_num_not_start"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:paddingStart="3dp"
|
|
|
- android:text="0"
|
|
|
- android:textColor="@color/color_333333"
|
|
|
- android:textSize="@dimen/sp_22"
|
|
|
- android:textStyle="bold"
|
|
|
- tools:text="118" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_course_num_completed"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="0"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_course_num_completed_title"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_completed_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_fans_num"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_22"
|
|
|
+ android:textStyle="bold"
|
|
|
+ tools:text="118" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_course_num_not_start_title"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="28dp"
|
|
|
- android:layout_marginTop="1dp"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="未上课时"
|
|
|
- android:textColor="@color/color_999999"
|
|
|
- android:textSize="@dimen/sp_14" />
|
|
|
|
|
|
- </LinearLayout>
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_course_num_not_start"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="0"
|
|
|
+ app:layout_constraintRight_toRightOf="@+id/tv_course_num_not_start_title"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_not_start_title"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_fans_num"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_22"
|
|
|
+ android:textStyle="bold"
|
|
|
+ tools:text="118" />
|
|
|
|
|
|
|
|
|
<ImageView
|
|
@@ -569,6 +571,7 @@
|
|
|
app:layout_constraintLeft_toRightOf="@+id/tv_live_course"
|
|
|
app:layout_constraintRight_toLeftOf="@+id/tv_piano_course"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
|
|
|
+
|
|
|
<TextView
|
|
|
android:id="@+id/tv_piano_course"
|
|
|
android:layout_width="wrap_content"
|
|
@@ -590,10 +593,10 @@
|
|
|
android:id="@+id/tv_sparing_course_set"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="17dp"
|
|
|
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:textColor="@color/color_333333"
|