Переглянути джерело

优化首页课程提醒样式

Pq 4 місяців тому
батько
коміт
6fbd20b866

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

@@ -336,13 +336,16 @@
 
                             <TextView
                                 android:id="@+id/tv_live_title"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
+                                android:maxLines="1"
+                                android:ellipsize="end"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="16dp"
                                 android:includeFontPadding="false"
-                                android:text="您有新课程即将开始"
+                                tools:text="您有新课程即将开始您有新课程即将开始您有新课程即将开始您有新课程即将开始"
                                 android:textColor="@color/color_1a1a1a"
                                 android:textSize="@dimen/sp_16"
+                                app:layout_constraintRight_toLeftOf="@+id/tv_enter_room"
                                 app:layout_constraintBottom_toTopOf="@+id/alarm_icon"
                                 app:layout_constraintLeft_toLeftOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"

+ 16 - 13
teacher/src/main/res/layout/fg_new_home_v2_layout.xml

@@ -236,15 +236,18 @@
 
                     <TextView
                         android:id="@+id/tv_live_title"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
+                        android:ellipsize="end"
                         android:includeFontPadding="false"
+                        android:maxLines="1"
                         android:text="您有新课程即将开始"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toTopOf="@+id/alarm_icon"
                         app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_enter_room"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintVertical_chainStyle="packed" />
 
@@ -460,10 +463,10 @@
                     tools:visibility="visible">
 
                     <ImageView
-                        android:layout_marginStart="12dp"
                         android:id="@+id/tv_hot_album_line"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
                         android:src="@drawable/icon_home_hot_album_tag"
                         app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
                         app:layout_constraintLeft_toLeftOf="parent"
@@ -486,6 +489,7 @@
                         android:id="@+id/tv_hot_album_more"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="12dp"
                         android:background="@drawable/shape_1a2dc7aa_10dp"
                         android:drawableEnd="@drawable/icon_arrow_right_green"
                         android:drawablePadding="5dp"
@@ -495,7 +499,6 @@
                         android:paddingEnd="5dp"
                         android:paddingBottom="2dp"
                         android:text="更多"
-                        android:layout_marginEnd="12dp"
                         android:textColor="@color/color_2dc7aa"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
@@ -522,8 +525,8 @@
                     android:layout_marginEnd="14dp"
                     android:background="@drawable/shape_white_10dp"
                     android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
                     android:paddingTop="13dp"
+                    android:paddingEnd="12dp"
                     android:paddingBottom="12dp"
                     android:visibility="visible"
                     app:layout_constraintTop_toBottomOf="@+id/cl_hot_album"
@@ -534,10 +537,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/icon_home_music_tag"
+                        android:drawablePadding="6dp"
                         android:gravity="center"
-                        android:text="曲目"
                         android:includeFontPadding="false"
-                        android:drawablePadding="6dp"
+                        android:text="曲目"
                         android:textColor="@color/color_333333"
                         android:textSize="@dimen/sp_17"
                         android:textStyle="bold"
@@ -566,35 +569,35 @@
                     <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_constraintHorizontal_weight="1"
                         app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/iv_hot_music_song"
                         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:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp"
                         android:adjustViewBounds="true"
                         android:src="@drawable/bg_home_hot_music_song"
-                        app:layout_constraintRight_toLeftOf="@+id/iv_new_music_song"
+                        app:layout_constraintHorizontal_weight="1"
                         app:layout_constraintLeft_toRightOf="@+id/iv_recommend_music_song"
+                        app:layout_constraintRight_toLeftOf="@+id/iv_new_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_constraintHorizontal_weight="1"
                         app:layout_constraintLeft_toRightOf="@+id/iv_hot_music_song"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="@+id/iv_recommend_music_song" />