[chore] #140 ktlintformat

data/exhibition/src/main/java/com/example/exhibition/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package com.example.exhibition.di
 
 import com.example.exhibition.repository.ExhibitionRepositoryImpl
+import com.example.exhibition.repository.SearchRepositoryImpl
 import com.record.exhibition.repository.ExhibitionRepository
+import com.record.exhibition.repository.SearchRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,4 +16,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindsExhibitionRepository(exhibitionRepositoryImpl: ExhibitionRepositoryImpl): ExhibitionRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsSearchRepository(searchRepositoryImpl: SearchRepositoryImpl): SearchRepository
 }

data/exhibition/src/main/java/com/example/exhibition/model/remote/request/RequestPatchExhibitionDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.request
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -15,5 +14,5 @@ data class RequestPatchExhibitionDto(
     @SerialName("name")
     val name: String,
     @SerialName("startDate")
-    val startDate: String
+    val startDate: String,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/request/RequestPostExhibitionDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.request
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -15,5 +14,5 @@ data class RequestPostExhibitionDto(
     @SerialName("placeId")
     val placeId: Int,
     @SerialName("startDate")
-    val startDate: String
+    val startDate: String,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/request/RequestPostPlaceDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.request
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -15,5 +14,5 @@ data class RequestPostPlaceDto(
     @SerialName("longitude")
     val longitude: Int,
     @SerialName("name")
-    val name: String
+    val name: String,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/response/Location.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.response
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -11,5 +10,5 @@ data class Location(
     @SerialName("latitude")
     val latitude: Double,
     @SerialName("longitude")
-    val longitude: Double
+    val longitude: Double,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/response/ResponseGetExhibitionsDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.response
 
-
 import com.record.exhibition.model.Exhibition
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -14,12 +13,15 @@ data class ResponseGetExhibitionsDto(
     @SerialName("name")
     val name: String,
     @SerialName("startDate")
-    val startDate: String
+    val startDate: String,
+    @SerialName("endDate")
+    val endDate: String,
 )
 
 fun ResponseGetExhibitionsDto.toDomain() = Exhibition(
     id = this.id,
     isFree = this.isFree,
     name = this.name,
     startDate = this.startDate,
+    endDate = this.endDate,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/response/ResponseGetPagingPlaceDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.response
 
-import com.record.model.Page
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

data/exhibition/src/main/java/com/example/exhibition/model/remote/response/ResponseGetPlaceDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.response
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -19,5 +18,5 @@ data class ResponseGetPlaceDto(
     @SerialName("platformId")
     val platformId: String?,
     @SerialName("recordSize")
-    val recordSize: Int
+    val recordSize: Int,
 )

data/exhibition/src/main/java/com/example/exhibition/model/remote/response/ResponseGetReviewsDto.kt

@@ -1,6 +1,5 @@
 package com.example.exhibition.model.remote.response
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -15,5 +14,5 @@ data class ResponseGetReviewsDto(
     @SerialName("id")
     val id: Int,
     @SerialName("rating")
-    val rating: Int
+    val rating: Int,
 )

data/exhibition/src/main/java/com/example/exhibition/repository/ExhibitionRepositoryImpl.kt

@@ -36,7 +36,7 @@ class ExhibitionRepositoryImpl @Inject constructor(
                         recordCount = it.recordSize,
                         exhibitionRecord = result?.data?.map { it.toCore() },
                     )
-                }
+                },
             )
         }.recoverCatching { exception ->
             when (exception) {
@@ -60,7 +60,7 @@ class ExhibitionRepositoryImpl @Inject constructor(
             name = it.name,
             exhibitionCount = it.exhibitionSize,
             recordCount = it.recordSize,
-            exhibitionRecord = result?.data?.map { it.toCore() }
+            exhibitionRecord = result?.data?.map { it.toCore() },
         )
     }.recoverCatching { exception ->
         when (exception) {
@@ -75,7 +75,7 @@ class ExhibitionRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getExhibitions(placeId: Long, filter: ExhibitionFilter): Result<List<Exhibition>> = runCatching {
-        when(filter){
+        when (filter) {
             ExhibitionFilter.DEFAULT -> remoteExhibitionDataSource.getExhibitionById(placeId.toInt())
             ExhibitionFilter.FREE -> remoteExhibitionDataSource.getFreeExhibition(placeId.toInt())
             ExhibitionFilter.CLOSING -> remoteExhibitionDataSource.getClosingExhibition(placeId.toInt())

data/exhibition/src/main/java/com/example/exhibition/source/remote/RemoteExhibitionDataSource.kt

@@ -6,26 +6,26 @@ import com.example.exhibition.model.remote.response.ResponseGetExhibitionsDto
 
 interface RemoteExhibitionDataSource {
     suspend fun postExhibition(
-        requestPostExhibitionDto: RequestPostExhibitionDto
+        requestPostExhibitionDto: RequestPostExhibitionDto,
     )
 
     suspend fun getExhibitionById(
-        placeId: Int
+        placeId: Int,
     ): List<ResponseGetExhibitionsDto>
 
     suspend fun getFreeExhibition(
-        placeId: Int
+        placeId: Int,
     ): List<ResponseGetExhibitionsDto>
 
     suspend fun getClosingExhibition(
-        placeId: Int
+        placeId: Int,
     ): List<ResponseGetExhibitionsDto>
 
     suspend fun patchExhibition(
-        requestPatchExhibitionDto: RequestPatchExhibitionDto
+        requestPatchExhibitionDto: RequestPatchExhibitionDto,
     )
 
     suspend fun deleteExhibition(
-        exhibitionId: Int
+        exhibitionId: Int,
     )
 }

data/exhibition/src/main/java/com/example/exhibition/source/remote/RemotePlaceDataSource.kt

@@ -7,23 +7,23 @@ import com.example.exhibition.model.remote.response.ResponseGetReviewsDto
 
 interface RemotePlaceDataSource {
     suspend fun postPlace(
-        requestPostPlaceDto: RequestPostPlaceDto
+        requestPostPlaceDto: RequestPostPlaceDto,
     )
 
     suspend fun getPlaceById(
-        id: Int
+        id: Int,
     ): ResponseGetPlaceDto
 
     suspend fun getReviewsById(
-        id: Int
+        id: Int,
     ): List<ResponseGetReviewsDto>
 
     suspend fun getNearPlace(
         number: Int,
         size: Int,
         latitude: Double,
         longitude: Double,
-        distance: Double
+        distance: Double,
     ): ResponseGetPagingPlaceDto
 
     suspend fun getHasInProgressExhibitionPlaces(

domain/exhibition/src/main/java/com/record/exhibition/model/Exhibition.kt

@@ -4,5 +4,6 @@ data class Exhibition(
     val id: Int,
     val isFree: Boolean,
     val name: String,
-    val startDate: String
+    val startDate: String,
+    val endDate: String,
 )

domain/exhibition/src/main/java/com/record/exhibition/model/ExhibitionFilter.kt

@@ -3,5 +3,5 @@ package com.record.exhibition.model
 enum class ExhibitionFilter {
     DEFAULT,
     FREE,
-    CLOSING
+    CLOSING,
 }

domain/exhibition/src/main/java/com/record/exhibition/model/Place.kt

@@ -8,5 +8,5 @@ data class Place(
     val name: String,
     val exhibitionCount: Int,
     val recordCount: Int,
-    val exhibitionRecord: List<VideoData>?
+    val exhibitionRecord: List<VideoData>?,
 )

domain/video/src/main/java/com/record/video/model/VideoData.kt

@@ -25,5 +25,5 @@ fun VideoData.toCore() = com.record.model.VideoData(
     location = this.location,
     uploaderId = this.uploaderId,
     nickname = this.nickname,
-    isMine = this.isMine
+    isMine = this.isMine,
 )

domain/video/src/main/java/com/record/video/repository/VideoRepository.kt

@@ -8,7 +8,7 @@ interface VideoRepository {
     suspend fun getAllVideos(cursorId: Long, pageSize: Int): Result<List<VideoData>>
     suspend fun getRecentVideos(keywords: List<String>?, cursor: Long, pageSize: Int): Result<Cursor<VideoData>>
     suspend fun getPopularVideos(keywords: List<String>?, pageNumber: Int, pageSize: Int): Result<Page<VideoData>>
-    suspend fun getPlaceVideos(placeId: Int, cursor:Long, pageSize: Int): Result<Cursor<VideoData>>
+    suspend fun getPlaceVideos(placeId: Int, cursor: Long, pageSize: Int): Result<Cursor<VideoData>>
     suspend fun getUserVideos(otherUserId: Long, cursorId: Long, size: Int): Result<Cursor<VideoData>>
     suspend fun getMyVideos(cursorId: Long, size: Int): Result<Cursor<VideoData>>
     suspend fun getFollowingVideos(cursorId: Long, size: Int): Result<Cursor<VideoData>>

feature/detail/build.gradle.kts

@@ -7,4 +7,5 @@ android {
 }
 dependencies {
     implementation(projects.domain.video)
+    implementation(projects.domain.exhibition)
 }

feature/detail/src/main/java/com/record/detail/DetailScreen.kt

@@ -53,7 +53,7 @@ fun DetailRoute(
     padding: PaddingValues,
     modifier: Modifier = Modifier,
     viewModel: DetailpageViewModel = hiltViewModel(),
-    navigateToUplaod: () -> Unit,
+    navigateToUpload: () -> Unit,
     navigateToVideo: (VideoType, Long) -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -82,7 +82,8 @@ fun DetailRoute(
             navigateToVideo = viewModel::navigateToVideoDetail,
             onLoadMoreReviews = viewModel::loadMoreReviewVideos,
             onBookmarkClick = viewModel::bookmark,
-            navigateToUpload = navigateToUplaod,
+            navigateToUpload = navigateToUpload,
+            onChipSelected = viewModel::selectChip,
         )
     }
 }
@@ -96,6 +97,7 @@ fun DetailpageScreen(
     navigateToUpload: () -> Unit,
     onLoadMoreReviews: () -> Unit,
     onBookmarkClick: (Long) -> Unit,
+    onChipSelected: (ChipTab) -> Unit,
 ) {
     val pagerState = rememberPagerState(
         initialPage = state.detailpageTab.ordinal,
@@ -178,10 +180,10 @@ fun DetailpageScreen(
                         ListScreen(
                             exhibitionItems = state.exhibitionList,
                             exhibitionCount = state.exhibitionCount,
-                            selectedChip = selectedChipState.value,
+                            selectedChip = state.selectedChip,
                             onItemClick = {},
                             onChipSelected = { selectedChip ->
-                                selectedChipState.value = selectedChip
+                                onChipSelected(selectedChip)
                             },
                         )
                     }
@@ -220,7 +222,7 @@ fun CustomTabRow(
 
     val animatedIndicatorWidth by animateDpAsState(
         targetValue = tabWidth - 12.dp,
-        animationSpec = tween(200),
+        animationSpec = tween(0),
     )
 
     val density = LocalDensity.current

feature/detail/src/main/java/com/record/detail/DetailpageContract.kt

@@ -1,21 +1,25 @@
 package com.record.detail
 
+import com.record.detail.screen.ChipTab
+import com.record.exhibition.model.Exhibition
+import com.record.model.VideoData
 import com.record.model.VideoType
 import com.record.ui.base.SideEffect
 import com.record.ui.base.UiState
-import com.record.video.model.VideoData
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 data class DetailpageState(
-    val placeName: String = "국립현대미술관",
-    val placeAddress: String = "서울특별시 종로구 삼청로 30",
+    val placeId: Long = 0,
+    val placeName: String = "",
+    val placeAddress: String = "",
     val exhibitionCount: Int = 0,
     val reviewVideoCount: Int = 0,
     val reviewCursor: Long = 0,
     val reviewIsEnd: Boolean = false,
     val detailpageTab: DetailpageTab = DetailpageTab.LIST,
-    val exhibitionList: ImmutableList<Triple<String, String, String>> = emptyList<Triple<String, String, String>>().toImmutableList(),
+    val selectedChip: ChipTab = ChipTab.ALL,
+    val exhibitionList: ImmutableList<Exhibition> = emptyList<Exhibition>().toImmutableList(),
     val reviewList: ImmutableList<VideoData> = emptyList<VideoData>().toImmutableList(),
 ) : UiState