📝 :: Loading 화면 로직 변경

Author: yeongun130

feature/mission/src/main/java/com/stackkowledge/mission/EntireMissionScreen.kt

@@ -1,6 +1,5 @@
 package com.stackkowledge.mission
 
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -21,10 +20,9 @@ import com.minstone.ui.navigation.StackKnowledgeBottomNavigation
 import com.stackknowledge.design_system.component.topbar.StackKnowledgeTopBar
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackkowledge.mission.component.EntireMissionList
-import com.stackkowledge.mission.viewmodel.uistate.GetMissionUiState
 import com.stackkowledge.mission.viewmodel.MissionViewModel
+import com.stackkowledge.mission.viewmodel.uistate.GetMissionUiState
 import enumdatatype.Authority
-import java.util.UUID
 
 @Composable
 internal fun EntireMissionRoute(
@@ -68,14 +66,10 @@ private fun EntireMissionScreen(
                     .fillMaxSize()
             ) {
                 StackKnowledgeTopBar()
-                if (missionUiState is GetMissionUiState.Success) {
-                    val mission = missionUiState.missionResponseModel
-                    EntireMissionList(
-                        getMissionUiState = missionUiState,
-                        missionList = mission,
-                        onClick = { onItemClick(it) },
-                    )
-                }
+                EntireMissionList(
+                    getMissionUiState = missionUiState,
+                    onClick = { onItemClick(it) },
+                )
             }
             Box(
                 modifier = Modifier.align(alignment = Alignment.BottomCenter),
@@ -89,5 +83,4 @@ private fun EntireMissionScreen(
             }
         }
     }
-    Log.e("testt", missionUiState.toString())
 }

feature/mission/src/main/java/com/stackkowledge/mission/component/EntireMissionList.kt

@@ -29,7 +29,6 @@ import remote.response.mission.MissionResponseModel
 fun EntireMissionList(
     modifier: Modifier = Modifier,
     getMissionUiState: GetMissionUiState,
-    missionList: List<MissionResponseModel>,
     onClick: (String) -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, _ ->
@@ -41,6 +40,7 @@ fun EntireMissionList(
         ) {
             when (getMissionUiState) {
                 is GetMissionUiState.Success -> {
+                    val missionList = getMissionUiState.missionResponseModel
                     LazyVerticalGrid(
                         modifier = Modifier
                             .fillMaxSize()
@@ -51,16 +51,15 @@ fun EntireMissionList(
                             top = 16.dp,
                         ),
                     ) {
-                        itemsIndexed(missionList) { _, item ->
-
+                        items(missionList.size) { index ->
                             Box(
                                 contentAlignment = Alignment.Center
                             ) {
                                 EntireMissionItem(
-                                    name = item.user.name,
-                                    title = item.title,
-                                    point = item.point,
-                                    onClick = { onClick(item.id) },
+                                    name = missionList[index].user.name,
+                                    title = missionList[index].title,
+                                    point = missionList[index].point,
+                                    onClick = { onClick(missionList[index].id) },
                                 )
                             }
 

feature/score-mission/src/main/java/com/stackknowledge/score_mission/SolvedMissionScreen.kt

@@ -1,12 +1,10 @@
 package com.stackknowledge.score_mission
 
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -16,7 +14,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.minstone.ui.navigation.StackKnowledgeBottomNavigation
@@ -67,16 +64,11 @@ private fun SolvedMissionScreen(
                     .fillMaxSize()
             ) {
                 StackKnowledgeTopBar()
-                if (scoreMissionListUiState is GetScoreMissionListUiState.Success) {
-                    val scoreMission = scoreMissionListUiState.getSolveMissionResponseModel
-                    SolvedMissionList(
-                        getScoreMissionListUiState = scoreMissionListUiState,
-                        scoreMission = scoreMission,
-                        onClick = { onItemClick() },
-                        intentId = { intentId(it) }
-                    )
-                    Log.e("ScoreMissionListScreen", scoreMission.toString())
-                }
+                SolvedMissionList(
+                    getScoreMissionListUiState = scoreMissionListUiState,
+                    onClick = { onItemClick() },
+                    intentId = { intentId(it) }
+                )
             }
             Box(
                 modifier = Modifier.align(alignment = Alignment.BottomCenter),

feature/score-mission/src/main/java/com/stackknowledge/score_mission/component/SolvedMissionList.kt

@@ -31,7 +31,6 @@ import java.util.UUID
 fun SolvedMissionList(
     modifier: Modifier = Modifier,
     getScoreMissionListUiState: GetScoreMissionListUiState,
-    scoreMission: GetSolveMissionResponseModel,
     onClick: () -> Unit,
     intentId: (String) -> Unit,
 ) {
@@ -45,6 +44,7 @@ fun SolvedMissionList(
         ) {
             when (getScoreMissionListUiState) {
                 is GetScoreMissionListUiState.Success -> {
+                    val scoreMissionList = getScoreMissionListUiState.getSolveMissionResponseModel
                     LazyVerticalGrid(
                         modifier = modifier.fillMaxSize(),
                         columns = GridCells.Fixed(2),
@@ -53,7 +53,7 @@ fun SolvedMissionList(
                             top = 16.dp,
                         ),
                     ) {
-                        itemsIndexed(scoreMission.response) { _, item ->
+                        itemsIndexed(scoreMissionList.response) { _, item ->
                             Box(
                                 contentAlignment = Alignment.Center
                             ) {