[AN/USER] fix: 지역별 필터, 기타 디자인 수정(#969) (#970)

* fix: 지역별 바텀시트 간격 수정 * fix: 지역별 필터 텍스트 색상 수정 * fix: 아티스트 상세에 회색 선 추가 * fix: 하단 네비게이션 회색선 추가 및 아이콘 수정 * fix: 지역별 필터 선택 해제 버그 픽스 * refactor: id 카멜케이스로 수정 * fix: 북마크 아이템 텍스트 잘림 해결 * fix: 요즘 뜨는 축제 텍스트 폰트 수정
woowacourse-teams · May 19, 2024 · 0468778 · 0468778
1 parent 8b995af
commit 0468778
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 18 deletions.
diff --git a/...c/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt b/...c/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt
@@ -202,7 +202,10 @@ class FestivalListFragment : Fragment() {
             items = schoolRegions
             listener = object : RegionBottomSheetDialogFragment.OnRegionSelectListener {
                 override fun onRegionSelect(region: SchoolRegion) {
-                    vm.loadFestivals(festivalFilter, region)
+                    vm.loadFestivals(
+                        festivalFilterUiState = festivalFilter,
+                        schoolRegion = if (region == schoolRegion) null else region,
+                    )
                 }
             }
         }

diff --git a/android/festago/presentation/src/main/res/color/selector_btn_region_color.xml b/android/festago/presentation/src/main/res/color/selector_btn_region_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary_blue_07" android:state_selected="true" />
+    <item android:color="@color/primary_blue_07" android:state_focused="true" />
+    <item android:color="@color/contents_gray_06" />
+</selector>
diff --git a/android/festago/presentation/src/main/res/drawable/ic_bottom_nav_search.xml b/android/festago/presentation/src/main/res/drawable/ic_bottom_nav_search.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,19L14.65,14.65M17,9C17,13.418 13.418,17 9,17C4.582,17 1,13.418 1,9C1,4.582 4.582,1 9,1C13.418,1 17,4.582 17,9Z"
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/android/festago/presentation/src/main/res/layout/activity_home.xml b/android/festago/presentation/src/main/res/layout/activity_home.xml
@@ -19,6 +19,13 @@
             app:navGraph="@navigation/home_graph"
             tools:layout="@layout/fragment_festival_list" />
 
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/md_divider"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            app:dividerColor="@color/background_gray_03"
+            app:layout_constraintBottom_toTopOf="@id/nvHome" />
+
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nvHome"
             style="@style/Widget.MaterialComponents.BottomNavigationView.PrimarySurface"
@@ -30,12 +37,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:menu="@menu/menu_bottom_navigation" />
 
-        <View
-            android:id="@+id/navigationUpperLine"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/background_gray_03"
-            app:layout_constraintTop_toTopOf="@id/nvHome" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/festago/presentation/src/main/res/layout/fragment_artist_detail.xml b/android/festago/presentation/src/main/res/layout/fragment_artist_detail.xml
@@ -130,19 +130,25 @@
             app:layout_constraintTop_toBottomOf="@id/tvArtistName"
             app:singleLine="true" />
 
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/mdDivider"
+            android:layout_width="match_parent"
+            android:layout_height="0.2dp"
+            app:dividerColor="@color/background_gray_03"
+            app:layout_constraintBottom_toTopOf="@id/rvToDoList"
+            app:layout_constraintTop_toBottomOf="@id/llcArtistMedia" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvToDoList"
             visibility="@{uiState.shouldShowSuccess}"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginTop="24dp"
-
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/llcArtistMedia"
+            app:layout_constraintTop_toBottomOf="@id/mdDivider"
             app:layout_constraintVertical_weight="1" />
 
         <TextView

diff --git a/android/festago/presentation/src/main/res/layout/fragment_region_bottom_sheet.xml b/android/festago/presentation/src/main/res/layout/fragment_region_bottom_sheet.xml
@@ -6,14 +6,15 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_region_bottom_sheet">
+        android:background="@drawable/bg_region_bottom_sheet"
+        android:paddingBottom="40dp">
 
         <TextView
             android:id="@+id/tvRegionTitle"
             style="@style/H3Bold18Lh20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="20dp"
             android:layout_marginBottom="8dp"
             android:text="@string/region_bottom_sheet_tv_region"
             android:textColor="@color/contents_gray_07"
@@ -23,9 +24,12 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvRegionList"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:layout_marginTop="40dp"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRegionTitle"
             app:spanCount="5"
             tools:listitem="@layout/item_region" />

diff --git a/android/festago/presentation/src/main/res/layout/item_artist_bookmark.xml b/android/festago/presentation/src/main/res/layout/item_artist_bookmark.xml
@@ -51,7 +51,7 @@
             android:id="@+id/tvFestivalName"
             style="@style/H5Bold14Lh16"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:gravity="center|top"

diff --git a/android/festago/presentation/src/main/res/layout/item_festival_list_popular.xml b/android/festago/presentation/src/main/res/layout/item_festival_list_popular.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/tvPopularFestivalTitle"
-            style="@style/H3Bold18Lh20"
+            style="@style/H1Bold20Lh20"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"

diff --git a/android/festago/presentation/src/main/res/layout/item_region.xml b/android/festago/presentation/src/main/res/layout/item_region.xml
@@ -12,6 +12,7 @@
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="6dp"
         android:layout_marginVertical="8dp"
         android:gravity="center">
 
@@ -24,7 +25,7 @@
             android:paddingHorizontal="16dp"
             android:paddingVertical="4dp"
             android:text="@{item.schoolRegion.name()}"
-            android:textColor="@color/contents_gray_06"
+            android:textColor="@color/selector_btn_region_color"
             tools:text="서울" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>

diff --git a/android/festago/presentation/src/main/res/layout/item_school_bookmark.xml b/android/festago/presentation/src/main/res/layout/item_school_bookmark.xml
@@ -44,7 +44,7 @@
             android:id="@+id/tvFestivalName"
             style="@style/H5Bold14Lh16"
             android:layout_width="wrap_content"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:gravity="center"

diff --git a/android/festago/presentation/src/main/res/menu/menu_bottom_navigation.xml b/android/festago/presentation/src/main/res/menu/menu_bottom_navigation.xml
@@ -11,7 +11,7 @@
     <item
         android:id="@+id/search"
         android:enabled="true"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_bottom_nav_search"
         android:iconTint="@color/contents_gray_07"
         android:menuCategory="secondary"
         android:title="@string/home_bottom_nav_search" />