[#15] 검색화면 (SearchScreen) 구현

app/src/main/java/kr/ksw/visitkorea/data/di/DataModule.kt

@@ -11,12 +11,15 @@ import kr.ksw.visitkorea.data.remote.api.AreaCodeApi
 import kr.ksw.visitkorea.data.remote.api.LocationBasedListApi
 import kr.ksw.visitkorea.data.remote.api.RetrofitInterceptor
 import kr.ksw.visitkorea.data.remote.api.SearchFestivalApi
+import kr.ksw.visitkorea.data.remote.api.SearchKeywordApi
 import kr.ksw.visitkorea.data.repository.AreaCodeRepository
 import kr.ksw.visitkorea.data.repository.AreaCodeRepositoryImpl
 import kr.ksw.visitkorea.data.repository.LocationBasedListRepository
 import kr.ksw.visitkorea.data.repository.LocationBasedListRepositoryImpl
 import kr.ksw.visitkorea.data.repository.SearchFestivalRepository
 import kr.ksw.visitkorea.data.repository.SearchFestivalRepositoryImpl
+import kr.ksw.visitkorea.data.repository.SearchKeywordRepository
+import kr.ksw.visitkorea.data.repository.SearchKeywordRepositoryImpl
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -85,4 +88,14 @@ object DataModule {
     fun provideSearchFestivalRepository(searchFestivalApi: SearchFestivalApi): SearchFestivalRepository {
         return SearchFestivalRepositoryImpl(searchFestivalApi)
     }
+
+    @Provides
+    @Singleton
+    fun provideSearchKeywordApi(retrofit: Retrofit): SearchKeywordApi = retrofit.create(SearchKeywordApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideSearchKeywordRepository(searchKeywordApi: SearchKeywordApi): SearchKeywordRepository {
+        return SearchKeywordRepositoryImpl(searchKeywordApi)
+    }
 }

app/src/main/java/kr/ksw/visitkorea/data/paging/source/SearchKeyWordPagingSource.kt

@@ -0,0 +1,40 @@
+package kr.ksw.visitkorea.data.paging.source
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import kr.ksw.visitkorea.data.mapper.toItems
+import kr.ksw.visitkorea.data.remote.api.SearchKeywordApi
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+
+class SearchKeyWordPagingSource(
+    private val searchKeywordApi: SearchKeywordApi,
+    private val keyword: String
+) : PagingSource<Int, LocationBasedDTO>(){
+
+    override fun getRefreshKey(state: PagingState<Int, LocationBasedDTO>): Int? {
+        return state.anchorPosition?.let { anchor ->
+            val anchorPage = state.closestPageToPosition(anchor)
+            anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LocationBasedDTO> {
+        val page = params.key ?: 1
+        val loadSize = params.loadSize
+        val data = try {
+            searchKeywordApi.searchListByKeyword(
+                numOfRows = loadSize,
+                pageNo = page,
+                keyword = keyword
+            ).toItems()
+        } catch (e: Exception) {
+            emptyList()
+        }
+        return LoadResult.Page(
+            data = data,
+            prevKey = if(page == 1 || data.isEmpty()) null else page - 1,
+            nextKey = if(data.size == loadSize && data.isNotEmpty()) page + 1 else null
+        )
+    }
+
+}

app/src/main/java/kr/ksw/visitkorea/data/remote/api/SearchKeywordApi.kt

@@ -0,0 +1,17 @@
+package kr.ksw.visitkorea.data.remote.api
+
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+import kr.ksw.visitkorea.data.remote.model.ApiResponse
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface SearchKeywordApi {
+    @GET("searchKeyword1")
+    suspend fun searchListByKeyword(
+        @Query("arrange") arrange: String = "Q",
+        @Query("numOfRows") numOfRows: Int,
+        @Query("pageNo") pageNo: Int,
+        @Query("keyword") keyword: String,
+        @Query("contentTypeId") contentTypeId: String? = null
+    ): ApiResponse<LocationBasedDTO>
+}

app/src/main/java/kr/ksw/visitkorea/data/repository/SearchFestivalRepository.kt

@@ -3,7 +3,7 @@ package kr.ksw.visitkorea.data.repository
 import kr.ksw.visitkorea.data.remote.dto.SearchFestivalDTO
 
 interface SearchFestivalRepository {
-    suspend operator fun invoke(
+    suspend fun searchFestival(
         numOfRows: Int,
         pageNo: Int,
         eventStartDate: String,

app/src/main/java/kr/ksw/visitkorea/data/repository/SearchFestivalRepositoryImpl.kt

@@ -8,7 +8,7 @@ import javax.inject.Inject
 class SearchFestivalRepositoryImpl @Inject constructor(
     private val searchFestivalApi: SearchFestivalApi
 ): SearchFestivalRepository {
-    override suspend fun invoke(
+    override suspend fun searchFestival(
         numOfRows: Int,
         pageNo: Int,
         eventStartDate: String,

app/src/main/java/kr/ksw/visitkorea/data/repository/SearchKeywordRepository.kt

@@ -0,0 +1,11 @@
+package kr.ksw.visitkorea.data.repository
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+
+interface SearchKeywordRepository {
+    suspend fun getListByKeyword(
+        keyword: String
+    ): Result<Flow<PagingData<LocationBasedDTO>>>
+}

app/src/main/java/kr/ksw/visitkorea/data/repository/SearchKeywordRepositoryImpl.kt

@@ -0,0 +1,41 @@
+package kr.ksw.visitkorea.data.repository
+
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.PagingSource
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.paging.source.SearchKeyWordPagingSource
+import kr.ksw.visitkorea.data.remote.api.SearchKeywordApi
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+import javax.inject.Inject
+
+class SearchKeywordRepositoryImpl @Inject constructor(
+    private val searchKeywordApi: SearchKeywordApi
+) : SearchKeywordRepository {
+    private var pagingSource: PagingSource<Int, LocationBasedDTO>? = null
+
+    override suspend fun getListByKeyword(
+        keyword: String
+    ): Result<Flow<PagingData<LocationBasedDTO>>> = runCatching {
+        pagingSource?.run {
+            if(!invalid) {
+                invalidate()
+            }
+        }
+        Pager(
+            config = PagingConfig(
+                pageSize = 30,
+                initialLoadSize = 30
+            ),
+            pagingSourceFactory = {
+                SearchKeyWordPagingSource(
+                    searchKeywordApi,
+                    keyword,
+                ).also {
+                    pagingSource = it
+                }
+            }
+        ).flow
+    }
+}

app/src/main/java/kr/ksw/visitkorea/domain/di/SearchModule.kt

@@ -0,0 +1,17 @@
+package kr.ksw.visitkorea.domain.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityRetainedComponent
+import kr.ksw.visitkorea.domain.usecase.search.GetListByKeywordUseCase
+import kr.ksw.visitkorea.domain.usecase.search.GetListByKeywordUseCaseImpl
+
+@Module
+@InstallIn(ActivityRetainedComponent::class)
+abstract class SearchModule {
+    @Binds
+    abstract fun bindGetListByKeywordUseCase(
+        getListByKeywordUseCase: GetListByKeywordUseCaseImpl
+    ): GetListByKeywordUseCase
+}

app/src/main/java/kr/ksw/visitkorea/domain/usecase/search/GetListByKeywordUseCase.kt

@@ -0,0 +1,11 @@
+package kr.ksw.visitkorea.domain.usecase.search
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+
+interface GetListByKeywordUseCase {
+    suspend operator fun invoke(
+        keyword: String
+    ): Result<Flow<PagingData<LocationBasedDTO>>>
+}

app/src/main/java/kr/ksw/visitkorea/domain/usecase/search/GetListByKeywordUseCaseImpl.kt

@@ -0,0 +1,15 @@
+package kr.ksw.visitkorea.domain.usecase.search
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+import kr.ksw.visitkorea.data.repository.SearchKeywordRepository
+import javax.inject.Inject
+
+class GetListByKeywordUseCaseImpl @Inject constructor(
+    private val searchKeywordRepository: SearchKeywordRepository
+): GetListByKeywordUseCase {
+    override suspend fun invoke(keyword: String): Result<Flow<PagingData<LocationBasedDTO>>> {
+        return searchKeywordRepository.getListByKeyword(keyword)
+    }
+}

app/src/main/java/kr/ksw/visitkorea/presentation/festival/component/FestivalCard.kt

@@ -51,17 +51,15 @@ fun FestivalCard(
         Box(
             modifier = Modifier
                 .background(Color.White)
-                .padding(
-                    top = 8.dp,
-                    start = 8.dp,
-                    end = 8.dp
-                )
         ) {
             AsyncImage(
                 modifier = Modifier
                     .fillMaxWidth()
                     .aspectRatio(2f)
-                    .clip(RoundedCornerShape(24.dp))
+                    .clip(RoundedCornerShape(
+                        topStart = 24.dp,
+                        topEnd = 24.dp
+                    ))
                     .background(color = Color.LightGray),
                 model = ImageRequest
                     .Builder(LocalContext.current)
@@ -115,38 +113,45 @@ fun FestivalCard(
                     letterSpacing = (-0.6).sp
                 )
             }
-            SingleLineText(
-                modifier = Modifier
-                    .padding(start = 16.dp, end = 16.dp, bottom = 10.dp)
-                    .align(Alignment.BottomEnd),
-                text = festival.title,
-                fontSize = 18.sp,
-                fontWeight = FontWeight.Medium,
-                color = Color.White
-            )
         }
-        Row(
+        Column(
             modifier = Modifier
                 .fillMaxSize()
                 .background(Color.White)
-                .padding(
-                    top = 8.dp,
-                    start = 10.dp,
-                    end = 10.dp,
-                    bottom = 10.dp
-                ),
-            verticalAlignment = Alignment.CenterVertically
         ) {
-            Icon(
-                modifier = Modifier
-                    .size(20.dp),
-                imageVector = Icons.Outlined.LocationOn,
-                contentDescription = null,
-            )
             SingleLineText(
-                text = festival.address,
-                fontSize = 16.sp,
+                modifier = Modifier
+                    .padding(
+                        top = 8.dp,
+                        start = 10.dp,
+                        end = 10.dp,
+                        bottom = 4.dp
+                    ),
+                text = festival.title,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Medium,
             )
+            Row(
+                modifier = Modifier
+                    .padding(
+                        top = 8.dp,
+                        start = 10.dp,
+                        end = 10.dp,
+                        bottom = 10.dp
+                    ),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(
+                    modifier = Modifier
+                        .size(20.dp),
+                    imageVector = Icons.Outlined.LocationOn,
+                    contentDescription = null,
+                )
+                SingleLineText(
+                    text = festival.address,
+                    fontSize = 16.sp,
+                )
+            }
         }
     }
 }

app/src/main/java/kr/ksw/visitkorea/presentation/main/MainNavHost.kt

@@ -14,6 +14,7 @@ import androidx.navigation.compose.composable
 import kr.ksw.visitkorea.presentation.festival.screen.FestivalScreen
 import kr.ksw.visitkorea.presentation.home.screen.HomeScreen
 import kr.ksw.visitkorea.presentation.hotel.screen.HotelScreen
+import kr.ksw.visitkorea.presentation.search.screen.SearchScreen
 import kr.ksw.visitkorea.presentation.ui.theme.VisitKoreaTheme
 
 @Composable
@@ -36,12 +37,7 @@ fun MainNavHost(
             FestivalScreen()
         }
         composable(route = MainRoute.SEARCH.route) {
-            SampleScreen {
-                Text(
-                    text = "SEARCH",
-                    fontSize = 32.sp
-                )
-            }
+            SearchScreen()
         }
         composable(route = MainRoute.FAVORITE.route) {
             SampleScreen {

app/src/main/java/kr/ksw/visitkorea/presentation/more/viewmodel/MoreState.kt

@@ -8,6 +8,6 @@ import kr.ksw.visitkorea.domain.usecase.model.MoreCardModel
 
 @Immutable
 data class MoreState(
-    val isRefreshing: Boolean = true,
+    val isRefreshing: Boolean = false,
     val moreCardModelFlow: Flow<PagingData<MoreCardModel>> = emptyFlow(),
 )

app/src/main/java/kr/ksw/visitkorea/presentation/more/viewmodel/MoreViewModel.kt

@@ -12,7 +12,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kr.ksw.visitkorea.R
 import kr.ksw.visitkorea.domain.usecase.mapper.toMoreCardModel
 import kr.ksw.visitkorea.domain.usecase.more.GetMoreListUseCase
 import javax.inject.Inject
@@ -34,7 +33,6 @@ class MoreViewModel @Inject constructor(
                 _moreState.update {
                     it.copy(isRefreshing = true)
                 }
-                delay(500)
             }
 
             val moreListFlow = getMoreListUseCase(
@@ -43,6 +41,8 @@ class MoreViewModel @Inject constructor(
                 "37.5678958128",
                 contentTypeId
             ).getOrNull()
+            delay(300)
+
             if(moreListFlow == null) {
                 // Toast Effect
                 _moreState.update {