feat: 축제 이름 말줄임 표시 처리

woowacourse-teams · Mar 4, 2024 · 9a2e0b1 · 9a2e0b1
1 parent 54f5b04
commit 9a2e0b1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/android/festago/presentation/src/main/res/layout/item_artist_detail_festival.xml b/android/festago/presentation/src/main/res/layout/item_artist_detail_festival.xml
@@ -45,9 +45,9 @@
             android:layout_width="56dp"
             android:layout_height="24dp"
             android:background="#FFFA1273"
-            android:visibility="@{LocalDate.now().compareTo(item.endDate) &lt;= 0 ? View.VISIBLE : View.GONE}"
             android:gravity="center"
             android:textColor="@color/background_gray_01"
+            android:visibility="@{LocalDate.now().compareTo(item.endDate) &lt;= 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="D-1" />
@@ -70,14 +70,17 @@
         <TextView
             android:id="@+id/tvFestivalName"
             style="@style/H4Bold16Lh20"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginHorizontal="12dp"
             android:layout_marginTop="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{item.name}"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivFestivalImage"
             app:layout_constraintTop_toTopOf="@+id/ivFestivalImage"
-            tools:text="중앙대학교 청진난만" />
+            tools:text="중앙대학교 청진난만 중앙대학교 천진난만" />
 
         <TextView
             android:id="@+id/tvFestivalSchedule"

diff --git a/android/festago/presentation/src/main/res/layout/item_festival_detail_stage_artist.xml b/android/festago/presentation/src/main/res/layout/item_festival_detail_stage_artist.xml
@@ -40,15 +40,19 @@
         <TextView
             android:id="@+id/tvFestivalName"
             style="@style/B3Medium14Lh14"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:gravity="top|center"
+            android:maxLines="2"
+            android:minLines="2"
             android:text="@{artist.name}"
             android:textColor="@color/contents_gray_07"
-            app:layout_constraintEnd_toEndOf="@id/cvFestivalImage"
-            app:layout_constraintStart_toStartOf="@id/cvFestivalImage"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cvFestivalImage"
-            tools:text="윤하" />
+            tools:text="스트레이 키즈 스트레이 키즈 스트" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/festago/presentation/src/main/res/layout/item_festival_list_festival.xml b/android/festago/presentation/src/main/res/layout/item_festival_list_festival.xml
@@ -69,14 +69,17 @@
         <TextView
             android:id="@+id/tvFestivalName"
             style="@style/H4Bold16Lh20"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginHorizontal="12dp"
             android:layout_marginTop="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{item.name}"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivFestivalImage"
             app:layout_constraintTop_toTopOf="@+id/ivFestivalImage"
-            tools:text="중앙대학교 청진난만" />
+            tools:text="중앙대학교 청진난만 중앙대학교 천진난만" />
 
         <TextView
             android:id="@+id/tvFestivalSchedule"

diff --git a/android/festago/presentation/src/main/res/layout/item_school_detail_festival.xml b/android/festago/presentation/src/main/res/layout/item_school_detail_festival.xml
@@ -45,9 +45,9 @@
             android:layout_width="56dp"
             android:layout_height="24dp"
             android:background="#FFFA1273"
-            android:visibility="@{LocalDate.now().compareTo(item.endDate) &lt;= 0 ? View.VISIBLE : View.GONE}"
             android:gravity="center"
             android:textColor="@color/background_gray_01"
+            android:visibility="@{LocalDate.now().compareTo(item.endDate) &lt;= 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="D-1" />
@@ -70,14 +70,17 @@
         <TextView
             android:id="@+id/tvFestivalName"
             style="@style/H4Bold16Lh20"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginHorizontal="12dp"
             android:layout_marginTop="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{item.name}"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivFestivalImage"
             app:layout_constraintTop_toTopOf="@+id/ivFestivalImage"
-            tools:text="중앙대학교 청진난만" />
+            tools:text="중앙대학교 청진난만 중앙대학교 천진난만" />
 
         <TextView
             android:id="@+id/tvFestivalSchedule"