[AN/USER] feat: 홈화면 필터링 기능을 제공한다 (#600)

android/festago/app/src/main/java/com/festago/festago/data/repository/FestivalDefaultRepository.kt

@@ -4,16 +4,18 @@ import com.festago.festago.data.service.FestivalRetrofitService
 import com.festago.festago.data.util.onSuccessOrCatch
 import com.festago.festago.data.util.runCatchingResponse
 import com.festago.festago.model.Festival
+import com.festago.festago.model.FestivalFilter
 import com.festago.festago.model.Reservation
 import com.festago.festago.repository.FestivalRepository
 import javax.inject.Inject
 
 class FestivalDefaultRepository @Inject constructor(
     private val festivalRetrofitService: FestivalRetrofitService,
 ) : FestivalRepository {
-    override suspend fun loadFestivals(): Result<List<Festival>> =
-        runCatchingResponse { festivalRetrofitService.getFestivals() }
-            .onSuccessOrCatch { it.toDomain() }
+    override suspend fun loadFestivals(festivalFilter: FestivalFilter): Result<List<Festival>> =
+        runCatchingResponse {
+            festivalRetrofitService.getFestivals(festivalFilter.name)
+        }.onSuccessOrCatch { it.toDomain() }
 
     override suspend fun loadFestivalDetail(festivalId: Long): Result<Reservation> =
         runCatchingResponse { festivalRetrofitService.getFestivalDetail(festivalId) }

android/festago/app/src/main/java/com/festago/festago/data/service/FestivalRetrofitService.kt

@@ -5,10 +5,13 @@ import com.festago.festago.data.dto.ReservationFestivalResponse
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface FestivalRetrofitService {
     @GET("/festivals")
-    suspend fun getFestivals(): Response<FestivalsResponse>
+    suspend fun getFestivals(
+        @Query("festivalFilter") festivalFilter: String,
+    ): Response<FestivalsResponse>
 
     @GET("/festivals/{festivalId}")
     suspend fun getFestivalDetail(

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListFragment.kt

@@ -9,6 +9,7 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.festago.festago.R
 import com.festago.festago.databinding.FragmentFestivalListBinding
+import com.festago.festago.model.FestivalFilter
 import com.festago.festago.presentation.ui.home.ticketlist.TicketListFragment
 import com.festago.festago.presentation.ui.ticketreserve.TicketReserveActivity
 import com.festago.festago.presentation.util.repeatOnStarted
@@ -59,6 +60,13 @@ class FestivalListFragment : Fragment(R.layout.fragment_festival_list) {
         adapter = FestivalListAdapter()
         binding.rvFestivalList.adapter = adapter
 
+        initFestivalListSpanSize()
+        initRefresh()
+        initFestivalFilters()
+        vm.loadFestivals(vm.festivalFilter.value)
+    }
+
+    private fun initFestivalListSpanSize() {
         binding.rvFestivalList.layoutManager.apply {
             if (this is GridLayoutManager) {
                 val spanSize = (resources.displayMetrics.widthPixels.dp / 160)
@@ -69,15 +77,25 @@ class FestivalListFragment : Fragment(R.layout.fragment_festival_list) {
                 }
             }
         }
+    }
 
-        vm.loadFestivals()
-
+    private fun initRefresh() {
         binding.srlFestivalList.setOnRefreshListener {
-            vm.loadFestivals()
+            vm.loadFestivals(vm.festivalFilter.value)
             binding.srlFestivalList.isRefreshing = false
         }
     }
 
+    private fun initFestivalFilters() {
+        binding.cgFilterOption.setOnCheckedStateChangeListener { group, _ ->
+            when (group.checkedChipId) {
+                R.id.chipProgress -> vm.loadFestivals(FestivalFilter.PROGRESS)
+                R.id.chipPlanned -> vm.loadFestivals(FestivalFilter.PLANNED)
+                R.id.chipEnd -> vm.loadFestivals(FestivalFilter.END)
+            }
+        }
+    }
+
     private fun updateUi(uiState: FestivalListUiState) {
         when (uiState) {
             is FestivalListUiState.Loading,

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/festivallist/FestivalListViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.festago.festago.analytics.AnalyticsHelper
 import com.festago.festago.analytics.logNetworkFailure
+import com.festago.festago.model.FestivalFilter
 import com.festago.festago.presentation.ui.home.festivallist.FestivalListEvent.ShowTicketReserve
 import com.festago.festago.repository.FestivalRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -28,9 +29,13 @@ class FestivalListViewModel @Inject constructor(
     private val _event = MutableSharedFlow<FestivalListEvent>()
     val event: SharedFlow<FestivalListEvent> = _event.asSharedFlow()
 
-    fun loadFestivals() {
+    private val _festivalFilter = MutableStateFlow<FestivalFilter>(FestivalFilter.PROGRESS)
+    val festivalFilter: StateFlow<FestivalFilter> = _festivalFilter.asStateFlow()
+
+    fun loadFestivals(festivalFilter: FestivalFilter) {
         viewModelScope.launch {
-            festivalRepository.loadFestivals()
+            _festivalFilter.value = festivalFilter
+            festivalRepository.loadFestivals(festivalFilter)
                 .onSuccess {
                     _uiState.value = FestivalListUiState.Success(
                         festivals = it.map { festival ->

android/festago/app/src/main/res/drawable/bg_chip_festival_list_selected.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/md_theme_light_primary" android:state_selected="true" />
+    <item android:color="@color/white" />
+</selector>

android/festago/app/src/main/res/drawable/img_home_icon.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="160dp"
+    android:height="45dp"
+    android:viewportWidth="804"
+    android:viewportHeight="228">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M0,0h804v228h-804z" />
+    <path
+        android:fillColor="#3377FF"
+        android:pathData="M357.66,170.46C335.01,176.59 310.44,179.66 283.95,179.66C280.59,179.66 278.91,178.03 278.91,174.77V165.56C278.91,161.82 280.64,159.9 284.09,159.81L287.69,159.66V62.12H283.23C280.35,62.12 278.91,60.44 278.91,57.08V47.01C278.91,43.65 280.59,41.97 283.95,41.97H346C349.36,41.97 351.04,43.65 351.04,47.01V57.51C351.04,60.58 349.26,62.12 345.71,62.12H339.52V153.77C345.56,152.62 351.61,151.27 357.66,149.74V101.25H351.47C347.53,101.25 345.56,99.38 345.56,95.64V84.85C345.56,81.11 347.44,79.24 351.18,79.24H357.66V44.56C357.66,40.82 359.43,39.05 362.98,39.24H373.78C377.04,39.24 378.68,41.02 378.68,44.56V176.79C378.68,180.62 376.66,182.59 372.63,182.68H364.57C359.96,182.68 357.66,180.91 357.66,177.36V170.46ZM384.87,44.56C384.87,40.82 386.69,39.05 390.34,39.24H400.99C404.25,39.24 405.89,41.02 405.89,44.56V176.79C405.89,180.62 403.92,182.59 399.98,182.68H391.06C386.93,182.68 384.87,180.86 384.87,177.22V44.56ZM318.07,157.22V62.12H309.29V158.23L318.07,157.22ZM468.21,47.73C468.11,50.8 468.02,53.77 467.92,56.65C514.95,48.11 536.21,77.46 531.7,144.7C531.51,148.15 529.54,149.88 525.8,149.88H512.12C508.57,149.88 507.03,148.06 507.51,144.41C512.22,94.25 498.54,72.72 466.48,79.81C463.7,107.92 457.8,129.79 448.78,145.42C447.14,148.4 444.17,149.88 439.85,149.88H428.05C425.36,149.88 423.82,149.16 423.44,147.72C423.05,146.19 423.29,144.56 424.16,142.83C437.31,120.87 444.02,89.02 444.31,47.3C444.31,43.75 445.99,41.97 449.35,41.97H462.88C466.34,41.97 468.11,43.89 468.21,47.73ZM525.94,158.51C530.45,158.51 532.71,160.43 532.71,164.27V174.63C532.71,178.18 530.98,180 527.52,180.1H429.2C424.88,180.1 422.72,177.84 422.72,173.33V164.7C422.72,160.58 424.78,158.51 428.91,158.51H525.94ZM657.36,78.66C661.01,78.66 662.83,80.29 662.83,83.55V95.21C662.83,99.14 660.96,101.11 657.22,101.11H649.73V176.93C649.73,180.86 647.71,182.83 643.68,182.83H632.45C628.61,182.83 626.7,181.01 626.7,177.36V173.19C598.38,177.51 575.16,179.71 557.02,179.81C552.41,179.81 550.11,177.51 550.11,172.9V48.02C550.11,44.08 552.12,42.12 556.15,42.12H609.71C613.55,42.12 615.47,43.94 615.47,47.59V56.94C615.47,60.68 613.45,62.55 609.42,62.55H572.13V79.24H607.26C610.91,79.24 612.73,81.01 612.73,84.56V93.77C612.73,97.51 610.72,99.38 606.68,99.38H572.13V159.09C591.14,158.99 609.32,156.79 626.7,152.47V44.42C626.7,40.97 628.47,39.24 632.02,39.24H643.83C647.76,39.24 649.73,40.97 649.73,44.42V78.66H657.36ZM766.88,158.37C770.91,158.37 772.93,160.43 772.93,164.56V173.91C772.93,177.74 770.91,179.66 766.88,179.66H677.19C672.88,179.66 670.72,177.55 670.72,173.33V164.56C670.72,160.43 672.78,158.37 676.91,158.37H700.37V100.24C700.37,96.02 702.63,93.91 707.14,93.91H716.78C721.2,93.91 723.41,96.02 723.41,100.24V158.37H766.88ZM767.6,42.12C771.15,42.12 772.93,44.13 772.93,48.16C772.93,83.17 770.24,114.63 764.87,142.54C764.2,146.19 761.75,148.01 757.53,148.01H747.88C745.29,148.01 743.66,147.34 742.98,146C742.31,144.65 742.22,142.88 742.7,140.67C746.54,117.46 748.74,92.67 749.32,66.29C749.61,63.89 748.6,62.69 746.3,62.69H675.47C672.3,62.69 670.72,61.06 670.72,57.8V47.15C670.72,43.8 672.3,42.12 675.47,42.12H767.6Z" />
+    <path android:pathData="M41,184.89C41.05,184.45 41.04,184.02 40.97,183.59L40.91,183.32L40.92,183.33C40.59,181.44 39.55,179.75 37.99,178.56C36.43,177.37 34.46,176.77 32.45,176.86L32.41,176.87L30.36,164.33C32.31,163.79 34,162.59 35.11,160.96C36.22,159.34 36.67,157.39 36.38,155.49C36.05,153.61 35.01,151.91 33.45,150.72C31.9,149.53 29.92,148.93 27.91,149.03L27.87,149.04L25.82,136.49C27.77,135.95 29.46,134.76 30.57,133.13C31.68,131.5 32.13,129.56 31.84,127.66C31.51,125.78 30.47,124.08 28.91,122.89C27.36,121.7 25.38,121.1 23.37,121.2L23.33,121.2L21.28,108.66C23.23,108.12 24.92,106.92 26.03,105.29C27.14,103.67 27.59,101.72 27.3,99.83C26.97,97.94 25.93,96.25 24.38,95.06C22.82,93.87 20.84,93.26 18.83,93.36L18.79,93.37L16.74,80.83C18.69,80.28 20.38,79.09 21.49,77.46C22.6,75.83 23.05,73.89 22.76,71.99C22.71,71.69 22.51,71.41 22.45,71.1L210.16,40.43C210.11,40.66 210.09,40.93 210.13,41.2L210.17,41.38L210.17,41.37L210.18,41.45C210.34,42.44 210.71,43.39 211.26,44.25C211.81,45.1 212.54,45.84 213.39,46.42C214.25,47 215.23,47.42 216.26,47.64C217.29,47.86 218.36,47.89 219.41,47.72L219.49,47.7C219.82,47.65 219.96,47.47 220.28,47.42L222.33,59.97C222.1,59.9 221.86,59.89 221.63,59.93L221.49,59.96C220.33,60.19 219.24,60.65 218.27,61.3C217.3,61.95 216.48,62.78 215.85,63.74C215.23,64.7 214.82,65.77 214.65,66.88C214.48,67.98 214.55,69.11 214.86,70.18L214.85,70.14L214.87,70.22C215.03,71.22 215.39,72.17 215.95,73.02C216.5,73.88 217.22,74.61 218.08,75.2C218.94,75.78 219.91,76.19 220.94,76.41C221.98,76.64 223.05,76.66 224.1,76.49L224.18,76.48C224.5,76.42 224.64,76.24 224.96,76.19L227.01,88.73C226.79,88.66 226.54,88.65 226.31,88.69L226.17,88.72C224.03,89.07 222.1,90.21 220.82,91.89C219.54,93.58 219.01,95.66 219.34,97.69C219.67,99.72 220.84,101.53 222.59,102.72C224.34,103.9 226.52,104.37 228.67,104.02C228.99,103.97 229.13,103.79 229.45,103.74L231.5,116.28C231.27,116.21 231.02,116.19 230.78,116.24L230.66,116.27C229.6,116.44 228.58,116.81 227.66,117.36C226.74,117.9 225.94,118.61 225.31,119.44C224.67,120.28 224.22,121.22 223.96,122.21C223.71,123.21 223.66,124.24 223.82,125.24C223.99,126.24 224.36,127.21 224.92,128.07C225.47,128.93 226.21,129.68 227.07,130.26C227.94,130.85 228.92,131.27 229.96,131.49C231.01,131.72 232.09,131.74 233.15,131.57C233.48,131.52 233.61,131.34 233.94,131.29L235.98,143.83C235.76,143.76 235.52,143.74 235.28,143.79L235.14,143.82L235.06,143.83C234.01,144 233,144.37 232.09,144.9C231.18,145.44 230.39,146.15 229.76,146.97C229.14,147.79 228.68,148.73 228.43,149.71C228.18,150.7 228.13,151.72 228.3,152.71L228.31,152.77L228.34,153.02C228.41,153.47 228.54,153.9 228.73,154.31L228.72,154.28L41,184.89ZM82.79,153.25L86.18,148.61L128.34,141.72L133.03,145.04L82.79,153.25ZM86.86,132.47C85.62,132.67 84.35,132.4 83.34,131.71C82.32,131.02 81.65,129.98 81.45,128.8L79.13,114.58L122.43,107.51L124.75,121.72C124.94,122.9 124.63,124.11 123.89,125.08C123.14,126.06 122.03,126.72 120.79,126.93L86.86,132.47ZM105.95,120.4C106.18,121.79 106.83,123.08 107.84,124.11C108.84,125.13 110.15,125.85 111.6,126.16C113.04,126.47 114.56,126.36 115.96,125.86C117.35,125.35 118.57,124.46 119.45,123.31C120.33,122.16 120.83,120.79 120.89,119.37C120.96,117.96 120.58,116.57 119.81,115.38C119.03,114.18 117.9,113.24 116.55,112.67C115.2,112.09 113.7,111.92 112.23,112.16C110.27,112.5 108.52,113.56 107.34,115.1C106.17,116.64 105.67,118.54 105.95,120.4ZM83.66,124.05L83.66,124.07C83.81,124.99 84.15,125.87 84.66,126.66C85.17,127.45 85.85,128.14 86.64,128.68C87.43,129.22 88.34,129.6 89.29,129.8C90.25,130.01 91.25,130.03 92.22,129.87L92.23,129.87C96.31,129.16 99.09,125.5 98.51,121.63C97.93,117.75 98.51,121.61 98.51,121.61C98.36,120.69 98.02,119.81 97.51,119.02C97,118.22 96.33,117.54 95.53,117C94.74,116.46 93.84,116.08 92.88,115.87C91.92,115.67 90.93,115.64 89.95,115.8L89.94,115.81C87.98,116.15 86.23,117.2 85.05,118.74C83.88,120.29 83.38,122.19 83.66,124.05ZM110.78,119.46C110.7,118.98 110.78,118.48 111,118.04C111.21,117.59 111.57,117.21 112.01,116.95C112.45,116.69 112.96,116.56 113.48,116.57C113.99,116.58 114.49,116.74 114.91,117.02C115.32,117.31 115.64,117.7 115.82,118.16C116,118.62 116.03,119.11 115.9,119.59C115.78,120.07 115.52,120.51 115.14,120.85C114.76,121.19 114.28,121.41 113.77,121.5L113.73,121.5C113.06,121.61 112.37,121.46 111.82,121.09C111.26,120.72 110.9,120.15 110.79,119.51L110.78,119.46ZM88.48,123.1C88.4,122.61 88.48,122.11 88.7,121.66C88.91,121.21 89.27,120.83 89.71,120.57C90.16,120.3 90.67,120.17 91.19,120.18C91.71,120.19 92.21,120.35 92.63,120.64C93.05,120.92 93.37,121.32 93.54,121.78C93.72,122.24 93.75,122.74 93.63,123.22C93.5,123.7 93.23,124.14 92.85,124.48C92.47,124.82 91.99,125.05 91.47,125.13L91.43,125.14C90.76,125.24 90.07,125.1 89.52,124.72C88.97,124.35 88.6,123.78 88.49,123.14L88.48,123.1ZM78.38,109.99L76.38,97.75L76.37,97.68C76.14,96.28 76.2,94.85 76.56,93.47C76.91,92.08 77.55,90.77 78.43,89.62C79.31,88.46 80.42,87.47 81.7,86.71C82.98,85.96 84.39,85.44 85.87,85.2L85.94,85.19L106.6,81.81L106.68,81.8C112.89,80.79 118.7,84.73 119.65,90.6L119.67,90.67L121.66,102.91L78.38,109.99Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="221.52"
+                android:endY="112.61"
+                android:startX="33.98"
+                android:startY="141.34"
+                android:type="linear">
+                <item
+                    android:color="#FF1563FF"
+                    android:offset="0" />
+                <item
+                    android:color="#BF3377FF"
+                    android:offset="0.99" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>

android/festago/app/src/main/res/drawable/text_chip_festival_list_selected.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:color="@color/white" android:state_selected="true" />
+        <item android:color="@color/black" />
+</selector>

android/festago/app/src/main/res/layout/fragment_festival_list.xml

@@ -15,44 +15,65 @@
         android:layout_height="match_parent"
         tools:context=".presentation.ui.home.festivallist.FestivalListFragment">
 
+        <ImageView
+            android:id="@+id/imgFestagoLogo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/img_home_icon"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/cgFilterOption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingHorizontal="16dp"
             android:paddingTop="12dp"
-            android:visibility="gone"
-            app:checkedChip="@+id/chipOngoing"
-            app:layout_constraintTop_toTopOf="parent"
+            app:checkedChip="@+id/chipProgress"
+            app:layout_constraintTop_toBottomOf="@id/imgFestagoLogo"
+            app:selectionRequired="true"
             app:singleSelection="true">
 
             <com.google.android.material.chip.Chip
-                android:id="@+id/chipOngoing"
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                android:id="@+id/chipProgress"
+                style="@style/chipFesta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/festival_list_chip_progress" />
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chipPlanned"
+                style="@style/chipFesta"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/festival_list_chip_ongoing" />
+                android:text="@string/festival_list_chip_planned" />
 
             <com.google.android.material.chip.Chip
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                android:id="@+id/chipEnd"
+                style="@style/chipFesta"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/festival_list_chip_past" />
+                android:text="@string/festival_list_chip_end" />
         </com.google.android.material.chip.ChipGroup>
 
         <ProgressBar
             android:id="@+id/pbLoading"
             visibility="@{uiState.shouldShowLoading}"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/srlFestivalList"
             app:layout_constraintTop_toBottomOf="@id/cgFilterOption"
             tools:visibility="gone" />
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/srlFestivalList"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -73,10 +94,15 @@
         <TextView
             android:id="@+id/tvErrorOrEmpty"
             visibility="@{uiState.shouldShowError || uiState.shouldShowSuccessAndEmpty}"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@{uiState.shouldShowError ? @string/festival_list_tv_error: @string/festival_list_tv_empty}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cgFilterOption"
+            tools:text="조회된 축제가 없습니다"
             tools:visibility="gone" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

android/festago/app/src/main/res/values/strings.xml

@@ -64,8 +64,9 @@
 
     <!-- Strings related to festival list -->
     <string name="festival_list_tv_date_format">yyyy.MM.dd</string>
-    <string name="festival_list_chip_ongoing">진행중</string>
-    <string name="festival_list_chip_past">지난축제</string>
+    <string name="festival_list_chip_progress">진행중</string>
+    <string name="festival_list_chip_planned">진행 예정</string>
+    <string name="festival_list_chip_end">지난 축제</string>
     <string name="festival_list_tv_error">축제 조회에 실패했습니다.</string>
     <string name="festival_list_tv_empty">조회된 축제가 없습니다.</string>
     <string name="festival_list_tv_date_range_format">%s - %s</string>

android/festago/app/src/main/res/values/style.xml

@@ -22,4 +22,10 @@
         <item name="cornerSize">50%</item>
     </style>
 
+    <style name="chipFesta">
+        <item name="android:checkable">true</item>
+        <item name="chipBackgroundColor">@drawable/bg_chip_festival_list_selected</item>"
+        <item name="android:textColor">@drawable/text_chip_festival_list_selected</item>
+    </style>
+
 </resources>