Skip to content

Commit

Permalink
./gradlew build 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
riflockle7 committed Oct 28, 2023
1 parent b7e38ad commit 5535aab
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import team.duckie.app.android.common.compose.ui.quack.QuackProfileImage
import team.duckie.app.android.common.kotlin.fastForEach
import team.duckie.quackquack.material.QuackColor

private const val PROFILE_OVERLAY_WIDTH = -5

/** 프로필 중첩 View */
@Composable
fun ProfileOverlayView(profileThumbnailUrls: List<String?>) {
Row(horizontalArrangement = Arrangement.spacedBy((-5).dp)) {
profileThumbnailUrls.forEach { url ->
Row(horizontalArrangement = Arrangement.spacedBy(PROFILE_OVERLAY_WIDTH.dp)) {
profileThumbnailUrls.fastForEach { url ->
// 프로필 이미지
QuackProfileImage(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ import team.duckie.quackquack.ui.QuackText
import team.duckie.quackquack.ui.util.ExperimentalQuackQuackApi

/** 상세 화면 컨텐츠 Layout */
@Suppress("MagicNumber")
@Suppress("MagicNumber", "unused")
@Composable
internal fun DetailContentLayout(
modifier: Modifier = Modifier,
state: DetailState.Success,
tagItemClick: (String) -> Unit,
moreButtonClick: () -> Unit,
followButtonClick: () -> Unit,
profileClick: (Int) -> Unit,
additionalInfo: (@Composable () -> Unit),
) {
Column(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import team.duckie.quackquack.ui.sugar.QuackTitle2
fun DetailProfileSection(
state: DetailState.Success,
followButtonClick: () -> Unit,
profileClick: (Int) -> Unit
profileClick: (Int) -> Unit,
) {
// 구분선
QuackMaxWidthDivider()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ internal fun ExamDetailContentLayout(
state = state,
tagItemClick = tagItemClick,
moreButtonClick = moreButtonClick,
followButtonClick = followButtonClick,
profileClick = profileClick,
additionalInfo = {
DetailProfileSection(state, followButtonClick, profileClick)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ internal fun FundingDetailContentLayout(
state = state,
tagItemClick = tagItemClick,
moreButtonClick = moreButtonClick,
followButtonClick = followButtonClick,
profileClick = profileClick,
additionalInfo = {
// 펀딩 카운트 정보 Section
FundingCounterInfoSection(state)
Expand Down Expand Up @@ -254,7 +252,7 @@ private fun FundingPreviewSection(state: DetailState.Success) {
stringResource(
id = R.string.detail_funding_preview_sample_title,
state.exam.sampleQuestion?.text ?: "문제",
)
),
)

(state.exam.sampleQuestion as? Question.Image)?.imageUrl?.let {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ internal fun QuizDetailContentLayout(
state = state,
tagItemClick = tagItemClick,
moreButtonClick = moreButtonClick,
followButtonClick = followButtonClick,
profileClick = profileClick,
additionalInfo = {
DetailProfileSection(state, followButtonClick, profileClick)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ class DetailViewModel @Inject constructor(
exam = exam,
appUser = me,
isFollowing = exam.user?.follow != null,
examStatus = examStatus ?: (ExamStatus.from(exam.status ?: "")
?: ExamStatus.Ready),
examStatus = examStatus ?: (
ExamStatus.from(exam.status ?: "") ?: ExamStatus.Ready
),
)
} else {
DetailState.Error(DuckieResponseFieldNPE("exam or me is Null"))
Expand Down

0 comments on commit 5535aab

Please sign in to comment.