Merge pull request #213 from wsb7788/feature-aos/refactor

Refactor: 지도 조정 클래스 분리, 네비게이션 컴포넌트 활용, 패키지 세분화
wsb7788 · Dec 4, 2023 · 2a7a638 · 2a7a638
2 parents dd0e243 + 5f1371e
commit 2a7a638
Show file tree

Hide file tree

Showing 48 changed files with 269 additions and 235 deletions.
diff --git a/...oid/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepositoryImpl.kt b/...oid/app/src/main/java/com/boostcampwm2023/snappoint/data/repository/PostRepositoryImpl.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -55,36 +56,26 @@ class PostRepositoryImpl @Inject constructor(
 
     override fun postCreatePost(title: String, postBlocks: List<PostBlockState>): Flow<CreatePostResponse> {
 
-        val request = CreatePostRequest(
-            title = title,
-            postBlocks = postBlocks.map {
-                when (it) {
-                    is PostBlockState.IMAGE -> {
-                        val requestBody = it.bitmap?.toByteArray()?.toRequestBody("image/webp".toMediaTypeOrNull())
-                            ?: return emptyFlow()
-                        val multipartBody = MultipartBody.Part.createFormData("file", "image", requestBody)
-                        val uploadResult = try {
-                            runBlocking(Dispatchers.IO) {
-                                snapPointApi.postImage(multipartBody)
+        return flowOf(true)
+            .map{
+                CreatePostRequest(
+                    title = title,
+                    postBlocks = postBlocks.map {
+                        when (it) {
+                            is PostBlockState.IMAGE -> {
+                                val requestBody = it.bitmap?.toByteArray()?.toRequestBody("image/webp".toMediaType())!!
+                                val multipartBody = MultipartBody.Part.createFormData("file", "image", requestBody)
+                                val uploadResult = snapPointApi.postImage(multipartBody)
+                                // TODO - 하나의 이미지 블럭에 사진이 여러개 들어갈 때 대응
+                                it.asPostBlock().copy(
+                                    files = listOf(File(uploadResult.uuid))
+                                )
                             }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                            return emptyFlow()
+                            else -> it.asPostBlock()
                         }
-
-                        // TODO - 하나의 이미지 블럭에 사진이 여러개 들어갈 때 대응
-                        it.asPostBlock().copy(
-                            files = listOf(File(uploadResult.uuid))
-                        )
                     }
-                    else -> it.asPostBlock()
-                }
-            }
-        )
-        Log.d("TAG", "postCreatePost: ${Json.encodeToString(request)}")
-
-        return flowOf(true)
-            .map{
+                )
+            }.map{request ->
                 snapPointApi.createPost(request)
             }
     }

diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthActivity.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthActivity.kt
@@ -23,7 +23,6 @@ class AuthActivity : BaseActivity<ActivityAuthBinding>(R.layout.activity_auth) {
 
         initBinding()
 
-        collectViewModelData()
     }
 
     private fun initBinding() {
@@ -32,24 +31,6 @@ class AuthActivity : BaseActivity<ActivityAuthBinding>(R.layout.activity_auth) {
         }
     }
 
-    private fun collectViewModelData() {
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                viewModel.event.collect { event ->
-                    when (event) {
-                        is AuthEvent.Success -> {
-                            navigateToMainMapActivity()
-                        }
-                    }
-                }
-            }
-        }
-    }
 
-    private fun navigateToMainMapActivity() {
-        val intent = Intent(this, MainActivity::class.java)
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME)
-        startActivity(intent)
-        finish()
-    }
+
 }
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthEvent.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthEvent.kt
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthViewModel.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/AuthViewModel.kt
@@ -10,16 +10,4 @@ import javax.inject.Inject
 
 @HiltViewModel
 class AuthViewModel @Inject constructor() : ViewModel() {
-
-    private val _event: MutableSharedFlow<AuthEvent> = MutableSharedFlow(
-        extraBufferCapacity = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
-    val event: SharedFlow<AuthEvent> = _event.asSharedFlow()
-
-    var idCache: String = ""
-
-    fun sendSuccessResult() {
-        _event.tryEmit(AuthEvent.Success)
-    }
 }
diff --git a/...d/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/signin/SignInEvent.kt b/...d/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/signin/SignInEvent.kt
@@ -0,0 +1,7 @@
+package com.boostcampwm2023.snappoint.presentation.auth.signin
+
+sealed class SignInEvent{
+    data object NavigateToMainActivity: SignInEvent()
+    data class ShowMessage(val errorResId: Int): SignInEvent()
+    data object NavigateToSignup: SignInEvent()
+}
diff --git a/...nt/presentation/signin/SignInFormState.kt → ...esentation/auth/signin/SignInFormState.kt b/...nt/presentation/signin/SignInFormState.kt → ...esentation/auth/signin/SignInFormState.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signin
+package com.boostcampwm2023.snappoint.presentation.auth.signin
 
 data class SignInFormState(
     val email: String = "",

diff --git a/...int/presentation/signin/SignInFragment.kt → ...resentation/auth/signin/SignInFragment.kt b/...int/presentation/signin/SignInFragment.kt → ...resentation/auth/signin/SignInFragment.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signin
+package com.boostcampwm2023.snappoint.presentation.auth.signin
 
 import android.os.Bundle
 import android.view.View
@@ -7,7 +7,9 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.NavOptions
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.navigateUp
 import com.boostcampwm2023.snappoint.R
 import com.boostcampwm2023.snappoint.databinding.FragmentSigninBinding
 import com.boostcampwm2023.snappoint.presentation.auth.AuthViewModel
@@ -40,15 +42,15 @@ class SignInFragment : BaseFragment<FragmentSigninBinding>(R.layout.fragment_sig
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 viewModel.event.collect { event ->
                     when (event) {
-                        is SignInEvent.Fail -> {
-                            showToastMessage(event.error)
+                        is SignInEvent.ShowMessage -> {
+                            showToastMessage(event.errorResId)
                         }
 
-                        is SignInEvent.Success -> {
-                            activityViewModel.sendSuccessResult()
+                        is SignInEvent.NavigateToMainActivity -> {
+                            navigateToMainActivity()
                         }
 
-                        is SignInEvent.Signup -> {
+                        is SignInEvent.NavigateToSignup -> {
                             navigateToSignup()
                         }
                     }
@@ -57,7 +59,13 @@ class SignInFragment : BaseFragment<FragmentSigninBinding>(R.layout.fragment_sig
         }
     }
 
+    private fun navigateToMainActivity() {
+        findNavController().navigate(SignInFragmentDirections.actionLoginFragmentToMainActivity())
+        requireActivity().finish()
+
+    }
+
     private fun navigateToSignup() {
-        findNavController().navigate(R.id.action_loginFragment_to_signupFragment)
+        findNavController().navigate(SignInFragmentDirections.actionLoginFragmentToSignupFragment())
     }
 }
diff --git a/...nt/presentation/signin/SignInViewModel.kt → ...esentation/auth/signin/SignInViewModel.kt b/...nt/presentation/signin/SignInViewModel.kt → ...esentation/auth/signin/SignInViewModel.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signin
+package com.boostcampwm2023.snappoint.presentation.auth.signin
 
 import android.util.Patterns
 import androidx.lifecycle.ViewModel
@@ -28,12 +28,14 @@ class SignInViewModel @Inject constructor(
     private val loginRepository: SignInRepository
 ) : ViewModel() {
 
-    private val _signInFormUiState: MutableStateFlow<SignInFormState> = MutableStateFlow(SignInFormState(
+    private val _signInFormUiState: MutableStateFlow<SignInFormState> = MutableStateFlow(
+        SignInFormState(
         email = "[email protected]",
         password = "Str!n8Str!n8",
         isEmailValid = true,
         isPasswordValid = true
-    ))
+    )
+    )
     val signInFormUiState: StateFlow<SignInFormState> = _signInFormUiState.asStateFlow()
 
     private val _event: MutableSharedFlow<SignInEvent> = MutableSharedFlow(
@@ -71,10 +73,10 @@ class SignInViewModel @Inject constructor(
             }
             .onEach {
                 loginUtil.setUserAuthData(email, password)
-                _event.emit(SignInEvent.Success)
+                _event.emit(SignInEvent.NavigateToMainActivity)
             }
             .catch {
-                _event.emit(SignInEvent.Fail(R.string.login_activity_fail))
+                _event.emit(SignInEvent.ShowMessage(R.string.login_activity_fail))
             }
             .onCompletion {
                 setProgressBarState(false)
@@ -83,7 +85,7 @@ class SignInViewModel @Inject constructor(
     }
 
     fun onSignUpButtonClick() {
-        _event.tryEmit(SignInEvent.Signup)
+        _event.tryEmit(SignInEvent.NavigateToSignup)
     }
 
     private fun setProgressBarState(isInProgress: Boolean) {

diff --git a/...esentation/signup/SignupBindingAdapter.kt → ...ation/auth/signup/SignupBindingAdapter.kt b/...esentation/signup/SignupBindingAdapter.kt → ...ation/auth/signup/SignupBindingAdapter.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signup
+package com.boostcampwm2023.snappoint.presentation.auth.signup
 
 import androidx.databinding.BindingAdapter
 import com.google.android.material.textfield.TextInputLayout

diff --git a/...d/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/signup/SignupEvent.kt b/...d/app/src/main/java/com/boostcampwm2023/snappoint/presentation/auth/signup/SignupEvent.kt
@@ -0,0 +1,6 @@
+package com.boostcampwm2023.snappoint.presentation.auth.signup
+
+sealed class SignupEvent {
+    data object NavigateToSignIn : SignupEvent()
+    data class ShowMessage(val messageResId: Int) : SignupEvent()
+}
diff --git a/...int/presentation/signup/SignupFragment.kt → ...resentation/auth/signup/SignupFragment.kt b/...int/presentation/signup/SignupFragment.kt → ...resentation/auth/signup/SignupFragment.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signup
+package com.boostcampwm2023.snappoint.presentation.auth.signup
 
 import android.os.Bundle
 import android.view.View
@@ -48,21 +48,20 @@ class SignupFragment : BaseFragment<FragmentSignupBinding>(R.layout.fragment_sig
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 viewModel.event.collect { event ->
                     when (event) {
-                        is SignupEvent.Fail -> {
+                        is SignupEvent.ShowMessage -> {
                             showToastMessage(event.messageResId)
                         }
 
-                        is SignupEvent.Success -> {
-                            showToastMessage(R.string.signup_fragment_create_account_success)
-                            navigateToLogin()
+                        is SignupEvent.NavigateToSignIn -> {
+                            navigateToSignIn()
                         }
                     }
                 }
             }
         }
     }
 
-    private fun navigateToLogin() {
+    private fun navigateToSignIn() {
         findNavController().popBackStack()
     }
 }
diff --git a/...oint/presentation/signup/SignupUiState.kt → ...presentation/auth/signup/SignupUiState.kt b/...oint/presentation/signup/SignupUiState.kt → ...presentation/auth/signup/SignupUiState.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signup
+package com.boostcampwm2023.snappoint.presentation.auth.signup
 
 data class SignupUiState(
     val email: String = "",

diff --git a/...nt/presentation/signup/SignupViewModel.kt → ...esentation/auth/signup/SignupViewModel.kt b/...nt/presentation/signup/SignupViewModel.kt → ...esentation/auth/signup/SignupViewModel.kt
@@ -1,4 +1,4 @@
-package com.boostcampwm2023.snappoint.presentation.signup
+package com.boostcampwm2023.snappoint.presentation.auth.signup
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -142,12 +142,14 @@ class SignupViewModel @Inject constructor(
                     setProgressBarState(true)
                 }
                 .onEach {
-                    _event.emit(SignupEvent.Success)
+                    _event.emit(SignupEvent.NavigateToSignIn)
                 }
                 .catch {
                     updateEmailErrorResId(it.message)
                     _event.emit(
-                        SignupEvent.Fail(_uiState.value.emailErrorResId ?: R.string.signup_fragment_fail)
+                        SignupEvent.ShowMessage(
+                            _uiState.value.emailErrorResId ?: R.string.signup_fragment_fail
+                        )
                     )
                 }
                 .onCompletion {

diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/base/BaseActivity.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/base/BaseActivity.kt
@@ -22,10 +22,10 @@ abstract class BaseActivity<B: ViewDataBinding>(
     }
 
     protected fun showToastMessage(resId: Int) {
-        Toast.makeText(this, getString(resId), Toast.LENGTH_LONG).show()
+        Toast.makeText(this, getString(resId), Toast.LENGTH_SHORT).show()
     }
 
     protected fun showToastMessage(message: String) {
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/base/BaseFragment.kt b/android/app/src/main/java/com/boostcampwm2023/snappoint/presentation/base/BaseFragment.kt
@@ -38,10 +38,10 @@ abstract class BaseFragment<B : ViewDataBinding>(
     }
 
     protected fun showToastMessage(resId: Int) {
-        Toast.makeText(activity, getString(resId), Toast.LENGTH_LONG).show()
+        Toast.makeText(activity, getString(resId), Toast.LENGTH_SHORT).show()
     }
 
     protected fun showToastMessage(message: String) {
-        Toast.makeText(activity, message, Toast.LENGTH_LONG).show()
+        Toast.makeText(activity, message, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/...rc/main/java/com/boostcampwm2023/snappoint/presentation/createpost/CreatePostViewModel.kt b/...rc/main/java/com/boostcampwm2023/snappoint/presentation/createpost/CreatePostViewModel.kt
@@ -93,7 +93,7 @@ class CreatePostViewModel @Inject constructor(
                     if(index == idx) {
                         when(postBlock){
                             is PostBlockState.TEXT -> postBlock.copy(content = content)
-                            is PostBlockState.IMAGE -> postBlock.copy(content = content)
+                            is PostBlockState.IMAGE -> postBlock.copy(description = content)
                             is PostBlockState.VIDEO -> TODO()
                         }
                     }else{