[Feature/#90] place api connect

core/designsystem/src/main/java/com/teamsolply/solply/designsystem/component/card/SolplyPlaceCard.kt

@@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import com.teamsolply.solply.designsystem.component.button.SolplySavedMarker
 import com.teamsolply.solply.designsystem.component.chip.CheckedBigCircle
@@ -76,7 +77,12 @@ fun SolplyPlaceCard(
         ) {
             AdaptationImage(
                 imageUrl = imgRes,
-                modifier = Modifier.matchParentSize()
+                modifier = Modifier
+                    .size(136.dp)
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(20.dp))
+                    .matchParentSize(),
+                contentScale = ContentScale.Crop
             )
             if (saved) {
                 SolplySavedMarker(

data/place/src/main/java/com/teamsolply/solply/place/dto/response/GetPlacesResponseDto.kt

@@ -0,0 +1,28 @@
+package com.teamsolply.solply.place.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetPlacesResponseDto(
+    @SerialName("places")
+    val places: List<PlaceDto>
+)
+
+@Serializable
+data class PlaceDto(
+    @SerialName("placeId")
+    val placeId: Long,
+
+    @SerialName("placeName")
+    val placeName: String,
+
+    @SerialName("thumbnailImageUrl")
+    val thumbnailImageUrl: String,
+
+    @SerialName("primaryTag")
+    val primaryTag: String,
+
+    @SerialName("isBookmarked")
+    val isBookmarked: Boolean
+)

data/place/src/main/java/com/teamsolply/solply/place/mapper/PlaceEntityMapper.kt

@@ -0,0 +1,14 @@
+package com.teamsolply.solply.place.mapper
+
+import com.teamsolply.solply.place.dto.response.PlaceDto
+import com.teamsolply.solply.place.model.PlaceEntity
+
+fun PlaceDto.toEntity(): PlaceEntity {
+    return PlaceEntity(
+        placeId = this.placeId,
+        placeName = this.placeName,
+        thumbnailImageUrl = this.thumbnailImageUrl,
+        primaryTag = this.primaryTag,
+        isBookmarked = this.isBookmarked
+    )
+}

data/place/src/main/java/com/teamsolply/solply/place/repository/PlaceRepositoryImpl.kt

@@ -2,6 +2,7 @@ package com.teamsolply.solply.place.repository
 
 import android.util.Log
 import com.teamsolply.solply.model.PlaceType
+import com.teamsolply.solply.place.model.PlaceEntity
 import com.teamsolply.solply.place.model.RecommendPlaceInfo
 import com.teamsolply.solply.place.model.SaveAutoSignInEntity
 import com.teamsolply.solply.place.model.SelectedTownInfo
@@ -90,4 +91,29 @@ class PlaceRepositoryImpl @Inject constructor(
                 )
             }
         }
+
+    override suspend fun getPlaces(
+        townId: Long,
+        mainTagId: Long?,
+        subTagAIdList: List<Long>?,
+        subTagBIdList: List<Long>?
+    ): Result<List<PlaceEntity>> = runCatching {
+        placeRemoteDataSource.getPlaces(
+            townId = townId,
+            isBookmarkSearch = false,
+            mainTagId = mainTagId,
+            subTagAIdList = subTagAIdList,
+            subTagBIdList = subTagBIdList
+        )
+    }.mapCatching { responseDto ->
+        responseDto.places.map { dto ->
+            PlaceEntity(
+                placeId = dto.placeId,
+                placeName = dto.placeName,
+                thumbnailImageUrl = dto.thumbnailImageUrl,
+                primaryTag = dto.primaryTag,
+                isBookmarked = dto.isBookmarked
+            )
+        }
+    }
 }

data/place/src/main/java/com/teamsolply/solply/place/source/PlaceRemoteDataSource.kt

@@ -1,5 +1,6 @@
 package com.teamsolply.solply.place.source
 
+import com.teamsolply.solply.place.dto.response.GetPlacesResponseDto
 import com.teamsolply.solply.place.dto.response.GetRecommendPlaceDto
 import com.teamsolply.solply.place.dto.response.GetTagResponseDto
 import com.teamsolply.solply.place.dto.response.GetUserInfoResponseDto
@@ -8,4 +9,11 @@ interface PlaceRemoteDataSource {
     suspend fun getTags(parentId: Int?): List<GetTagResponseDto>
     suspend fun getUserInfo(): GetUserInfoResponseDto
     suspend fun getRecommendPlace(townId: Long): List<GetRecommendPlaceDto>
+    suspend fun getPlaces(
+        townId: Long,
+        isBookmarkSearch: Boolean,
+        mainTagId: Long?,
+        subTagAIdList: List<Long>?,
+        subTagBIdList: List<Long>?
+    ): GetPlacesResponseDto
 }

