🔀 :: (#317) 홈 화면 개편

app/src/main/java/com/idiotfrogs/memoryseal/MainActivity.kt

@@ -28,7 +28,8 @@ import com.idiotfrogs.create.CreateRoute
 import com.idiotfrogs.designsystem.theme.MSTheme
 import com.idiotfrogs.detail.DetailRoute
 import com.idiotfrogs.friend.FriendRoute
-import com.idiotfrogs.home.HomeRoute
+import com.idiotfrogs.home.detail.HomeDetailRoute
+import com.idiotfrogs.home.home.HomeRoute
 import com.idiotfrogs.management.ManagementRoute
 import com.idiotfrogs.memory.MemoryRoute
 import com.idiotfrogs.message.MessageRoute
@@ -135,6 +136,7 @@ class MainActivity : ComponentActivity() {
                                 entry<Routes.Login> { LoginRoute() }
                                 entry<Routes.SignUp> { SignUpRoute() }
                                 entry<Routes.Home> { HomeRoute() }
+                                entry<Routes.HomeDetail> { HomeDetailRoute(it.homeDetailType) }
                                 entry<Routes.Create> { CreateRoute() }
                                 entry<Routes.Profile> { ProfileRoute() }
                                 entry<Routes.EditProfile> { EditProfileRoute() }

app/src/main/java/com/idiotfrogs/memoryseal/MainViewModel.kt

@@ -54,8 +54,9 @@ class MainViewModel @Inject constructor(
 
         val event = when (action) {
             "member" -> MainNavigationEvent.NavigateToFriend(id)
-            "detail" -> MainNavigationEvent.NavigateToDetail(id)
-            "open" -> MainNavigationEvent.NavigateToMemory(id)
+            // 오픈도 detail에서 열람 이력 확인 후 애니메이션 노출 여부 결정
+            "detail", "open" -> MainNavigationEvent.NavigateToDetail(id)
+            "season" -> MainNavigationEvent.NavigateToDetail(id, refreshHome = true)
             else -> return
         }
 
@@ -133,6 +134,7 @@ sealed interface MainNavigationEvent {
     data class NavigateToDetail(
         val capsuleId: Long,
         val toastMessage: String? = null,
+        val refreshHome: Boolean = false
     ) : MainNavigationEvent
     data class NavigateToMemory(val capsuleId: Long) : MainNavigationEvent
 }

common/extension/src/main/java/com/idiotfrogs/extension/LocalDateExtension.kt

@@ -37,3 +37,17 @@ fun LocalDate?.toOpenRemainingText(): String {
         else -> "오픈"
     }
 }
+
+@OptIn(ExperimentalTime::class)
+fun LocalDate?.toDdayCount(): String? {
+    if (this == null) return null
+
+    val today = Clock.System.todayIn(TimeZone.of("Asia/Seoul"))
+    val diff = toEpochDays() - today.toEpochDays()
+
+    return when {
+        diff > 0L -> "D-$diff"
+        diff == 0L -> "D-Day"
+        else -> null // 해당 케이스는 오류 상황이라 표시 x
+    }
+}

core/designsystem/src/main/java/com/idiotfrogs/designsystem/component/MSActionContainer.kt

@@ -16,6 +16,7 @@ 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.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.idiotfrogs.designsystem.component.button.MSButton
@@ -120,4 +121,124 @@ fun MSActionContainer(
             }
         }
     }
