Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#225] 투표 완료후 투표 완료 스크린 오류 #226

Merged
merged 2 commits into from
Aug 19, 2024
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.mashup.gabbangzip.sharedalbum.data.dto.response.vote

import com.mashup.gabbangzip.sharedalbum.data.common.toS3Url
import com.mashup.gabbangzip.sharedalbum.domain.model.vote.VoteResultDomainModel
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
Expand All @@ -17,6 +18,6 @@ data class VoteResultResponse(
fun VoteResultResponse.toDomainModel(): VoteResultDomainModel =
VoteResultDomainModel(
eventId = eventId,
randomImageUrl = randomImageUrl,
randomImageUrl = randomImageUrl.toS3Url(),
groupKeyword = groupKeyword,
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.compose.rememberNavController
import com.mashup.gabbangzip.sharedalbum.presentation.R
import com.mashup.gabbangzip.sharedalbum.presentation.theme.SharedAlbumTheme
import com.mashup.gabbangzip.sharedalbum.presentation.ui.model.PicPhotoFrame
import com.mashup.gabbangzip.sharedalbum.presentation.ui.vote.navigation.VoteNavHost
import com.mashup.gabbangzip.sharedalbum.presentation.ui.vote.navigation.VoteNavRoute
Expand All @@ -36,41 +41,47 @@ class VoteActivity : ComponentActivity() {
setContent {
val state by viewModel.voteUiState.collectAsStateWithLifecycle()
val navController = rememberNavController()

if (state.isError) {
showToast(R.string.error_retry)
}

VoteNavHost(
state = state,
navController = navController,
startDestination = VoteNavRoute.initRoute,
frameResId = PicPhotoFrame.getTypeByKeyword(state.voteResult.groupKeyword.name).frameResId,
thumbnailUrl = state.voteResult.randomImageUrl,
onDialogConfirm = { viewModel.updateVoteDialog(isVisible = false) },
onCancelVote = { viewModel.updateVoteDialog(isVisible = true) },
onVoteExit = { finish() },
onVoteBySwiped = { voteType, photo ->
viewModel.updateVoteEvent(voteType)
viewModel.addVoteResult(voteType, photo)
},
onVoteByClicked = { voteType, photo ->
viewModel.addVoteResult(voteType, photo)
},
onVoteClick = { voteType ->
viewModel.updateVoteEvent(voteType)
},
onSwipeFinish = { viewModel.finishVote() },
onClickNavigationBack = { finish() },
onCompleteButtonClicked = { finish() },
onUploadPicture = { isUploadSuccess ->
if (isUploadSuccess) {
navController.navigateToVoteComplete()
} else {
showToast(R.string.error_retry)
}
},
)
SharedAlbumTheme {
Scaffold { innerPadding ->
VoteNavHost(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding),
state = state,
navController = navController,
startDestination = VoteNavRoute.initRoute,
frameResId = PicPhotoFrame.getTypeByKeyword(state.voteResult.groupKeyword.name).frameResId,
thumbnailUrl = state.voteResult.randomImageUrl,
onDialogConfirm = { viewModel.updateVoteDialog(isVisible = false) },
onCancelVote = { viewModel.updateVoteDialog(isVisible = true) },
onVoteExit = { finish() },
onVoteBySwiped = { voteType, photo ->
viewModel.updateVoteEvent(voteType)
viewModel.addVoteResult(voteType, photo)
},
onVoteByClicked = { voteType, photo ->
viewModel.addVoteResult(voteType, photo)
},
onVoteClick = { voteType ->
viewModel.updateVoteEvent(voteType)
},
onSwipeFinish = { viewModel.finishVote() },
onClickNavigationBack = { finish() },
onCompleteButtonClicked = { finish() },
onUploadPicture = { isUploadSuccess ->
if (isUploadSuccess) {
navController.navigateToVoteComplete()
} else {
showToast(R.string.error_retry)
}
},
)
}
}
}
}

Expand Down
Loading