domain/place/src/main/java/com/teamsolply/solply/place/model/PlaceEntity.kt

@@ -0,0 +1,9 @@
+package com.teamsolply.solply.place.model
+
+data class PlaceEntity(
+    val placeId: Long,
+    val placeName: String,
+    val thumbnailImageUrl: String,
+    val primaryTag: String,
+    val isBookmarked: Boolean
+)

domain/place/src/main/java/com/teamsolply/solply/place/repository/PlaceRepository.kt

@@ -1,5 +1,6 @@
 package com.teamsolply.solply.place.repository
 
+import com.teamsolply.solply.place.model.PlaceEntity
 import com.teamsolply.solply.place.model.RecommendPlaceInfo
 import com.teamsolply.solply.place.model.SaveAutoSignInEntity
 import com.teamsolply.solply.place.model.TagEntity
@@ -11,4 +12,10 @@ interface PlaceRepository {
     suspend fun getMainTags(): Result<List<TagEntity>>
     suspend fun getSubTags(parentId: Int): Result<List<TagEntity>>
     suspend fun getUserInfo(): Result<UserInfo>
+    suspend fun getPlaces(
+        townId: Long,
+        mainTagId: Long?,
+        subTagAIdList: List<Long>?,
+        subTagBIdList: List<Long>?
+    ): Result<List<PlaceEntity>>
 }

feature/main/src/main/java/com/teamsolply/solply/main/MainNavigator.kt

