[fix] #78 아카이브 업로드 QA 수정

core/common/build.gradle.kts

@@ -13,4 +13,6 @@ dependencies {
     api(libs.kakao.user)
     implementation(libs.androidx.security.crypto)
     implementation(libs.androidx.core.ktx)
+
+    implementation(libs.androidx.exifinterface)
 }

core/common/src/main/java/com/neki/android/core/common/util/ByteArray.kt

@@ -3,7 +3,9 @@ package com.neki.android.core.common.util
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.Matrix
 import android.net.Uri
+import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
@@ -16,8 +18,22 @@ fun Uri.toByteArray(
     quality: Int = DEFAULT_QUALITY,
     format: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG,
 ): ByteArray? {
+    val orientation = context.contentResolver.openInputStream(this)?.use { input ->
+        ExifInterface(input).getAttributeInt(
+            ExifInterface.TAG_ORIENTATION,
+            ExifInterface.ORIENTATION_UNDEFINED,
+        )
+    } ?: ExifInterface.ORIENTATION_UNDEFINED
     val bytes = context.contentResolver.openInputStream(this)?.use { it.readBytes() } ?: return null
-    return bytes.compress(quality, format)
+    val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return null
+    val rotatedBitmap = bitmap.applyOrientation(orientation)
+
+    return ByteArrayOutputStream().use { outputStream ->
+        rotatedBitmap.compress(format, quality, outputStream)
+        if (rotatedBitmap !== bitmap) bitmap.recycle()
+        rotatedBitmap.recycle()
+        outputStream.toByteArray()
+    }
 }
 
 suspend fun String.urlToByteArray(
@@ -28,6 +44,29 @@ suspend fun String.urlToByteArray(
     bytes.compress(quality, format)
 }
 
+private fun Bitmap.applyOrientation(orientation: Int): Bitmap {
+    val matrix = Matrix()
+    when (orientation) {
+        ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+        ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
+        ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
+        ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.postScale(-1f, 1f)
+        ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.postScale(1f, -1f)
+        ExifInterface.ORIENTATION_TRANSPOSE -> {
+            matrix.postRotate(90f)
+            matrix.postScale(-1f, 1f)
+        }
+
+        ExifInterface.ORIENTATION_TRANSVERSE -> {
+            matrix.postRotate(270f)
+            matrix.postScale(-1f, 1f)
+        }
+
+        else -> return this
+    }
+    return Bitmap.createBitmap(this, 0, 0, width, height, matrix, true)
+}
+
 private fun ByteArray.compress(
     quality: Int,
     format: Bitmap.CompressFormat,

core/data/src/main/java/com/neki/android/core/data/remote/api/PhotoService.kt

@@ -54,7 +54,7 @@ class PhotoService @Inject constructor(
         }.body()
     }
 
-    // 즐겨찾기 사진 조회
+    // 즐겨찾는 앨범 조회
     suspend fun getFavoritePhotos(
         page: Int = 0,
         size: Int = 20,

core/designsystem/src/main/java/com/neki/android/core/designsystem/logo/NekiTypoLogo.kt

@@ -0,0 +1,79 @@
+package com.neki.android.core.designsystem.logo
+
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.neki.android.core.designsystem.ComponentPreview
+import com.neki.android.core.designsystem.R
+import com.neki.android.core.designsystem.ui.theme.NekiTheme
+
+@Composable
+private fun NekiTypoLogo(
+    color: Color,
+    modifier: Modifier = Modifier,
+) {
+    Icon(
+        imageVector = ImageVector.vectorResource(R.drawable.icon_neki_logo_typo),
+        contentDescription = null,
+        tint = color,
+        modifier = modifier,
+    )
+}
+
+@Composable
+fun PrimaryNekiTypoLogo(
+    modifier: Modifier = Modifier,
+) {
+    NekiTypoLogo(
+        color = NekiTheme.colorScheme.primary400,
+        modifier = modifier,
+    )
+}
+
+@Composable
+fun GrayNekiTypoLogo(
+    modifier: Modifier = Modifier,
+) {
+    NekiTypoLogo(
+        color = NekiTheme.colorScheme.gray900,
+        modifier = modifier,
+    )
+}
+
+@Composable
+fun WhiteNekiTypoLogo(
+    modifier: Modifier = Modifier,
+) {
+    NekiTypoLogo(
+        color = NekiTheme.colorScheme.white,
+        modifier = modifier,
+    )
+}
+
+@ComponentPreview
+@Composable
+private fun PrimaryNekiTypoLogoPreview() {
+    NekiTheme {
+        PrimaryNekiTypoLogo()
+    }
+}
+
+@ComponentPreview
+@Composable
+private fun GrayNekiTypoLogoPreview() {
+    NekiTheme {
+        GrayNekiTypoLogo()
+    }
+}
+
+@Preview
+@Composable
+private fun WhiteNekiTypoLogoPreview() {
+    NekiTheme {
+        WhiteNekiTypoLogo()
+    }
+}

core/designsystem/src/main/java/com/neki/android/core/designsystem/modifier/Background.kt

@@ -2,14 +2,11 @@ package com.neki.android.core.designsystem.modifier
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import dev.chrisbanes.haze.HazeState
@@ -56,28 +53,29 @@ fun Modifier.poseBackground(
  * 블러 효과가 적용된 배경을 설정하는 Modifier 확장 함수
  *
  * @param hazeState Haze 블러 효과를 관리하는 상태 객체
- * @param enabled 블러 효과 활성화 여부 (false일 경우 단색 배경 적용)
+ * @param alpha 블러 틴트에 적용될 색상의 알파 값
  * @param color 블러 효과에 적용될 배경 색상
- * @param defaultBackgroundColor 블러 비활성화 시 적용될 기본 배경 색상
  * @param blurRadius 블러 효과의 반경
+ * @param enabled 블러 효과 활성화 여부 (false일 경우 단색 배경 적용)
+ * @param defaultBackgroundColor 블러 비활성화 시 적용될 기본 배경 색상
  */
-@Composable
 fun Modifier.backgroundHazeBlur(
     hazeState: HazeState,
+    alpha: Float,
+    color: Color,
+    blurRadius: Dp,
     enabled: Boolean = true,
-    color: Color = Color(0xFF202227).copy(alpha = 0.9f),
     defaultBackgroundColor: Color = color,
-    blurRadius: Dp = 12.dp,
 ): Modifier =
     if (enabled) {
         this.hazeEffect(
             state = hazeState,
             style = HazeStyle(
                 backgroundColor = color,
-                tint = HazeTint(
-                    color.copy(alpha = if (color.luminance() >= 0.5) 0.6f else 0.65f),
-                ),
+                tint = HazeTint(color.copy(alpha = alpha)),
                 blurRadius = blurRadius,
             ),
         )
-    } else this.background(color = defaultBackgroundColor)
+    } else this.background(
+        color = defaultBackgroundColor,
+    )

core/designsystem/src/main/java/com/neki/android/core/designsystem/popup/ToolTipPopup.kt

@@ -0,0 +1,116 @@
+package com.neki.android.core.designsystem.popup
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Popup
+import com.neki.android.core.designsystem.ComponentPreview
+import com.neki.android.core.designsystem.ui.theme.NekiTheme
+
+@Composable
+fun ToolTipPopup(
+    tooltipText: String,
+    color: Color,
+    offset: IntOffset,
+    alignment: Alignment,
+    onDismissRequest: () -> Unit,
+) {
+    Popup(
+        alignment = alignment,
+        offset = offset,
+        onDismissRequest = onDismissRequest,
+    ) {
+        ToolTipContent(
+            tooltipText = tooltipText,
+            color = color,
+        )
+    }
+}
+
+@Composable
+private fun ToolTipContent(
+    tooltipText: String,
+    color: Color,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.width(IntrinsicSize.Max),
+    ) {
+        // 꼬리 (오른쪽 정렬, 오른쪽에서 16dp)
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(end = 16.dp),
+            contentAlignment = Alignment.CenterEnd,
+        ) {
+            Canvas(
+                modifier = Modifier.size(width = 10.dp, height = 8.dp),
+            ) {
+                val cornerRadius = 1.dp.toPx()
+                val path = Path().apply {
+                    // 왼쪽 하단에서 시작
+                    moveTo(0f, size.height)
+                    // 왼쪽 하단 -> 꼭대기 (둥근 모서리)
+                    lineTo(
+                        size.width / 2 - cornerRadius,
+                        cornerRadius,
+                    )
+                    quadraticTo(
+                        size.width / 2,
+                        0f,
+                        size.width / 2 + cornerRadius,
+                        cornerRadius,
+                    )
+                    // 꼭대기 -> 오른쪽 하단
+                    lineTo(size.width, size.height)
+                    close()
+                }
+                drawPath(path, color)
+            }
+        }
+
+        // 몸통
+        Box(
+            modifier = Modifier
+                .background(
+                    color = color,
+                    shape = RoundedCornerShape(8.dp),
+                )
+                .padding(horizontal = 12.dp, vertical = 8.dp),
+        ) {
+            Text(
+                text = tooltipText,
+                style = NekiTheme.typography.body14Medium,
+                color = NekiTheme.colorScheme.white,
+            )
+        }
+    }
+}
+
+@ComponentPreview
+@Composable
+private fun ToolTipPopupPreview() {
+    NekiTheme {
+        Box(modifier = Modifier.padding(16.dp)) {
+            ToolTipContent(
+                tooltipText = "툴팁 메시지입니다",
+                color = NekiTheme.colorScheme.gray800,
+            )
+        }
+    }
+}