feat(receiver): 충돌해결

app/src/main/java/com/kuit/afternote/feature/receiver/domain/repository/iface/GetMindRecordDetailByAuthCodeRepository.kt

@@ -0,0 +1,21 @@
+package com.kuit.afternote.feature.receiver.domain.repository.iface
+
+/**
+ * 인증번호로 특정 마인드레코드 상세의 대표 이미지 URL을 조회하는 Domain Repository.
+ *
+ * GET /api/receiver-auth/mind-records/{mindRecordId} (X-Auth-Code) API를 사용합니다.
+ */
+interface GetMindRecordDetailByAuthCodeRepository {
+
+    /**
+     * 마인드레코드 상세의 이미지 목록에서 첫 번째 이미지 URL을 반환합니다.
+     * 이미지가 없으면 null을 반환합니다.
+     *
+     * @param authCode 수신자 인증번호 (X-Auth-Code 헤더)
+     * @param mindRecordId 마인드레코드 ID
+     */
+    suspend fun getMindRecordDetailImageUrl(
+        authCode: String,
+        mindRecordId: Long
+    ): Result<String?>
+}

app/src/main/java/com/kuit/afternote/feature/receiver/domain/usecase/GetMindRecordDetailByAuthCodeUseCase.kt

@@ -0,0 +1,31 @@
+package com.kuit.afternote.feature.receiver.domain.usecase
+
+import com.kuit.afternote.feature.receiver.domain.repository.iface.GetMindRecordDetailByAuthCodeRepository
+import javax.inject.Inject
+
+/**
+ * 수신자 인증번호(authCode)와 마인드레코드 ID로 상세의 대표 이미지 URL을 조회하는 UseCase.
+ *
+ * GET /api/receiver-auth/mind-records/{mindRecordId} (X-Auth-Code) API를 사용합니다.
+ */
+class GetMindRecordDetailByAuthCodeUseCase
+    @Inject
+    constructor(
+        private val getMindRecordDetailByAuthCodeRepository: GetMindRecordDetailByAuthCodeRepository
+    ) {
+
+    /**
+     * 마인드레코드 상세의 첫 번째 이미지 URL을 반환합니다. 없으면 null.
+     *
+     * @param authCode 수신자 인증번호
+     * @param mindRecordId 마인드레코드 ID
+     */
+    suspend operator fun invoke(
+        authCode: String,
+        mindRecordId: Long
+    ): Result<String?> =
+        getMindRecordDetailByAuthCodeRepository.getMindRecordDetailImageUrl(
+            authCode = authCode,
+            mindRecordId = mindRecordId
+        )
+}

app/src/main/java/com/kuit/afternote/feature/receiver/presentation/component/TodayRecordCard.kt

@@ -1,5 +1,7 @@
 package com.kuit.afternote.feature.receiver.presentation.component
 
+import android.util.Log
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -19,16 +21,38 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import coil3.compose.AsyncImage
+import coil3.compose.AsyncImagePainter
+import coil3.network.NetworkHeaders
+import coil3.network.httpHeaders
+import coil3.request.ImageRequest
 import com.kuit.afternote.R
 import com.kuit.afternote.feature.receiver.presentation.uimodel.MindRecordItemUiModel
 import com.kuit.afternote.ui.theme.Sansneo
 
+private const val TAG = "TodayRecordCard"
+
+/** 이미지 없을 때 오늘의 기록 카드 배경용 디폴트 테마 (TimeLetterBlockItem과 동일한 비주얼). */
+private object TodayRecordCardDefaultTheme {
+    val backgroundColor: Color = Color(0xFFFFE1CC)
+    val logoResId: Int = R.drawable.logo_yellow
+}
+
 @Composable
