인증샷 업로드 기능 구현

app/src/main/java/com/yapp/twix/main/MainActivity.kt

@@ -5,8 +5,11 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
@@ -31,8 +34,9 @@ class MainActivity : ComponentActivity() {
                 Box(
                     modifier =
                         Modifier
-                            .fillMaxSize()
-                            .safeContentPadding(),
+                            .windowInsetsPadding(
+                                WindowInsets.systemBars.only(WindowInsetsSides.Vertical),
+                            ),
                 ) {
                     AppNavHost()
 

core/design-system/src/main/java/com/twix/designsystem/components/comment/model/CommentUiModel.kt

@@ -8,9 +8,6 @@ data class CommentUiModel(
     val comment: TextFieldValue = TextFieldValue(""),
     val isFocused: Boolean = false,
 ) {
-    val isEmpty: Boolean
-        get() = comment.text.isEmpty()
-
     val hasMaxCommentLength: Boolean
         get() = comment.text.length == COMMENT_COUNT
 

core/network/src/main/java/com/twix/network/model/request/photolog/mapper/PhotologMapper.kt

@@ -0,0 +1,12 @@
+package com.twix.network.model.request.photolog.mapper
+
+import com.twix.domain.model.photo.PhotologParam
+import com.twix.network.model.request.photolog.model.PhotologRequest
+
+fun PhotologParam.toRequest(): PhotologRequest =
+    PhotologRequest(
+        goalId = goalId,
+        fileName = fileName,
+        comment = comment,
+        verificationDate = verificationDate.toString(),
+    )

core/network/src/main/java/com/twix/network/model/request/photolog/model/PhotologRequest.kt

@@ -0,0 +1,12 @@
+package com.twix.network.model.request.photolog.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PhotologRequest(
+    @SerialName("goalId") val goalId: Long,
+    @SerialName("fileName") val fileName: String,
+    @SerialName("comment") val comment: String,
+    @SerialName("verificationDate") val verificationDate: String,
+)

core/network/src/main/java/com/twix/network/service/PhotoLogService.kt

@@ -1,8 +1,11 @@
 package com.twix.network.service
 
+import com.twix.network.model.request.photolog.model.PhotologRequest
 import com.twix.network.model.response.photo.model.PhotoLogUploadUrlResponse
 import com.twix.network.model.response.photolog.PhotoLogResponse
+import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.POST
 import de.jensklingenberg.ktorfit.http.Path
 import de.jensklingenberg.ktorfit.http.Query
 
@@ -12,6 +15,11 @@ interface PhotoLogService {
         @Query("goalId") goalId: Long,
     ): PhotoLogUploadUrlResponse
 
+    @POST("api/v1/photologs")
+    suspend fun uploadPhotoLog(
+        @Body request: PhotologRequest,
+    )
+
     @GET("api/v1/photologs/goals/{goalId}")
     suspend fun fetchPhotoLogs(
         @Path("goalId") goalId: Long,

core/ui/src/main/java/com/twix/ui/extension/Context.kt

@@ -0,0 +1,40 @@
+package com.twix.ui.extension
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import java.io.ByteArrayOutputStream
+
+/**
+ * 주어진 [Uri]로부터 이미지를 읽어 JPEG 형식의 [ByteArray]로 변환한다.
+ *
+ * 내부 동작 과정:
+ * 1. [ContentResolver.openInputStream]으로 InputStream을 연다.
+ * 2. [BitmapFactory.decodeStream]으로 Bitmap 디코딩
+ * 3. JPEG(품질 90) 압축 후 ByteArray 반환
+ *
+ * 실패 케이스:
+ * - InputStream 열기 실패
+ * - 디코딩 실패 (손상 이미지 등)
+ * - 압축 실패
+ *
+ * @param imageUri 변환할 이미지 Uri (content:// 또는 file://)
+ * @return 변환 성공 시 JPEG 바이트 배열, 실패 시 null
+ */
+fun Context.uriToByteArray(imageUri: Uri): ByteArray? {
+    return try {
+        contentResolver.openInputStream(imageUri)?.use { inputStream ->
+            val bitmap = BitmapFactory.decodeStream(inputStream) ?: return null
+
+            ByteArrayOutputStream().use { outputStream ->
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
+                bitmap.recycle()
+                outputStream.toByteArray()
+            }
+        }
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
+    }
+}

core/util/src/main/java/com/twix/util/bus/TaskCertificationRefreshBus.kt

@@ -0,0 +1,17 @@
+package com.twix.util.bus
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+class TaskCertificationRefreshBus {
+    private val _events =
+        MutableSharedFlow<Unit>(
+            replay = 0,
+            extraBufferCapacity = 1,
+        )
+
+    val events: SharedFlow<Unit> = _events.asSharedFlow()
+
+    fun notifyChanged() = _events.tryEmit(Unit)
+}

core/util/src/main/java/com/twix/util/di/UtilModule.kt

@@ -1,9 +1,11 @@
 package com.twix.util.di
 
 import com.twix.util.bus.GoalRefreshBus
+import com.twix.util.bus.TaskCertificationRefreshBus
 import org.koin.dsl.module
 
 val utilModule =
     module {
         single { GoalRefreshBus() }
+        single { TaskCertificationRefreshBus() }
     }

data/src/main/java/com/twix/data/repository/DefaultPhotoLogRepository.kt

@@ -1,9 +1,11 @@
 package com.twix.data.repository
 
 import com.twix.domain.model.photo.PhotoLogUploadInfo
+import com.twix.domain.model.photo.PhotologParam
 import com.twix.domain.model.photolog.PhotoLogs
 import com.twix.domain.repository.PhotoLogRepository
 import com.twix.network.execute.safeApiCall
+import com.twix.network.model.request.photolog.mapper.toRequest
 import com.twix.network.model.response.photo.mapper.toDomain
 import com.twix.network.model.response.photolog.mapper.toDomain
 import com.twix.network.service.PhotoLogService
@@ -16,6 +18,9 @@ class DefaultPhotoLogRepository(
 ) : PhotoLogRepository {
     override suspend fun getUploadUrl(goalId: Long): AppResult<PhotoLogUploadInfo> = safeApiCall { service.getUploadUrl(goalId).toDomain() }
 
+    override suspend fun uploadPhotoLog(photologParam: PhotologParam): AppResult<Unit> =
+        safeApiCall { service.uploadPhotoLog(photologParam.toRequest()) }
+
     override suspend fun uploadPhotoLogImage(
         goalId: Long,
         bytes: ByteArray,

domain/src/main/java/com/twix/domain/model/photo/PhotologParam.kt

@@ -0,0 +1,10 @@
+package com.twix.domain.model.photo
+
+import java.time.LocalDate
+
+data class PhotologParam(
+    val goalId: Long,
+    val fileName: String,
+    val comment: String,
+    val verificationDate: LocalDate,
+)

domain/src/main/java/com/twix/domain/repository/PhotoLogRepository.kt

@@ -1,12 +1,15 @@
 package com.twix.domain.repository
 
 import com.twix.domain.model.photo.PhotoLogUploadInfo
+import com.twix.domain.model.photo.PhotologParam
 import com.twix.domain.model.photolog.PhotoLogs
 import com.twix.result.AppResult
 
 interface PhotoLogRepository {
     suspend fun getUploadUrl(goalId: Long): AppResult<PhotoLogUploadInfo>
 
+    suspend fun uploadPhotoLog(photologParam: PhotologParam): AppResult<Unit>
+
     suspend fun uploadPhotoLogImage(
         goalId: Long,
         bytes: ByteArray,

feature/task-certification/src/main/java/com/twix/task_certification/certification/TaskCertificationScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -30,6 +31,7 @@ import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.CompositingStrategy
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
@@ -62,29 +64,28 @@ import com.twix.task_certification.certification.model.TaskCertificationSideEffe
 import com.twix.task_certification.certification.model.TaskCertificationUiState
 import com.twix.ui.base.ObserveAsEvents
 import com.twix.ui.extension.noRippleClickable
+import com.twix.ui.extension.uriToByteArray
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
 import com.twix.designsystem.R as DesR
 
 @Composable
 fun TaskCertificationRoute(
-    goalId: Long,
     toastManager: ToastManager = koinInject(),
     camera: Camera = koinInject(),
     viewModel: TaskCertificationViewModel = koinViewModel(),
     navigateToBack: () -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val cameraPreview by camera.surfaceRequests.collectAsStateWithLifecycle()
-
+    val context = LocalContext.current
+    val currentContext by rememberUpdatedState(context)
     val lifecycleOwner = LocalLifecycleOwner.current
     val coroutineScope = rememberCoroutineScope()
 
-    LaunchedEffect(goalId) {
-        viewModel.dispatch(TaskCertificationIntent.InitGoal(goalId))
-    }
-
     val pickMedia =
         rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
             viewModel.dispatch(TaskCertificationIntent.PickPicture(uri))
@@ -115,6 +116,35 @@ fun TaskCertificationRoute(
                     ),
                 )
             }
+
+            is TaskCertificationSideEffect.ShowToast -> {
+                toastManager.tryShow(
+                    ToastData(
+                        message = currentContext.getString(event.message),
+                        type = event.type,
+                    ),
+                )
+            }
+
+            is TaskCertificationSideEffect.GetImageFromUri -> {
+                val bytes =
+                    withContext(Dispatchers.IO) {
+                        currentContext.uriToByteArray(event.uri)
+                    }
+
+                if (bytes != null) {
+                    viewModel.dispatch(TaskCertificationIntent.Upload(bytes))
+                } else {
+                    toastManager.tryShow(
+                        ToastData(
+                            message = currentContext.getString(R.string.task_certification_image_translate_fail),
+                            type = ToastType.ERROR,
+                        ),
+                    )
+                }
+            }
+
+            TaskCertificationSideEffect.NavigateToDetail -> navigateToBack()
         }
     }
 
@@ -152,7 +182,7 @@ fun TaskCertificationRoute(
             viewModel.dispatch(TaskCertificationIntent.CommentFocusChanged(it))
         },
         onClickUpload = {
-            viewModel.dispatch(TaskCertificationIntent.Upload)
+            viewModel.dispatch(TaskCertificationIntent.TryUpload)
         },
     )
 }
@@ -194,7 +224,7 @@ private fun TaskCertificationScreen(
                 CommentErrorText()
             } else {
                 AppText(
-                    text = stringResource(R.string.task_certification_image_upload),
+                    text = stringResource(R.string.task_certification_take_picture),
                     style = AppTextStyle.H2,
                     color = GrayColor.C100,
                 )