로딩 기능 구현

feature/mobile/auth/src/main/kotlin/com/danbam/indistraw/feature/mobile/auth/signup/SetProfileScreen.kt

@@ -24,11 +24,8 @@ import com.danbam.indistraw.core.design_system.component.SelectProfileButton
 import com.danbam.indistraw.core.design_system.R
 import com.danbam.indistraw.core.design_system.util.android.toFile
 import com.danbam.indistraw.core.design_system.util.androidx.getActivity
-import com.danbam.indistraw.core.design_system.util.androidx.observeWithLifecycle
 import com.danbam.indistraw.feature.mobile.navigation.auth.AuthNavigationItem
-import kotlinx.coroutines.InternalCoroutinesApi
 
-@OptIn(InternalCoroutinesApi::class)
 @Composable
 fun SetProfileScreen(
     navController: NavController,
@@ -40,21 +37,16 @@ fun SetProfileScreen(
     val sideEffect = container.sideEffectFlow
 
     val context = LocalContext.current
-    var file: String? by remember { mutableStateOf(null) }
+    var profileUrl: String? by remember { mutableStateOf(null) }
+    var isLoading by remember { mutableStateOf(false) }
 
     LaunchedEffect(Unit) {
         signUpViewModel.setPhoneNumber(phoneNumber = phoneNumber)
     }
 
-    sideEffect.observeWithLifecycle {
-        if (it is SignUpSideEffect.SuccessUpload) {
-            file = it.imageUrl
-        } else {
-
-        }
-    }
-
-    IndiStrawColumnBackground {
+    IndiStrawColumnBackground(
+        isLoading = isLoading
+    ) {
         IndiStrawHeader(pressBackBtn = {
             navController.popBackStack()
         })
@@ -69,12 +61,24 @@ fun SetProfileScreen(
                 .align(CenterHorizontally),
             paddingValues = PaddingValues(36.dp),
             isSignUp = true,
-            imageUrl = file,
+            imageUrl = profileUrl,
             selectGallery = {
-                it?.let { signUpViewModel.setProfile(it.toFile(context)) }
+                it?.let {
+                    isLoading = true
+                    signUpViewModel.setProfile(it.toFile(context)) {
+                        isLoading = false
+                        profileUrl = it
+                    }
+                }
             },
             selectCamera = {
-                it?.let { signUpViewModel.setProfile(it.toFile(context)) }
+                it?.let {
+                    isLoading = true
+                    signUpViewModel.setProfile(it.toFile(context)) {
+                        isLoading = false
+                        profileUrl = it
+                    }
+                }
             }) {
             IndiStrawButton(
                 modifier = Modifier.padding(top = 156.dp),

feature/mobile/auth/src/main/kotlin/com/danbam/indistraw/feature/mobile/auth/signup/SignUpContract.kt

@@ -21,5 +21,4 @@ sealed class SignUpSideEffect {
     object Next : SignUpSideEffect()
     object SuccessSignUp : SignUpSideEffect()
     object FailSignUp : SignUpSideEffect()
-    data class SuccessUpload(val imageUrl: String) : SignUpSideEffect()
 }

feature/mobile/auth/src/main/kotlin/com/danbam/indistraw/feature/mobile/auth/signup/SignUpViewModel.kt

@@ -39,11 +39,11 @@ class SignUpViewModel @Inject constructor(
         reduce { state.copy(phoneNumber = phoneNumber) }
     }
 
-    fun setProfile(file: File) = intent {
+    fun setProfile(file: File, onUploaded: (String) -> Unit) = intent {
         viewModelScope.launch {
             sendFileUseCase(file = file).onSuccess {
-                postSideEffect(SignUpSideEffect.SuccessUpload(it.file))
                 reduce { state.copy(profileUrl = it.file) }
+                onUploaded(it.file)
             }.onFailure {
                 it.errorHandling(unknownAction = {})
             }

feature/mobile/funding/src/main/kotlin/com/danbam/indistraw/feature/mobile/funding/make/WriteIntroduceScreen.kt

@@ -36,9 +36,11 @@ fun WriteIntroduceScreen(
     var title by remember { mutableStateOf(state.title) }
     var description by remember { mutableStateOf(state.description) }
     var thumbnailUrl: String? by remember { mutableStateOf(state.thumbnailUrl) }
+    var isLoading by remember { mutableStateOf(false) }
     val imageList = remember { mutableStateListOf(*state.imageList.toTypedArray()) }
     Spacer(modifier = Modifier.height(36.dp))
     IndiStrawColumnBackground(
+        isLoading = isLoading,
         scrollEnabled = true
     ) {
         TitleRegular(
@@ -49,7 +51,9 @@ fun WriteIntroduceScreen(
             imageUrl = thumbnailUrl,
             selectGallery = {
                 it?.let {
+                    isLoading = true
                     makeFundingViewModel.uploadImage(it.toFile(context)) { thumbnail ->
+                        isLoading = false
                         thumbnailUrl = thumbnail
                     }
                 }
@@ -80,7 +84,9 @@ fun WriteIntroduceScreen(
             imageList = imageList,
             onRemove = { imageList.removeAt(it) }) {
             it?.let {
+                isLoading = true
                 makeFundingViewModel.uploadImage(it.toFile(context)) {
+                    isLoading = false
                     imageList.add(it)
                 }
             }

feature/mobile/funding/src/main/kotlin/com/danbam/indistraw/feature/mobile/funding/make/WriteRewardScreen.kt

@@ -42,8 +42,10 @@ fun WriteRewardScreen(
     var isReal by remember { mutableStateOf(false) }
     val imageList = remember { mutableStateListOf<String>() }
     var amount by remember { mutableStateOf("") }
+    var isLoading by remember { mutableStateOf(false) }
     Spacer(modifier = Modifier.height(34.dp))
     IndiStrawColumnBackground(
+        isLoading = isLoading,
         scrollEnabled = true
     ) {
         TitleRegular(
@@ -106,7 +108,9 @@ fun WriteRewardScreen(
             imageList = imageList,
             onRemove = { imageList.removeAt(it) }) {
             it?.let {
+                isLoading = true
                 makeFundingViewModel.uploadImage(it.toFile(context)) {
+                    isLoading = false
                     imageList.add(it)
                 }
             }

feature/mobile/funding/src/main/kotlin/com/danbam/indistraw/feature/mobile/funding/make/WriteTargetScreen.kt

@@ -51,6 +51,7 @@ fun WriteTargetScreen(
     var year by remember { mutableStateOf(state.endDate.year) }
     var month by remember { mutableStateOf(state.endDate.monthValue) }
     var day by remember { mutableStateOf(state.endDate.dayOfMonth) }
+    var isLoading by remember { mutableStateOf(false) }
     val fileList = remember { mutableStateListOf(*state.fileList.toTypedArray()) }
 
     Spacer(modifier = Modifier.height(36.dp))
@@ -80,6 +81,7 @@ fun WriteTargetScreen(
         }
     }) { _, openSheet ->
         IndiStrawColumnBackground(
+            isLoading = isLoading,
             scrollEnabled = true
         ) {
             TitleRegular(
@@ -117,7 +119,9 @@ fun WriteTargetScreen(
             Spacer(modifier = Modifier.height(16.dp))
             AddFileList(fileList = fileList, onDelete = { fileList.removeAt(it) }) {
                 it?.let {
+                    isLoading = true
                     makeFundingViewModel.uploadImage(it.toFile(context)) {
+                        isLoading = false
                         fileList.add(it)
                     }
                 }

feature/mobile/movie/src/main/kotlin/com/danbam/indistraw/feature/mobile/movie/make/WriteIntroduceScreen.kt

@@ -61,10 +61,13 @@ fun WriteIntroduceScreen(
     var thumbnailUrl: String? by remember { mutableStateOf(state.thumbnailUrl) }
     var movieUrl: String? by remember { mutableStateOf(state.movieUrl) }
     var isCrowdFunding by remember { mutableStateOf(state.isFunding) }
+    var isLoading by remember { mutableStateOf(false) }
     val imageList = remember { mutableStateListOf(*state.imageList.toTypedArray()) }
     val launcher = rememberLauncher(selectFile = {
         it?.let {
+            isLoading = true
             makeMovieViewModel.uploadFile(it.toFile(context)) {
+                isLoading = false
                 movieUrl = it.split("/").last()
             }
         }
@@ -77,6 +80,7 @@ fun WriteIntroduceScreen(
     }
 
     IndiStrawColumnBackground(
+        isLoading = isLoading,
         scrollEnabled = true
     ) {
         IndiStrawHeader(
@@ -90,7 +94,9 @@ fun WriteIntroduceScreen(
             imageUrl = thumbnailUrl,
             selectGallery = {
                 it?.let {
+                    isLoading = true
                     makeMovieViewModel.uploadFile(it.toFile(context)) {
+                        isLoading = false
                         thumbnailUrl = it
                     }
                 }
@@ -158,7 +164,9 @@ fun WriteIntroduceScreen(
             imageList = imageList,
             onRemove = { imageList.removeAt(it) }) {
             it?.let {
+                isLoading = true
                 makeMovieViewModel.uploadFile(it.toFile(context)) {
+                    isLoading = false
                     imageList.add(it)
                 }
             }

feature/mobile/profile/src/main/kotlin/com/danbam/indistraw/feature/mobile/profile/edit_profile/EditProfileContract.kt

@@ -9,6 +9,5 @@ data class EditProfileState(
 
 sealed class EditProfileSideEffect {
     object EmptyNameException : EditProfileSideEffect()
-    object SuccessUpload : EditProfileSideEffect()
     data class GetProfile(val name: String) : EditProfileSideEffect()
 }

feature/mobile/profile/src/main/kotlin/com/danbam/indistraw/feature/mobile/profile/edit_profile/EditProfileScreen.kt

@@ -57,6 +57,7 @@ fun EditProfileScreen(
     val context = LocalContext.current
     var name by remember { mutableStateOf(state.name) }
     var errorText by remember { mutableStateOf("") }
+    var isLoading by remember { mutableStateOf(false) }
     val nameFocusRequester = remember { FocusRequester() }
 
     val errorList = mapOf(
@@ -69,9 +70,6 @@ fun EditProfileScreen(
                 name = it.name
             }
 
-            is EditProfileSideEffect.SuccessUpload -> {
-            }
-
             is EditProfileSideEffect.EmptyNameException -> {
                 nameFocusRequester.requestFocus()
                 errorText = errorList[it]!!
@@ -84,6 +82,7 @@ fun EditProfileScreen(
     }
 
     IndiStrawColumnBackground(
+        isLoading = isLoading,
         onClickAction = {
             focusManager.clearFocus()
             keyboardController?.hide()
@@ -97,10 +96,20 @@ fun EditProfileScreen(
             paddingValues = PaddingValues(22.dp),
             imageUrl = state.profileUrl,
             selectGallery = {
-                it?.let { editProfileVieModel.setProfileImage(it.toFile(context)) }
+                it?.let {
+                    isLoading = true
+                    editProfileVieModel.setProfileImage(it.toFile(context)) {
+                        isLoading = false
+                    }
+                }
             },
             selectCamera = {
-                it?.let { editProfileVieModel.setProfileImage(it.toFile(context)) }
+                it?.let {
+                    isLoading = true
+                    editProfileVieModel.setProfileImage(it.toFile(context)) {
+                        isLoading = false
+                    }
+                }
             }) {
             Spacer(modifier = Modifier.height(64.dp))
             IndiStrawTextField(

feature/mobile/profile/src/main/kotlin/com/danbam/indistraw/feature/mobile/profile/edit_profile/EditProfileVieModel.kt

@@ -41,11 +41,11 @@ class EditProfileVieModel @Inject constructor(
         }
     }
 
-    fun setProfileImage(file: File) = intent {
+    fun setProfileImage(file: File, onUploaded: (String) -> Unit) = intent {
         viewModelScope.launch {
             sendFileUseCase(file = file).onSuccess {
-                postSideEffect(EditProfileSideEffect.SuccessUpload)
                 reduce { state.copy(profileUrl = it.file) }
+                onUploaded(it.file)
             }.onFailure {
                 it.errorHandling(unknownAction = {})
             }