✨ status 요구사항에 맞는 코드로 수정

mash-up-kr · Aug 12, 2024 · aa96891 · aa96891
1 parent 9c20dea
commit aa96891
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/...va/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomePhotoCard.kt b/...va/com/mashup/gabbangzip/sharedalbum/presentation/ui/main/grouphome/GroupHomePhotoCard.kt
@@ -11,11 +11,9 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -56,14 +54,16 @@ fun GroupHomePhotoCard(
         keywordType = groupInfo.keyword,
         backgroundColor = backgroundColor,
     ) {
-        if (topTitleText.isNotBlank()) {
-            CardTopTitle(
-                modifier = Modifier
-                    .align(Alignment.TopCenter)
-                    .padding(top = 37.dp),
-                text = topTitleText,
-            )
-        }
+        CardTopTitle(
+            modifier = Modifier
+                .align(Alignment.TopCenter)
+                .padding(top = 37.dp),
+            text = if (groupInfo.status == GroupStatusType.NO_PAST_AND_CURRENT_EVENT) {
+                stringResource(id = R.string.intro_event_top_title)
+            } else {
+                groupInfo.recentEventDate
+            },
+        )
 
         if (groupInfo.status == GroupStatusType.NO_PAST_AND_CURRENT_EVENT) {
             PicNormalButton(
@@ -77,7 +77,7 @@ fun GroupHomePhotoCard(
 
         content()
 
-        if (groupInfo.status == GroupStatusType.NO_CURRENT_EVENT || groupInfo.status == GroupStatusType.AFTER_MY_VOTE) {
+        if (groupInfo.status != GroupStatusType.NO_PAST_AND_CURRENT_EVENT) {
             EventTitle(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)