[FIX/#239] 공고 상세 페이지 다이얼로그 로직 수정

teamterning · Sep 14, 2024 · e1ef6bd · e1ef6bd
1 parent 404568d
commit e1ef6bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt
@@ -95,11 +95,7 @@ fun InternRoute(
                     viewModel.updateScrapCancelDialogVisibility(true)
                 },
                 onClickScrapButton = {
-                    with(viewModel) {
-                        if (internState.isScrappedState)
-                            updateScrapCancelDialogVisibility(true)
-                        else updateInternDialogVisibility(true)
-                    }
+                    viewModel.updateInternDialogVisibility(true)
                 }
             )
         }
@@ -263,24 +259,23 @@ fun InternScreen(
         InternBottomBar(
             modifier = Modifier,
             internInfo = internInfo,
-            internUiState = internUiState,
             onScrapClick = {
-                if (!internUiState.isScrappedState) {
-                    onClickScrapButton(internInfo)
-                } else {
+                if (internInfo.isScrapped) {
                     onClickCancelButton(internInfo)
+                } else {
+                    onClickScrapButton(internInfo)
                 }
             },
         )
 
-        if (internUiState.scrapCancelDialogVisibility && internUiState.isScrappedState) {
+        if (internUiState.scrapCancelDialogVisibility) {
             ScrapCancelDialog(
                 internshipAnnouncementId = announcementId,
                 onDismissRequest = onDismissCancelDialog
             )
         }
 
-        if (internUiState.internDialogVisibility && !internUiState.isScrappedState) {
+        if (internUiState.internDialogVisibility) {
             ScrapDialog(
                 title = internInfo.title,
                 scrapColor = CalRed,
@@ -289,7 +284,7 @@ fun InternScreen(
                 workingPeriod = internInfo.workingPeriod,
                 internshipAnnouncementId = announcementId,
                 companyImage = internInfo.companyImage,
-                isScrapped = false,
+                isScrapped = internInfo.isScrapped,
                 onDismissRequest = onDismissScrapDialog,
                 onClickChangeColor = { },
                 onClickNavigateButton = { }

diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternBottomBar.kt b/feature/src/main/java/com/terning/feature/intern/component/InternBottomBar.kt
@@ -33,7 +33,6 @@ import com.terning.feature.intern.model.InternUiState
 fun InternBottomBar(
     modifier: Modifier,
     internInfo: InternInfo,
-    internUiState: InternUiState,
     onScrapClick: (InternInfo) -> Unit,
     viewModel: InternViewModel = hiltViewModel(),
 ) {
@@ -64,7 +63,7 @@ fun InternBottomBar(
                 ) {
                     Icon(
                         painter = painterResource(
-                            id = if (internUiState.isScrappedState) {
+                            id = if (internInfo.isScrapped) {
                                 R.drawable.ic_scrap_true_24
                             } else {
                                 R.drawable.ic_scrap_false_24

diff --git a/feature/src/main/java/com/terning/feature/intern/model/InternUiState.kt b/feature/src/main/java/com/terning/feature/intern/model/InternUiState.kt
@@ -13,6 +13,5 @@ data class InternUiState(
     val internDialogVisibility: Boolean = false,
     val isScrappedState: Boolean = false,
     val showWeb: Boolean = false,
-    val scrapId: Long? = null,
     val internshipModel: InternInfo? = null,
 )