[Refactor] 2차 QA 디자인 수정

app/src/main/java/com/dplay/worker/DailyQuestionWorker.kt

@@ -24,6 +24,8 @@ class DailyQuestionWorker(
     private fun showNotification() {
         val notificationManager =
             context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val title = context.getString(R.string.notification_title)
+        val content = context.getString(R.string.notification_content)
 
         // 명시적으로 버전 관리
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -55,8 +57,8 @@ class DailyQuestionWorker(
             NotificationCompat
                 .Builder(context, CHANNEL_ID)
                 .setSmallIcon(R.mipmap.ic_launcher)
-                .setContentTitle(NOTIFICATION_CONTENT_TITLE)
-                .setContentText(NOTIFICATION_CONTENT_TEXT)
+                .setContentTitle(title)
+                .setContentText(content)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setContentIntent(pendingIntent)
                 .setAutoCancel(true)
@@ -70,8 +72,6 @@ class DailyQuestionWorker(
         const val CHANNEL_NAME = "Daily Question"
         const val CHANNEL_DESCRIPTION = "Daily Question Notification"
         const val NOTIFICATION_ID = 1001
-        const val NOTIFICATION_CONTENT_TITLE = "오늘의 질문이 도착했습니다!"
-        const val NOTIFICATION_CONTENT_TEXT = "지금 바로 확인해보세요."
         const val WORK_NAME = "daily_question_work"
         const val TAG = "DailyQuestionWorker"
     }

app/src/main/res/values/strings.xml

@@ -1,3 +1,5 @@
 <resources>
-    <string name="app_name">DPlay</string>
+    <string name="app_name">Dplay</string>
+    <string name="notification_title">디플레이</string>
+    <string name="notification_content">오늘의 질문이 도착했어요</string>
 </resources>

core/designsystem/src/main/java/com/example/designsystem/component/DPlayErrorScreen.kt

@@ -0,0 +1,65 @@
+package com.example.designsystem.component
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.dplay.designsystem.R
+import com.example.designsystem.theme.DPlayTheme
+
+@Composable
+fun DPlayErrorScreen(
+    modifier: Modifier = Modifier,
+    onBackIconClick: () -> Unit = {},
+) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        DplayLeftIconTopAppBar {
+            onBackIconClick()
+        }
+
+        Spacer(modifier = Modifier.height(height = 132.dp))
+
+        Image(
+            painter = painterResource(id = R.drawable.img_warning),
+            contentDescription = null,
+            modifier = Modifier.size(size = 140.dp),
+        )
+
+        Spacer(modifier = Modifier.height(height = 12.dp))
+
+        Text(
+            text = stringResource(R.string.error_main_text),
+            style = DPlayTheme.typography.bodyBold16,
+            color = DPlayTheme.colors.dplayBlack,
+        )
+
+        Spacer(modifier = Modifier.height(height = 8.dp))
+
+        Text(
+            text = stringResource(R.string.error_sub_text),
+            style = DPlayTheme.typography.bodyMed14,
+            color = DPlayTheme.colors.gray400,
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun DPlayErrorScreenPreview(modifier: Modifier = Modifier) {
+    DPlayTheme {
+        DPlayErrorScreen(modifier = modifier)
+    }
+}

core/designsystem/src/main/java/com/example/designsystem/component/DPlayLoadingScreen.kt

@@ -0,0 +1,30 @@
+package com.example.designsystem.component
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.example.designsystem.theme.DPlayTheme
+
+@Composable
+fun DPlayLoadingScreen(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center,
+    ) {
+        CircularProgressIndicator()
+    }
+}
+
+@Preview
+@Composable
+private fun DPlayLoadingScreenPreview() {
+    DPlayTheme {
+        DPlayLoadingScreen()
+    }
+}

core/designsystem/src/main/java/com/example/designsystem/component/DPlayMusicGridItem.kt

@@ -9,8 +9,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.example.designsystem.theme.DPlayTheme
 import com.example.designsystem.util.noRippleClickable
@@ -22,6 +24,10 @@ fun DPlayMusicGridItem(
     musicArtistName: String,
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
+    titleStyle: TextStyle = DPlayTheme.typography.bodySemi14,
+    artistStyle: TextStyle = DPlayTheme.typography.capMed12,
+    spaceBetweenCover: Dp = 5.dp,
+    spaceBetweenText: Dp = 1.dp,
 ) {
     Column(modifier = modifier.noRippleClickable(onClick = onClick), horizontalAlignment = Alignment.CenterHorizontally) {
         DPlayMusicDiscItem(
@@ -30,18 +36,18 @@ fun DPlayMusicGridItem(
                 Modifier
                     .fillMaxWidth(),
         )
-        Spacer(modifier = Modifier.height(5.dp))
+        Spacer(modifier = Modifier.height(spaceBetweenCover))
         Text(
             text = musicName,
-            style = DPlayTheme.typography.bodySemi14,
+            style = titleStyle,
             color = DPlayTheme.colors.dplayBlack,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
         )
-        Spacer(modifier = Modifier.height(1.dp))
+        Spacer(modifier = Modifier.height(spaceBetweenText))
         Text(
             text = musicArtistName,
-            style = DPlayTheme.typography.capMed12,
+            style = artistStyle,
             color = DPlayTheme.colors.gray400,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,

core/designsystem/src/main/java/com/example/designsystem/component/button/DplayGuidelineButton.kt

@@ -43,7 +43,7 @@ fun DPlayGuidelineButton(
             )
 
             Spacer(
-                modifier = Modifier.size(8.dp),
+                modifier = Modifier.size(4.dp),
             )
 
             Text(

core/designsystem/src/main/java/com/example/designsystem/component/button/type/CircleButtonType.kt

@@ -50,7 +50,7 @@ sealed class CircleButtonType {
         override val contentDescription: Int = R.string.circle_plus_button_icon_default_description,
     ) : CircleButtonType() {
         override val containerSize = 56.dp
-        override val backgroundColor = defaultDPlayColors.dplayBlack
+        override val backgroundColor = defaultDPlayColors.gray600
         override val iconRes = R.drawable.ic_plus_28
         override val iconSize = 28.dp
         override val iconTint = defaultDPlayColors.dplayWhite

core/designsystem/src/main/java/com/example/designsystem/component/chip/type/DPlayChipType.kt

@@ -5,19 +5,19 @@ import androidx.annotation.StringRes
 import com.dplay.designsystem.R
 
 enum class DPlayChipType(
-    @DrawableRes val iconRes: Int,
+    @DrawableRes val drawableRes: Int,
     @StringRes val stringRes: Int,
 ) {
     EDITOR(
-        iconRes = R.drawable.ic_editor_20,
+        drawableRes = R.drawable.editor_chip,
         stringRes = R.string.chip_editor,
     ),
     NEW(
-        iconRes = R.drawable.ic_new_20,
+        drawableRes = R.drawable.new_chip,
         stringRes = R.string.chip_new,
     ),
     BEST(
-        iconRes = R.drawable.ic_best_20,
+        drawableRes = R.drawable.best_chip,
         stringRes = R.string.chip_best,
     ),
 }

core/designsystem/src/main/java/com/example/designsystem/component/modal/GraphicModal.kt

@@ -42,7 +42,7 @@ fun GraphicModal(
         modifier =
             modifier
                 .clip(
-                    shape = RoundedCornerShape(16.dp),
+                    shape = RoundedCornerShape(12.dp),
                 ).background(
                     color = DPlayTheme.colors.dplayWhite,
                 ),

core/designsystem/src/main/java/com/example/designsystem/component/modal/WarningModal.kt

@@ -50,7 +50,7 @@ fun WarningModal(
     onLeftButtonClick: () -> Unit = {},
     onRightButtonClick: () -> Unit = {},
 ) {
-    val warningModalShape = RoundedCornerShape(16.dp)
+    val warningModalShape = RoundedCornerShape(12.dp)
 
     Box(
         modifier =

core/designsystem/src/main/res/values/strings.xml

@@ -104,8 +104,8 @@
     <string name="snackbar_message_add_collection">보관함에 추가했어요</string>
     <string name="snackbar_message_streaming_not_support">미리듣기가 제공되지 않는 곡이에요</string>
     <string name="snackbar_action_message_navigate_collection">보러가기</string>
-
-
+    <string name="error_main_text">앗! 일시적인 오류가 발생했어요</string>
+    <string name="error_sub_text">잠시 후 다시 시도해주세요</string>
 
 
 </resources>

core/domain/src/main/java/com/example/domain/model/LoadingState.kt

@@ -0,0 +1,7 @@
+package com.example.domain.model
+
+enum class LoadingState {
+    LOADING,
+    SUCCESS,
+    FAILURE
+}

feature/comment/src/main/java/com/example/comment/CommentScreen.kt

@@ -127,6 +127,10 @@ fun CommentScreen(
                 Modifier
                     .width(132.dp)
                     .align(Alignment.CenterHorizontally),
+            titleStyle = DPlayTheme.typography.titleBold18,
+            artistStyle = DPlayTheme.typography.bodySemi14,
+            spaceBetweenCover = 12.dp,
+            spaceBetweenText = 6.dp,
         )
 
         Spacer(modifier = Modifier.height(16.dp))

feature/detail/src/main/java/com/example/detail/DetailContract.kt

@@ -3,12 +3,15 @@ package com.example.detail
 import com.example.designsystem.component.snackbar.type.SnackBarType
 import com.example.domain.model.BADGE
 import com.example.domain.model.Like
+import com.example.domain.model.LoadingState
 import com.example.domain.model.Track
 import com.example.domain.model.Writer
+import com.example.navigation.MyPageTab
 import com.example.ui.base.BaseContract
 
 class DetailContract {
     data class DetailState(
+        val loadingState: LoadingState = LoadingState.LOADING,
         val postId: Long = 0L,
         val isScrapped: Boolean = false,
         val content: String = "",
@@ -83,6 +86,8 @@ class DetailContract {
             val action: (() -> Unit)? = null,
         ) : DetailSideEffect
 
-        data object NavigateToMyPage : DetailSideEffect
+        data class NavigateToMyPage(
+            val initialTab: MyPageTab = MyPageTab.REGISTERED,
+        ) : DetailSideEffect
     }
 }