-fun TodayRecordCard(todayRecord: MindRecordItemUiModel? = null) {
+fun TodayRecordCard(
+    todayRecord: MindRecordItemUiModel? = null,
+    todayRecordImageUrl: String? = null
+) {
+    val hasImage = !todayRecordImageUrl.isNullOrBlank()
+
     Card(
         modifier = Modifier
             .fillMaxWidth()
@@ -37,21 +61,69 @@ fun TodayRecordCard(todayRecord: MindRecordItemUiModel? = null) {
         elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
     ) {
         Box {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(Color.DarkGray)
-            )
-
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(
-                        Brush.verticalGradient(
-                            colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f))
+            if (hasImage) {
+                val context = LocalContext.current
+                AsyncImage(
+                    model = ImageRequest.Builder(context)
+                        .data(todayRecordImageUrl)
+                        .httpHeaders(
+                            NetworkHeaders.Builder()
+                                .set("User-Agent", "Afternote Android App")
+                                .build()
+                        )
+                        .build(),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier.fillMaxSize(),
+                    error = painterResource(R.drawable.img_time_letter_placeholder),
+                    onError = { state: AsyncImagePainter.State.Error ->
+                        Log.e(TAG, "Coil load failed: url=$todayRecordImageUrl", state.result.throwable)
+                    }
+                )
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(
+                            brush = Brush.verticalGradient(
+                                colors = listOf(
+                                    Color.Transparent,
+                                    Color(0x660E0E0E)
+                                )
+                            )
                         )
+                )
+            } else {
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(
+                            TodayRecordCardDefaultTheme.backgroundColor.copy(alpha = 0.2f)
+                        )
+                )
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(
+                            brush = Brush.verticalGradient(
+                                colorStops = arrayOf(
+                                    0.00f to Color(0x000E0E0E),
+                                    0.09f to Color(0x170E0E0E),
+                                    0.45f to Color(0x730E0E0E),
+                                    1.00f to Color(0x800E0E0E)
+                                )
+                            )
+                        )
+                )
+                Box(
+                    modifier = Modifier.fillMaxSize(),
+                    contentAlignment = Alignment.Center
+                ) {
+                    Image(
+                        painter = painterResource(id = TodayRecordCardDefaultTheme.logoResId),
+                        contentDescription = stringResource(R.string.receiver_mindrecord_card_logo)
                     )
-            )
+                }
+            }
 
             Column(
                 modifier = Modifier
@@ -102,3 +174,25 @@ fun TodayRecordCard(todayRecord: MindRecordItemUiModel? = null) {
         }
     }
 }
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewTodayRecordCardDefault() {
+    TodayRecordCard(
+        todayRecord = MindRecordItemUiModel(
+            mindRecordId = 1L,
+            date = "2025년 2월 19일",
+            tags = "#DIARY",
+            question = "오늘 하루는 어땠나요?",
+            content = "기록 내용",
+            hasImage = false
+        ),
+        todayRecordImageUrl = null
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewTodayRecordCardEmpty() {
+    TodayRecordCard(todayRecord = null, todayRecordImageUrl = null)
+}

app/src/main/java/com/kuit/afternote/feature/receiver/presentation/screen/mindrecord/ReceiverDailyRecordScreen.kt

@@ -156,7 +156,10 @@ fun MindRecordScreen(
                             )
                         }
                         Spacer(modifier = Modifier.height(12.dp))
-                        TodayRecordCard(todayRecord = uiState.todayRecord)
+                        TodayRecordCard(
+                            todayRecord = uiState.todayRecord,
+                            todayRecordImageUrl = uiState.todayRecordImageUrl
+                        )
                     }
                 }
 

app/src/main/java/com/kuit/afternote/feature/receiver/presentation/screen/timeletter/ReceiverTimeLetterDetailScreen.kt

@@ -1,15 +1,18 @@
 package com.kuit.afternote.feature.receiver.presentation.screen.timeletter
 
-import androidx.compose.foundation.background
+import android.util.Log
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 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.statusBarsPadding
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
@@ -21,20 +24,33 @@ 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.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import coil3.compose.AsyncImage
+import coil3.compose.AsyncImagePainter
+import coil3.network.NetworkHeaders
+import coil3.network.httpHeaders
+import coil3.request.ImageRequest
+import com.kuit.afternote.R
 import com.kuit.afternote.core.ui.component.navigation.BottomNavItem
 import com.kuit.afternote.core.ui.component.navigation.BottomNavigationBar
 import com.kuit.afternote.core.ui.component.navigation.TopBar
 import com.kuit.afternote.feature.receiver.domain.entity.ReceivedTimeLetter
