Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.paw.key.core.designsystem.component

import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -19,6 +20,7 @@ import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -54,18 +56,23 @@ fun CourseDetail(
totalReviewCount : Int,
walkingImageUrls : List<String>,


onImageClick: (String) -> Unit,
modifier: Modifier = Modifier
) {
val context = LocalContext.current
val isLiked = remember { mutableStateOf(false) }
LaunchedEffect(routeMapImageUrl) {
Log.d("LaunchedEffect", "LaunchedEffect: $routeMapImageUrl")
Log.d("LaunchedEffect", "LaunchedEffect: $walkingImageUrls")
Log.d("LaunchedEffect", "LaunchedEffect: $petProfileImage")
}

Column(
modifier = modifier
.fillMaxWidth()
) {
AsyncImage(
model = ImageRequest.Builder(LocalContext.current)
model = ImageRequest.Builder(context)
.data(routeMapImageUrl)
.crossfade(true)
.build(),
Expand Down Expand Up @@ -122,7 +129,7 @@ fun CourseDetail(
.padding(vertical = 12.dp)
) {
AsyncImage(
model = ImageRequest.Builder(LocalContext.current)
model = ImageRequest.Builder(context)
.data(petProfileImage)
.crossfade(true)
.build(),
Expand Down Expand Up @@ -190,7 +197,7 @@ fun CourseDetail(
) {
items(walkingImageUrls.size) { index ->
AsyncImage(
model = ImageRequest.Builder(LocalContext.current)
model = ImageRequest.Builder(context)
.data(walkingImageUrls[index])
.crossfade(true)
.build(),
Expand Down Expand Up @@ -317,7 +324,31 @@ fun CourseDetailPreview() {
petProfileImage = "https://pawkey-server.com/image/profile.png",
routeMapImageUrl = "https://pawkey-server.com/image/map.png",
categoryTop3 = listOf(
CategoryTop3Entity(
rank = 1,
optionText = "산책로가 어쩌구 저꾸",
percentage = 42,
categoryName = "산책로가 어쩌구 저꾸",
categoryOptionId = 1,
categoryId = 2
),
CategoryTop3Entity(
rank = 2,
optionText = "산책로가 어쩌구 저꾸",
percentage = 37,
categoryName = "산책로가 어쩌구 저꾸",
categoryOptionId = 1,
categoryId = 2
),
CategoryTop3Entity(
rank = 3,
optionText = "산책로가 어쩌구 저꾸",
percentage = 35,
categoryName = "산책로가 어쩌구 저꾸",
categoryOptionId = 1,
categoryId = 2
)
),
totalReviewCount = 42,
walkingImageUrls = listOf(
"https://pawkey-server.com/image/walk1.jpg",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ data class WalkReviewDetailResponseDto(
regionName = regionName,
createdAt = createdAt,
routeMapImageUrl = routeMapImageUrl,
walkingImageUrls = walkingImageUrls
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ interface WalkListDetailService {
@GET("posts/{routeId}/reviews/top")
suspend fun getWalkReviewSummary(
@Header("X-USER-ID") userId: Int,
@Path("postId") postId: Int
@Path("routeId") routeId: Int
): BaseResponse<WalkReviewSummaryResponseDto>
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ data class WalkListDetailEntity(
val regionName: String,
val createdAt: String,
val routeMapImageUrl: String,
val walkingImageUrls: List<String>
)

data class AuthorInfoEntity(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fun HomeLocationSettingScreen(
enabled = isFormValid,
onClick = {
if (isFormValid) {
viewModel.patchRegion(
/*viewModel.patchRegion(
userId = 2,
onSuccess = {
val selectedDongId = state.selectedDongId
Expand All @@ -177,7 +177,8 @@ fun HomeLocationSettingScreen(
onFailure = { message ->
Log.e("HomeScreen", "지역 설정 실패: $message")
}
)
)*/
navigateNext(state.selectedDongId)
}
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ private fun HomeScreenPreview() {
navigateHomeLocationSetting = {}
)
}

}

@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ fun PawKeyNavHost(
homeLocationSettingNavGraph(
paddingValues = paddingValues,
navigateUp = navigator::navigateUp,
navigateNext = navigator::navigateRegional,
navigateNext = {
navigator.navigateRegional(
regionId = it,
navOptions = null
)
},
navigateHomeLocationSetting = navigator::navigateHomeLocationSetting,
modifier = modifier,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class ArchivedDetailViewModel @Inject constructor(
regionName = result.regionName,
categorySummary = result.categoryTags.categoryOptionSummary,
routeMapImageUrl = result.routeMapImageUrl,
walkingImageUrls = it.walkingImageUrls,
postContent = result.content
walkingImageUrls = result.walkingImageUrls,
postContent = result.content,
petProfileImage = result.authorInfo.petProfileImage,
)
}
Log.d("getWalkDetail", "getWalkDetail: ${result.content}")
}
.onFailure {
Log.e("getWalkDetail", "getWalkDetail: ${it.message}")
Expand All @@ -63,7 +63,6 @@ class ArchivedDetailViewModel @Inject constructor(
totalReviewCount = result.totalReviewCount
)
}

Log.d("getWalkTopPopular", "getWalkTopPopular: ${result.categoryTop3}")
}
.onFailure {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fun RegionalManagementRoute(
LaunchedEffect(Unit) {
Log.e("regregionId", regionId.toString())
viewModel.getRegionGeometry(
X_USER_ID = 2,
userId = 2,
regionId = regionId,
)
}
Expand Down Expand Up @@ -96,7 +96,7 @@ fun RegionalManagementRoute(
preRegionName = state.preRegionName,
regionName = state.regionName,
onClickButton = {
viewModel.onChangeRegion()
viewModel.patchRegion(userId = 2, regionId = regionId)
navigateNext()
},
modifier = modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.kakao.vectormap.LatLng
import com.paw.key.core.util.UiState
import com.paw.key.core.util.handleError
import com.paw.key.domain.repository.RegionRepository
import com.paw.key.domain.repository.home.HomeRegionRepository
import com.paw.key.presentation.ui.region.state.RegionContract
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableSharedFlow
Expand All @@ -19,7 +20,8 @@ import javax.inject.Inject

@HiltViewModel
class RegionViewModel @Inject constructor(
private val regionRepository: RegionRepository
private val regionRepository: RegionRepository,
private val homeRepository: HomeRegionRepository
) : ViewModel() {
private val _state = MutableStateFlow(RegionContract.RegionState())
val state : StateFlow<RegionContract.RegionState>
Expand All @@ -29,8 +31,8 @@ class RegionViewModel @Inject constructor(
val sideEffect : MutableSharedFlow<RegionContract.RegionSideEffect>
get() = _sideEffect

fun getRegionGeometry(X_USER_ID: Int, regionId: Int) = viewModelScope.launch {
regionRepository.getRegionGeometry(X_USER_ID, regionId)
fun getRegionGeometry(userId: Int, regionId: Int) = viewModelScope.launch {
regionRepository.getRegionGeometry(userId, regionId)
.onSuccess { data ->
Log.d("RegionViewModel", "API 응답 성공: $data")
Log.d("RegionViewModel", "geometry type: ${data.geometry.type}")
Expand Down Expand Up @@ -83,13 +85,30 @@ class RegionViewModel @Inject constructor(
}
}

fun onChangeRegion() {
fun patchRegion(userId: Int, regionId: Int) = viewModelScope.launch {
homeRepository.patchRegion(userId, regionId)
.onSuccess { data ->
Log.d("RegionViewModel", "API 응답 성공: $data")
_sideEffect.emit(
RegionContract.RegionSideEffect.ShowSnackBar("지역을 ${state.value.selectedRegion ?: "역삼동"}으로 변경했어요.")
)
}
.onFailure { throwable ->
Log.e("RegionViewModel", "API 호출 실패", throwable)
val errorMessage = handleError(throwable)
_sideEffect.emit(
RegionContract.RegionSideEffect.ShowSnackBar(errorMessage)
)
}
}

/*fun onChangeRegion() {
viewModelScope.launch {
_sideEffect.emit(
RegionContract.RegionSideEffect.ShowSnackBar("지역을 ${state.value.selectedRegion ?: "역삼동"}으로 변경했어요.")
)
}
}
}*/
}

private fun flattenCoordinatesToLatLng(
Expand Down