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
Expand Up @@ -6,6 +6,7 @@ import kotlinx.serialization.Serializable
@Serializable
data class DailyDiariesResponseDto(
@SerialName("diaries") val diaries: List<Diary>,
@SerialName("isDraft") val isDraft: Boolean,
) {
@Serializable
data class Diary(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.sopt.clody.data.remote.dto.response

import com.sopt.clody.domain.model.ReplyStatus
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

Expand All @@ -11,7 +12,7 @@ data class MonthlyCalendarResponseDto(
@Serializable
data class Diary(
@SerialName("diaryCount") val diaryCount: Int,
@SerialName("replyStatus") val replyStatus: String,
@SerialName("replyStatus") val replyStatus: ReplyStatus,
@SerialName("isDeleted") val isDeleted: Boolean,
)
}
5 changes: 4 additions & 1 deletion app/src/main/java/com/sopt/clody/domain/model/ReplyStatus.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ import kotlinx.serialization.Serializable

@Serializable
enum class ReplyStatus {
UNREADY, READY_READ, READY_NOT_READ
UNREADY, READY_READ, READY_NOT_READ, HAS_DRAFT, INVALID_DRAFT;

val isUnreadOrNotRead: Boolean
get() = this == UNREADY || this == READY_NOT_READ
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fun ClodyCalendar(
DailyDiaryListItem(
date = selectedDate,
dayOfWeek = initialDayOfWeek,
dailyDiaries = state.data.diaries,
dailyDiary = state.data,
onShowDiaryDeleteStateChange = onShowDiaryDeleteStateChange,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import java.time.LocalDate
fun DailyDiaryListItem(
date: LocalDate,
dayOfWeek: DayOfWeek,
dailyDiaries: List<DailyDiariesResponseDto.Diary>,
dailyDiary: DailyDiariesResponseDto,
onShowDiaryDeleteStateChange: (Boolean) -> Unit,
) {
Column(
Expand Down Expand Up @@ -66,26 +66,44 @@ fun DailyDiaryListItem(
.clickable(onClick = { onShowDiaryDeleteStateChange(true) }),
)
}
if (dailyDiaries.isEmpty()) {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxSize()
.padding(vertical = 44.dp),
) {
Text(
text = "아직 감사 일기가 없어요!",
style = ClodyTheme.typography.body3Regular,
color = ClodyTheme.colors.gray05,
textAlign = TextAlign.Center,
)

when {
dailyDiary.isDraft -> {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxSize()
.padding(vertical = 44.dp),
) {
Text(
text = "임시저장된 일기가 있어요.",
style = ClodyTheme.typography.body3Regular,
color = ClodyTheme.colors.gray05,
textAlign = TextAlign.Center,
)
}
}
} else {
dailyDiaries.forEachIndexed { index, diary ->
DiaryItem(
index = index + 1,
text = diary.content,
)

dailyDiary.diaries.isEmpty() -> {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxSize()
.padding(vertical = 44.dp),
) {
Text(
text = "아직 감사 일기가 없어요!",
style = ClodyTheme.typography.body3Regular,
color = ClodyTheme.colors.gray05,
textAlign = TextAlign.Center,
)
}
}

else -> {
dailyDiary.diaries.forEachIndexed { index, diary ->
DiaryItem(index = index + 1, text = diary.content)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.sopt.clody.R
import com.sopt.clody.data.remote.dto.response.MonthlyCalendarResponseDto
import com.sopt.clody.domain.model.ReplyStatus
import com.sopt.clody.presentation.ui.type.DiaryCloverType
import com.sopt.clody.ui.theme.ClodyTheme
import kotlinx.datetime.DayOfWeek
Expand Down Expand Up @@ -56,7 +57,7 @@ fun DayItem(
painter = painterResource(id = iconRes),
contentDescription = "Diary clover icon",
)
if (diaryData.replyStatus == "READY_NOT_READ" && diaryData.diaryCount > 0) {
if (diaryData.replyStatus == ReplyStatus.READY_NOT_READ && diaryData.diaryCount > 0) {
Image(
painter = painterResource(id = R.drawable.ic_home_unread_reply),
contentDescription = "Unread replies icon",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,68 +7,56 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.sopt.clody.presentation.ui.component.button.ClodyButton
import com.sopt.clody.presentation.ui.component.button.ClodyReplyButton
import java.time.LocalDate

@Composable
fun DiaryStateButton(
diaryCount: Int,
isDeleted: Boolean,
hasDraft: Boolean,
canWrite: Boolean,
canReply: Boolean,
year: Int,
month: Int,
day: Int,
onClickWriteDiary: (Int, Int, Int) -> Unit,
onClickReplyDiary: () -> Unit,
) {
val today = LocalDate.now()
val isAvailableDay = year == today.year && month == today.monthValue && (day == today.dayOfMonth || day == today.dayOfMonth - 1)

val writeDiaryEnabled = diaryCount == 0 && isAvailableDay
val writeDiaryDisabled = diaryCount == 0 && !isAvailableDay
val checkReplyEnabled = diaryCount != 0 && !isDeleted
val checkReplyDisabled = diaryCount != 0 && isDeleted
val modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)

when {
writeDiaryEnabled -> {
hasDraft -> {
ClodyButton(
onClick = { onClickWriteDiary(year, month, day) },
text = "일기쓰기",
text = "이어쓰기",
enabled = true,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
modifier = modifier,
)
}

writeDiaryDisabled -> {
ClodyButton(
onClick = { onClickWriteDiary(year, month, day) },
text = "일기쓰기",
enabled = false,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
)
}

checkReplyEnabled -> {
canReply -> {
ClodyReplyButton(
onClick = onClickReplyDiary,
text = "답장확인",
enabled = true,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
modifier = modifier,
)
}

checkReplyDisabled -> {
ClodyReplyButton(
onClick = onClickReplyDiary,
text = "답장확인",
canWrite -> {
ClodyButton(
onClick = { onClickWriteDiary(year, month, day) },
text = "일기쓰기",
enabled = true,
modifier = modifier,
)
}

else -> {
ClodyButton(
onClick = { onClickWriteDiary(year, month, day) },
text = "일기쓰기",
enabled = false,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
modifier = modifier,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ fun NavGraphBuilder.homeScreen(
composable<Route.Home> { backStackEntry ->
backStackEntry.toRoute<Route.Home>().apply {
HomeRoute(
selectedYear = selectedYear,
selectedMonth = selectedMonth,
selectedDay = selectedDay,
isFromReplyDiary = isFromReplyDiary,
navigateToDiaryList = navigateToDiaryList,
navigateToSetting = navigateToSetting,
Expand Down
Loading