+}
+
+@Composable
+fun MSActionContainer(
+    title: String,
+    subtitle: String,
+    content: String,
+    hint: String,
+    textFieldState: TextFieldState,
+    primaryButtonText: String,
+    primaryWavyStrokeColor: Color,
+    secondaryWavyStrokeColor: Color,
+    onPrimaryClick: () -> Unit,
+    onSecondaryClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    primaryButtonEnabled: Boolean = textFieldState.text.isNotEmpty(),
+    secondaryButtonText: String= "취소",
+    primaryButtonWeight: Float = 1f,
+    secondaryButtonWeight: Float = 1f,
+    focusedBorderColor: Color = MSTheme.color.primaryNormal,
+    unfocusedBorderColor: Color = MSTheme.color.greyG1,
+    primaryButtonColors: ButtonColors = ButtonDefaults.buttonColors(
+        containerColor = MSTheme.color.primaryNormal,
+        disabledContainerColor = MSTheme.color.primaryLight,
+    ),
+    primaryPressColors: ButtonColors = ButtonDefaults.buttonColors(
+        containerColor = MSTheme.color.primaryDark,
+        disabledContainerColor = MSTheme.color.primaryLight,
+    ),
+    primaryTextColor: Color = MSTheme.color.white,
+    secondaryButtonColors: ButtonColors = ButtonDefaults.buttonColors(
+        containerColor = MSTheme.color.greyG1,
+        disabledContainerColor = MSTheme.color.greyG1,
+    ),
+    secondaryPressColors: ButtonColors = ButtonDefaults.buttonColors(
+        containerColor = MSTheme.color.greyG1,
+        disabledContainerColor = MSTheme.color.greyG1,
+    ),
+    secondaryTextColor: Color = MSTheme.color.greyG5,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .background(
+                color = MSTheme.color.white,
+                shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
+            )
+            .padding(horizontal = 20.dp, vertical = 24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        MSText(
+            modifier = Modifier.fillMaxWidth(),
+            text = title,
+            fontSize = 20.dp,
+            fontWeight = FontWeight.Bold,
+            color = MSTheme.color.greyG5
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        MSText(
+            modifier = Modifier.fillMaxWidth(),
+            text = subtitle,
+            fontSize = 16.dp,
+            fontWeight = FontWeight.Normal,
+            color = MSTheme.color.greyG5,
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        MSText(
+            modifier = Modifier.fillMaxWidth(),
+            text = content,
+            fontSize = 14.dp,
+            fontWeight = FontWeight.Normal,
+            color = MSTheme.color.greyG3,
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+        MSTextField(
+            modifier = Modifier.fillMaxWidth(),
+            textFieldState = textFieldState,
+            hint = hint,
+            focusedBorderColor = focusedBorderColor,
+            unfocusedBorderColor = unfocusedBorderColor,
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            MSButton(
+                modifier = Modifier
+                    .weight(secondaryButtonWeight)
+                    .height(48.dp),
+                onClick = onSecondaryClick,
+                colors = secondaryButtonColors,
+                pressColors = secondaryPressColors,
+                wavyStrokeColor = secondaryWavyStrokeColor,
+            ) {
+                MSText(
+                    text = secondaryButtonText,
+                    fontSize = 16.dp,
+                    color = secondaryTextColor,
+                )
+            }
+            MSButton(
+                modifier = Modifier
+                    .weight(primaryButtonWeight)
+                    .height(48.dp),
+                enabled = primaryButtonEnabled,
+                onClick = onPrimaryClick,
+                colors = primaryButtonColors,
+                pressColors = primaryPressColors,
+                wavyStrokeColor = primaryWavyStrokeColor,
+            ) {
+                MSText(
+                    text = primaryButtonText,
+                    fontSize = 16.dp,
+                    color = primaryTextColor,
+                )
+            }
+        }
+    }
 }

core/designsystem/src/main/java/com/idiotfrogs/designsystem/component/MSDIm.kt

@@ -18,6 +18,7 @@ import com.idiotfrogs.designsystem.util.noRippleClickable
 
 @Composable
 fun MSDim(
+    modifier: Modifier = Modifier,
     visible: Boolean,
     onDismiss: () -> Unit,
     color: Color = Color(0x3D444444),
@@ -31,7 +32,7 @@ fun MSDim(
 
     if (alpha > 0f) {
         Box(
-            Modifier
+            modifier
                 .fillMaxSize()
                 .background(color.copy(alpha = color.alpha * alpha))
                 .noRippleClickable(

core/designsystem/src/main/java/com/idiotfrogs/designsystem/component/MSMenuFab.kt

@@ -1,6 +1,8 @@
 package com.idiotfrogs.designsystem.component
 
 import android.annotation.SuppressLint
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -29,6 +31,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
@@ -99,10 +102,16 @@ fun MSMenuFab(
             }
         }
         if (hasFab) {
+            val iconRotation by animateFloatAsState(
+                targetValue = if (expanded) 45f else 0f,
+                animationSpec = tween(200),
+                label = "fab icon rotation"
+            )
+
             FloatingActionButton(
                 modifier = Modifier
                     .wavyStroke(
-                        color = Color(0xFF29A047),
+                        color = MSTheme.color.greyG5,
                         strokeWidth = 4.dp,
                         cornerRadius = 28.dp,
                         amplitude = 1.dp,
@@ -111,7 +120,7 @@ fun MSMenuFab(
                     .size(56.dp)
                     .padding(2.dp),
                 shape = CircleShape,
-                containerColor = MSTheme.color.primaryNormal,
+                containerColor = MSTheme.color.greyG5,
                 elevation = FloatingActionButtonDefaults.elevation(
                     defaultElevation = 4.dp,
                     pressedElevation = 4.dp,
@@ -124,11 +133,10 @@ fun MSMenuFab(
                 Image(
                     modifier = Modifier
                         .size(24.dp)
-                        .graphicsLayer {
-                            rotationZ = if (expanded) 45f else 0f
-                        },
+                        .graphicsLayer { rotationZ = iconRotation },
                     painter = painterResource(imageRes),
-                    contentDescription = "fab content"
+                    contentDescription = "fab content",
+                    colorFilter = ColorFilter.tint(MSTheme.color.white)
                 )
             }
         }

core/designsystem/stability/designsystem-debug.stability

@@ -45,6 +45,35 @@ public fun com.idiotfrogs.designsystem.component.MSActionContainer(title: kotlin
     - secondaryPressColors: STABLE (marked @Stable or @Immutable)
     - secondaryTextColor: STABLE (marked @Stable or @Immutable)
 
+@Composable
+public fun com.idiotfrogs.designsystem.component.MSActionContainer(title: kotlin.String, subtitle: kotlin.String, content: kotlin.String, hint: kotlin.String, textFieldState: androidx.compose.foundation.text.input.TextFieldState, primaryButtonText: kotlin.String, primaryWavyStrokeColor: androidx.compose.ui.graphics.Color, secondaryWavyStrokeColor: androidx.compose.ui.graphics.Color, onPrimaryClick: kotlin.Function0<kotlin.Unit>, onSecondaryClick: kotlin.Function0<kotlin.Unit>, modifier: androidx.compose.ui.Modifier, primaryButtonEnabled: kotlin.Boolean, secondaryButtonText: kotlin.String, primaryButtonWeight: kotlin.Float, secondaryButtonWeight: kotlin.Float, focusedBorderColor: androidx.compose.ui.graphics.Color, unfocusedBorderColor: androidx.compose.ui.graphics.Color, primaryButtonColors: androidx.compose.material3.ButtonColors, primaryPressColors: androidx.compose.material3.ButtonColors, primaryTextColor: androidx.compose.ui.graphics.Color, secondaryButtonColors: androidx.compose.material3.ButtonColors, secondaryPressColors: androidx.compose.material3.ButtonColors, secondaryTextColor: androidx.compose.ui.graphics.Color): kotlin.Unit
+  skippable: true
+  restartable: true
+  params:
+    - title: STABLE (String is immutable)
+    - subtitle: STABLE (String is immutable)
+    - content: STABLE (String is immutable)
+    - hint: STABLE (String is immutable)
+    - textFieldState: STABLE (marked @Stable or @Immutable)
+    - primaryButtonText: STABLE (String is immutable)
+    - primaryWavyStrokeColor: STABLE (marked @Stable or @Immutable)
+    - secondaryWavyStrokeColor: STABLE (marked @Stable or @Immutable)
+    - onPrimaryClick: STABLE (function type)
+    - onSecondaryClick: STABLE (function type)
+    - modifier: STABLE (marked @Stable or @Immutable)
+    - primaryButtonEnabled: STABLE (primitive type)
+    - secondaryButtonText: STABLE (String is immutable)
+    - primaryButtonWeight: STABLE (primitive type)
+    - secondaryButtonWeight: STABLE (primitive type)
+    - focusedBorderColor: STABLE (marked @Stable or @Immutable)
+    - unfocusedBorderColor: STABLE (marked @Stable or @Immutable)
+    - primaryButtonColors: STABLE (marked @Stable or @Immutable)
+    - primaryPressColors: STABLE (marked @Stable or @Immutable)
+    - primaryTextColor: STABLE (marked @Stable or @Immutable)
+    - secondaryButtonColors: STABLE (marked @Stable or @Immutable)
+    - secondaryPressColors: STABLE (marked @Stable or @Immutable)
+    - secondaryTextColor: STABLE (marked @Stable or @Immutable)
+
 @Composable
 public fun com.idiotfrogs.designsystem.component.MSAnnotatedText(text: androidx.compose.ui.text.AnnotatedString, modifier: androidx.compose.ui.Modifier, fontSize: androidx.compose.ui.unit.Dp, color: androidx.compose.ui.graphics.Color, fontFamily: androidx.compose.ui.text.font.FontFamily, fontWeight: androidx.compose.ui.text.font.FontWeight, letterSpacing: androidx.compose.ui.unit.TextUnit, textDecoration: androidx.compose.ui.text.style.TextDecoration?, textAlign: androidx.compose.ui.text.style.TextAlign?, lineHeight: androidx.compose.ui.unit.TextUnit, overflow: androidx.compose.ui.text.style.TextOverflow, softWrap: kotlin.Boolean, maxLines: kotlin.Int, minLines: kotlin.Int, style: androidx.compose.ui.text.TextStyle): kotlin.Unit
   skippable: true
@@ -116,10 +145,11 @@ public fun com.idiotfrogs.designsystem.component.MSDialog(title: kotlin.String,
     - cancelTextColor: STABLE (marked @Stable or @Immutable)
 
 @Composable
-public fun com.idiotfrogs.designsystem.component.MSDim(visible: kotlin.Boolean, onDismiss: kotlin.Function0<kotlin.Unit>, color: androidx.compose.ui.graphics.Color, animationSpec: androidx.compose.animation.core.FiniteAnimationSpec<kotlin.Float>): kotlin.Unit
+public fun com.idiotfrogs.designsystem.component.MSDim(modifier: androidx.compose.ui.Modifier, visible: kotlin.Boolean, onDismiss: kotlin.Function0<kotlin.Unit>, color: androidx.compose.ui.graphics.Color, animationSpec: androidx.compose.animation.core.FiniteAnimationSpec<kotlin.Float>): kotlin.Unit
   skippable: false
   restartable: true
   params:
+    - modifier: STABLE (marked @Stable or @Immutable)
     - visible: STABLE (primitive type)
     - onDismiss: STABLE (function type)
     - color: STABLE (marked @Stable or @Immutable)

core/designsystem/stability/designsystem-release.stability

@@ -45,6 +45,35 @@ public fun com.idiotfrogs.designsystem.component.MSActionContainer(title: kotlin
     - secondaryPressColors: STABLE (marked @Stable or @Immutable)
     - secondaryTextColor: STABLE (marked @Stable or @Immutable)
 
+@Composable
+public fun com.idiotfrogs.designsystem.component.MSActionContainer(title: kotlin.String, subtitle: kotlin.String, content: kotlin.String, hint: kotlin.String, textFieldState: androidx.compose.foundation.text.input.TextFieldState, primaryButtonText: kotlin.String, primaryWavyStrokeColor: androidx.compose.ui.graphics.Color, secondaryWavyStrokeColor: androidx.compose.ui.graphics.Color, onPrimaryClick: kotlin.Function0<kotlin.Unit>, onSecondaryClick: kotlin.Function0<kotlin.Unit>, modifier: androidx.compose.ui.Modifier, primaryButtonEnabled: kotlin.Boolean, secondaryButtonText: kotlin.String, primaryButtonWeight: kotlin.Float, secondaryButtonWeight: kotlin.Float, focusedBorderColor: androidx.compose.ui.graphics.Color, unfocusedBorderColor: androidx.compose.ui.graphics.Color, primaryButtonColors: androidx.compose.material3.ButtonColors, primaryPressColors: androidx.compose.material3.ButtonColors, primaryTextColor: androidx.compose.ui.graphics.Color, secondaryButtonColors: androidx.compose.material3.ButtonColors, secondaryPressColors: androidx.compose.material3.ButtonColors, secondaryTextColor: androidx.compose.ui.graphics.Color): kotlin.Unit
+  skippable: true
+  restartable: true
+  params:
+    - title: STABLE (String is immutable)
+    - subtitle: STABLE (String is immutable)
+    - content: STABLE (String is immutable)
+    - hint: STABLE (String is immutable)
+    - textFieldState: STABLE (marked @Stable or @Immutable)
+    - primaryButtonText: STABLE (String is immutable)
+    - primaryWavyStrokeColor: STABLE (marked @Stable or @Immutable)
+    - secondaryWavyStrokeColor: STABLE (marked @Stable or @Immutable)
+    - onPrimaryClick: STABLE (function type)
+    - onSecondaryClick: STABLE (function type)
+    - modifier: STABLE (marked @Stable or @Immutable)
+    - primaryButtonEnabled: STABLE (primitive type)
+    - secondaryButtonText: STABLE (String is immutable)
+    - primaryButtonWeight: STABLE (primitive type)
+    - secondaryButtonWeight: STABLE (primitive type)
+    - focusedBorderColor: STABLE (marked @Stable or @Immutable)
+    - unfocusedBorderColor: STABLE (marked @Stable or @Immutable)
+    - primaryButtonColors: STABLE (marked @Stable or @Immutable)
+    - primaryPressColors: STABLE (marked @Stable or @Immutable)
+    - primaryTextColor: STABLE (marked @Stable or @Immutable)
+    - secondaryButtonColors: STABLE (marked @Stable or @Immutable)
+    - secondaryPressColors: STABLE (marked @Stable or @Immutable)
+    - secondaryTextColor: STABLE (marked @Stable or @Immutable)
+
 @Composable
 public fun com.idiotfrogs.designsystem.component.MSAnnotatedText(text: androidx.compose.ui.text.AnnotatedString, modifier: androidx.compose.ui.Modifier, fontSize: androidx.compose.ui.unit.Dp, color: androidx.compose.ui.graphics.Color, fontFamily: androidx.compose.ui.text.font.FontFamily, fontWeight: androidx.compose.ui.text.font.FontWeight, letterSpacing: androidx.compose.ui.unit.TextUnit, textDecoration: androidx.compose.ui.text.style.TextDecoration?, textAlign: androidx.compose.ui.text.style.TextAlign?, lineHeight: androidx.compose.ui.unit.TextUnit, overflow: androidx.compose.ui.text.style.TextOverflow, softWrap: kotlin.Boolean, maxLines: kotlin.Int, minLines: kotlin.Int, style: androidx.compose.ui.text.TextStyle): kotlin.Unit
   skippable: true
@@ -116,10 +145,11 @@ public fun com.idiotfrogs.designsystem.component.MSDialog(title: kotlin.String,
     - cancelTextColor: STABLE (marked @Stable or @Immutable)
 
 @Composable
-public fun com.idiotfrogs.designsystem.component.MSDim(visible: kotlin.Boolean, onDismiss: kotlin.Function0<kotlin.Unit>, color: androidx.compose.ui.graphics.Color, animationSpec: androidx.compose.animation.core.FiniteAnimationSpec<kotlin.Float>): kotlin.Unit
+public fun com.idiotfrogs.designsystem.component.MSDim(modifier: androidx.compose.ui.Modifier, visible: kotlin.Boolean, onDismiss: kotlin.Function0<kotlin.Unit>, color: androidx.compose.ui.graphics.Color, animationSpec: androidx.compose.animation.core.FiniteAnimationSpec<kotlin.Float>): kotlin.Unit
   skippable: false
   restartable: true
   params:
+    - modifier: STABLE (marked @Stable or @Immutable)
     - visible: STABLE (primitive type)
     - onDismiss: STABLE (function type)
     - color: STABLE (marked @Stable or @Immutable)

core/di/src/main/java/com/idiotfrogs/di/DataSourceModule.kt

@@ -4,6 +4,8 @@ import com.idiotfrogs.local.LocalDataSource
 import com.idiotfrogs.local.LocalDataSourceImpl
 import com.idiotfrogs.data.datasource.auth.AuthDataSource
 import com.idiotfrogs.data.datasource.auth.AuthDataSourceImpl
+import com.idiotfrogs.data.datasource.home.HomeDataSource
+import com.idiotfrogs.data.datasource.home.HomeDataSourceImpl
 import com.idiotfrogs.data.datasource.timecapsule.TimeCapsuleDataSource
 import com.idiotfrogs.data.datasource.timecapsule.TimeCapsuleDataSourceImpl
 import com.idiotfrogs.data.datasource.user.UserDataSource
@@ -35,4 +37,9 @@ interface DataSourceModule {
     fun bindsTimeCapsuleDataSource(
         timeCapsuleDataSourceImpl: TimeCapsuleDataSourceImpl
     ): TimeCapsuleDataSource
+
+    @Binds
+    fun bindsHomeDataSource(
+        homeDataSourceImpl: HomeDataSourceImpl
+    ): HomeDataSource
 }