+import com.kuit.afternote.feature.receiver.domain.entity.ReceivedTimeLetterMedia
 import com.kuit.afternote.feature.receiver.presentation.uimodel.ReceiverTimeLetterDetailUiState
 import com.kuit.afternote.ui.theme.Gray4
 import com.kuit.afternote.ui.theme.Gray9
 import com.kuit.afternote.ui.theme.Sansneo
 
+private const val TAG = "ReceiverTimeLetterDetailScreen"
+private const val DETAIL_IMAGE_SIZE_DP = 100
+
 @Composable
 fun TimeLetterDetailScreen(
     uiState: ReceiverTimeLetterDetailUiState,
@@ -121,22 +137,17 @@ private fun TimeLetterDetailContent(
             fontFamily = Sansneo
         )
 
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(1.6f)
-                .clip(RoundedCornerShape(16.dp))
-                .background(Color.LightGray)
-        ) {
-            Text(
-                text = "가족 사진 영역",
-                color = Color.DarkGray,
-                modifier = Modifier.align(Alignment.Center)
+        val imageUrls = letter.mediaList
+            .filter { it.mediaType == "IMAGE" }
+            .map { it.mediaUrl }
+        if (imageUrls.isNotEmpty()) {
+            ReceiverDetailMediaRow(
+                mediaUrls = imageUrls,
+                modifier = Modifier.fillMaxWidth()
             )
+            Spacer(modifier = Modifier.height(24.dp))
         }
 
-        Spacer(modifier = Modifier.height(24.dp))
-
         Text(
             text = letter.content.orEmpty().ifEmpty { " " },
             color = Gray9,
@@ -150,6 +161,44 @@ private fun TimeLetterDetailContent(
     }
 }
 
+@Composable
+private fun ReceiverDetailMediaRow(
+    mediaUrls: List<String>,
+    modifier: Modifier = Modifier
+) {
+    val context = LocalContext.current
+    val imageSizeDp = DETAIL_IMAGE_SIZE_DP.dp
+    val contentDesc = stringResource(R.string.content_description_time_letter_media)
+
+    Row(
+        modifier = modifier.horizontalScroll(rememberScrollState()),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        mediaUrls.forEach { url ->
+            AsyncImage(
+                model = ImageRequest.Builder(context)
+                    .data(url)
+                    .httpHeaders(
+                        NetworkHeaders.Builder()
+                            .set("User-Agent", "Afternote Android App")
+                            .build()
+                    )
+                    .build(),
+                contentDescription = contentDesc,
+                contentScale = ContentScale.Crop,
+                modifier = Modifier
+                    .size(imageSizeDp)
+                    .clip(RoundedCornerShape(8.dp)),
+                error = painterResource(R.drawable.img_time_letter_placeholder),
+                onError = { state: AsyncImagePainter.State.Error ->
+                    Log.e(TAG, "Coil load failed: url=$url", state.result.throwable)
+                }
+            )
+        }
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 private fun PreviewTimeLetterDetail() {
@@ -177,3 +226,39 @@ private fun PreviewTimeLetterDetail() {
         )
     }
 }
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewTimeLetterDetailWithMedia() {
+    MaterialTheme {
+        val sampleLetter = ReceivedTimeLetter(
+            timeLetterId = 1L,
+            timeLetterReceiverId = 100L,
+            title = "채연아 20번째 생일을 축하해",
+            content = "사랑한다 생일 축하해 내 딸.",
+            sendAt = "2027년 11월 24일",
+            status = "DRAFT",
+            senderName = "박채연",
+            deliveredAt = null,
+            createdAt = null,
+            mediaList = listOf(
+                ReceivedTimeLetterMedia(
+                    id = 1L,
+                    mediaType = "IMAGE",
+                    mediaUrl = "https://example.com/sample1.jpg"
+                ),
+                ReceivedTimeLetterMedia(
+                    id = 2L,
+                    mediaType = "IMAGE",
+                    mediaUrl = "https://example.com/sample2.jpg"
+                )
+            ),
+            isRead = false
+        )
+        TimeLetterDetailScreen(
+            uiState = ReceiverTimeLetterDetailUiState(letter = sampleLetter),
+            onBackClick = { },
+            onBottomNavSelected = { }
+        )
+    }
+}