|
|
@@ -439,28 +439,34 @@
|
|
|
tools:visibility="visible">
|
|
|
|
|
|
<FrameLayout
|
|
|
- app:layout_constraintLeft_toLeftOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent"
|
|
|
android:id="@+id/fl_statistics_container"
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content" />
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
android:id="@+id/cl_hot_album"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="@dimen/dp_20"
|
|
|
+ android:layout_marginStart="14dp"
|
|
|
+ android:layout_marginTop="@dimen/dp_12"
|
|
|
+ android:layout_marginEnd="14dp"
|
|
|
+ android:background="@drawable/shape_white_10dp"
|
|
|
+ android:paddingStart="12dp"
|
|
|
+ android:paddingEnd="12dp"
|
|
|
+ android:paddingTop="13dp"
|
|
|
+ android:paddingBottom="12dp"
|
|
|
android:visibility="gone"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/cl_home_statistics"
|
|
|
tools:visibility="visible">
|
|
|
|
|
|
- <View
|
|
|
+ <ImageView
|
|
|
android:id="@+id/tv_hot_album_line"
|
|
|
- android:layout_width="4dp"
|
|
|
- android:layout_height="17dp"
|
|
|
- android:layout_marginStart="14dp"
|
|
|
- android:background="@drawable/shape_course_title_tag_bg"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:src="@drawable/icon_home_hot_album_tag"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_hot_album" />
|
|
|
@@ -482,7 +488,6 @@
|
|
|
android:id="@+id/tv_hot_album_more"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginRight="@dimen/dp_14"
|
|
|
android:background="@drawable/shape_1a2dc7aa_10dp"
|
|
|
android:drawableEnd="@drawable/icon_arrow_right_green"
|
|
|
android:drawablePadding="5dp"
|
|
|
@@ -510,6 +515,93 @@
|
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:id="@+id/cl_music"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginStart="14dp"
|
|
|
+ android:layout_marginTop="@dimen/dp_12"
|
|
|
+ android:layout_marginEnd="14dp"
|
|
|
+ android:background="@drawable/shape_white_10dp"
|
|
|
+ android:paddingStart="12dp"
|
|
|
+ android:paddingEnd="12dp"
|
|
|
+ android:paddingTop="13dp"
|
|
|
+ android:paddingBottom="12dp"
|
|
|
+ android:visibility="gone"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/cl_hot_album"
|
|
|
+ tools:visibility="visible">
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_home_music_song"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:drawableStart="@drawable/icon_home_music_tag"
|
|
|
+ android:gravity="center"
|
|
|
+ android:text="曲目"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:drawablePadding="6dp"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_17"
|
|
|
+ android:textStyle="bold"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_music_song_more"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:background="@drawable/shape_1a2dc7aa_10dp"
|
|
|
+ android:drawableEnd="@drawable/icon_arrow_right_green"
|
|
|
+ android:drawablePadding="5dp"
|
|
|
+ android:gravity="center"
|
|
|
+ android:paddingStart="7dp"
|
|
|
+ android:paddingTop="2dp"
|
|
|
+ android:paddingEnd="5dp"
|
|
|
+ android:paddingBottom="2dp"
|
|
|
+ android:text="更多"
|
|
|
+ android:textColor="@color/color_2dc7aa"
|
|
|
+ android:textSize="@dimen/sp_12"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_home_music_song"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_home_music_song" />
|
|
|
+
|
|
|
+ <ImageView
|
|
|
+ android:id="@+id/iv_recommend_music_song"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ app:layout_constraintHorizontal_weight="1"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="13dp"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/iv_hot_music_song"
|
|
|
+ android:src="@drawable/bg_home_recommend_music_song"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_home_music_song" />
|
|
|
+
|
|
|
+ <ImageView
|
|
|
+ android:layout_marginEnd="10dp"
|
|
|
+ android:layout_marginStart="10dp"
|
|
|
+ android:id="@+id/iv_hot_music_song"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ app:layout_constraintHorizontal_weight="1"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ android:src="@drawable/bg_home_hot_music_song"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/iv_new_music_song"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/iv_recommend_music_song"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/iv_recommend_music_song" />
|
|
|
+
|
|
|
+ <ImageView
|
|
|
+ android:id="@+id/iv_new_music_song"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ app:layout_constraintHorizontal_weight="1"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ android:src="@drawable/bg_home_last_new_music_song"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/iv_hot_music_song"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/iv_recommend_music_song" />
|
|
|
+
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
android:id="@+id/cl_recommend_track"
|