@@ -90,10 +90,14 @@ internal class MainNavigator(
 
     fun navigateToMaps(
         mapsType: String,
+        townId: Long,
+        placeId: Long? = null,
         navOptions: NavOptions
     ) {
         navController.navigateMaps(
             mapsType = mapsType,
+            townId = townId,
+            placeId = placeId,
             navOptions = navOptions
         )
     }

feature/main/src/main/java/com/teamsolply/solply/main/MainScreen.kt

@@ -156,23 +156,38 @@ internal fun MainScreen(
                     )
                     placeNavGraph(
                         paddingValues = innerPadding,
-                        navigateToMaps = { mapsType ->
+                        navigateToMaps = { mapsType, townId, placeId ->
                             val navOptions = navOptions {}
-                            navigator.navigateToMaps(mapsType = mapsType, navOptions = navOptions)
+                            navigator.navigateToMaps(
+                                mapsType = mapsType,
+                                townId = townId,
+                                placeId = placeId,
+                                navOptions = navOptions
+                            )
                         }
                     )
                     courseNavGraph(
                         paddingValues = innerPadding,
                         navigateToMaps = { mapsType ->
                             val navOptions = navOptions {}
-                            navigator.navigateToMaps(mapsType = mapsType, navOptions = navOptions)
+                            // TODO. 타운 아이디
+                            navigator.navigateToMaps(
+                                mapsType = mapsType,
+                                townId = 0,
+                                navOptions = navOptions
+                            )
                         }
                     )
                     mypageNavGraph(
                         paddingValues = innerPadding,
                         navigateToMaps = { mapsType ->
                             val navOptions = navOptions {}
-                            navigator.navigateToMaps(mapsType = mapsType, navOptions = navOptions)
+                            // TODO. 타운 아이디
+                            navigator.navigateToMaps(
+                                mapsType = mapsType,
+                                townId = 0,
+                                navOptions = navOptions
+                            )
                         },
                         navigateToBack = navigator::navigateToBack,
                         navigateToPlaceCollection = { townId, townName ->
@@ -223,15 +238,19 @@ internal fun MainScreen(
                         },
                         navigateToPlaceDetail = {
                             val navOptions = navOptions {}
+                            // TODO. 타운 아이디
                             navigator.navigateToMaps(
                                 mapsType = MapsType.PLACE_DETAIL.name,
+                                townId = 0,
                                 navOptions = navOptions
                             )
                         },
                         navigateToEditCourse = {
                             val navOptions = navOptions {}
+                            // TODO. 타운 아이디
                             navigator.navigateToMaps(
                                 mapsType = MapsType.EDIT_COURSE.name,
+                                townId = 0,
                                 navOptions = navOptions
                             )
                         },
@@ -265,15 +284,25 @@ internal fun MainScreen(
                         paddingValues = innerPadding,
                         navigateToMaps = { mapsType ->
                             val navOptions = navOptions {}
-                            navigator.navigateToMaps(mapsType = mapsType, navOptions = navOptions)
+                            // TODO. 타운 아이디
+                            navigator.navigateToMaps(
+                                mapsType = mapsType,
+                                townId = 0,
+                                navOptions = navOptions
+                            )
                         },
                         navigateToBack = navigator::navigateToBack
                     )
                     courseCollectionNavGraph(
                         paddingValues = innerPadding,
                         navigateToMaps = { mapsType ->
                             val navOptions = navOptions { }
-                            navigator.navigateToMaps(mapsType = mapsType, navOptions = navOptions)
+                            // TODO. 타운 아이디
+                            navigator.navigateToMaps(
+                                mapsType = mapsType,
+                                townId = 0,
+                                navOptions = navOptions
+                            )
                         },
                         navigateToBack = navigator::navigateToBack
                     )

feature/main/src/main/java/com/teamsolply/solply/main/component/MainBottomBar.kt

@@ -1,6 +1,9 @@
 package com.teamsolply.solply.main.component
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -34,7 +37,17 @@ internal fun MainBottomBar(
     currentTab: MainNavTab?,
     onTabSelected: (MainNavTab) -> Unit
 ) {
-    AnimatedVisibility(visible = visible) {
+    AnimatedVisibility(
+        visible = visible,
+        enter = slideInHorizontally(
+            animationSpec = tween(250),
+            initialOffsetX = { it }
+        ),
+        exit = slideOutHorizontally(
+            animationSpec = tween(250),
+            targetOffsetX = { it }
+        )
+    ) {
         Box(modifier = modifier.fillMaxWidth()) {
             Row(
                 modifier = Modifier

feature/maps/src/main/java/com/teamsolply/solply/maps/MapsScreen.kt

@@ -81,8 +81,8 @@ import kotlin.math.abs
 @Composable
 internal fun MapsRoute(
     mapsType: MapsType,
-    townId: Long = 0,
-    targetId: Long = 1,
+    townId: Long,
+    placeId: Long?,
     showTextSnackBar: (String) -> Unit,
     showNotificationSnackBar: (String) -> Unit,
     showNavigateSnackBar: (String, () -> Unit) -> Unit,
@@ -102,8 +102,10 @@ internal fun MapsRoute(
     LaunchedEffect(Unit) {
         when (mapsType) {
             MapsType.PLACE_DETAIL -> {
-                viewModel.getPlaceDetailInfo(targetId)
-                viewModel.getAllCourseInfo(townId = townId, placeId = targetId)
+                if (placeId != null) {
+                    viewModel.getPlaceDetailInfo(placeId)
+                    viewModel.getAllCourseInfo(townId = townId, placeId = placeId)
+                }
             }
 
             MapsType.ADD_COURSE -> {

feature/maps/src/main/java/com/teamsolply/solply/maps/component/bottomsheet/PlaceDetailBottomSheet.kt

@@ -8,7 +8,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -22,6 +24,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
@@ -172,7 +175,10 @@ fun PlaceDetailBottomSheet(
                 AdaptationImage(
                     imageUrl = placeImageUrls[page].url,
                     modifier = Modifier
-                        .clip(RoundedCornerShape(20.dp))
+                        .height(218.dp)
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(20.dp)),
+                    contentScale = ContentScale.Crop
                 )
             }
             Box(

feature/maps/src/main/java/com/teamsolply/solply/maps/navigation/MapsNavigation.kt

@@ -13,9 +13,11 @@ import kotlinx.serialization.Serializable
 
 fun NavController.navigateMaps(
     mapsType: String,
+    townId: Long,
+    placeId: Long?,
     navOptions: NavOptions
 ) {
-    navigate(Maps(mapsType = mapsType), navOptions)
+    navigate(Maps(mapsType = mapsType, townId = townId, placeId = placeId), navOptions)
 }
 
 fun NavGraphBuilder.mapsNavGraph(
@@ -32,8 +34,13 @@ fun NavGraphBuilder.mapsNavGraph(
 ) {
     composable<Maps> { backStackEntry ->
         val mapsType = MapsType.valueOf(backStackEntry.toRoute<Maps>().mapsType)
+        val townId = backStackEntry.toRoute<Maps>().townId
+        val placeId = backStackEntry.toRoute<Maps>().placeId
+
         MapsRoute(
             mapsType = mapsType,
+            townId = townId,
+            placeId = placeId,
             showTextSnackBar = showTextSnackBar,
             showNotificationSnackBar = showNotificationSnackBar,
             showNavigateSnackBar = showNavigateSnackBar,
@@ -50,5 +57,7 @@ fun NavGraphBuilder.mapsNavGraph(
 
 @Serializable
 data class Maps(
-    val mapsType: String
+    val mapsType: String,
+    val townId: Long,
+    val placeId: Long?
 ) : Route