diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt
index 0cda1e379..c94b81557 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt
+++ b/android/festago/presentation/src/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
new file mode 100644
index 000000000..c178c1e22
--- /dev/null
+++ b/android/festago/presentation/src/main/res/color/selector_btn_region_color.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
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
new file mode 100644
index 000000000..221061ad0
--- /dev/null
+++ b/android/festago/presentation/src/main/res/drawable/ic_bottom_nav_search.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/android/festago/presentation/src/main/res/layout/activity_home.xml b/android/festago/presentation/src/main/res/layout/activity_home.xml
index 3d588a5bf..620ccc73a 100644
--- 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" />
+
+
-
-
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
index d41eead06..2477b67cc 100644
--- 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,6 +130,13 @@
app:layout_constraintTop_toBottomOf="@id/tvArtistName"
app:singleLine="true" />
+
+ android:background="@drawable/bg_region_bottom_sheet"
+ android:paddingBottom="40dp">
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
index 2a8f5c3a8..bf2ee2269 100644
--- 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
index b113e25ad..f407a234a 100644
--- 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 @@
@@ -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="서울" />
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
index 5eaf1851f..e652bd2bf 100644
--- 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
index 7f13e9a02..0b73b26f8 100644
--- 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 @@