[chore] #13 코드 정리

NOW-SOPT-ANDROID · May 30, 2024 · 3d9b2f8 · 3d9b2f8
1 parent a3a3f81
commit 3d9b2f8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/app/src/main/java/com/sopt/now/presentation/Home/HomeFragment.kt b/app/src/main/java/com/sopt/now/presentation/Home/HomeFragment.kt
@@ -1,7 +1,6 @@
 package com.sopt.now.presentation.Home
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,11 +10,9 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
-import com.sopt.now.domain.model.Friend
+import com.sopt.now.databinding.FragmentHomeBinding
 import com.sopt.now.presentation.Home.Friend.FriendAdapter
 import com.sopt.now.presentation.Home.User.UserAdapter
-import com.sopt.now.data.ServicePool
-import com.sopt.now.databinding.FragmentHomeBinding
 import com.sopt.now.presentation.Key.USERID
 import com.sopt.now.presentation.common.ViewModelFactory
 import com.sopt.now.util.UiState
@@ -65,25 +62,31 @@ class HomeFragment : Fragment() {
 
     private fun collectUserInfo() {
         homeViewModel.homeUserState.flowWithLifecycle(lifecycle).onEach { homeUserState ->
-            when(homeUserState) {
+            when (homeUserState) {
                 is UiState.Success -> {
                     userAdapter.setUserList(homeUserState.data)
                 }
-                is UiState.Error -> showToastMessage(homeUserState.message)
+
+                is UiState.Error -> {
+                    showToastMessage(homeUserState.message)
+                }
+
                 else -> Unit
             }
         }.launchIn(lifecycleScope)
     }
 
     private fun collectFriendsList() {
         homeViewModel.homeFriendState.flowWithLifecycle(lifecycle).onEach { homeFriendState ->
-            when(homeFriendState) {
+            when (homeFriendState) {
                 is UiState.Success -> {
                     friendAdapter.setFriendList(homeFriendState.data)
                 }
+
                 is UiState.Error -> {
                     showToastMessage(homeFriendState.message)
                 }
+
                 else -> Unit
             }
         }.launchIn(lifecycleScope)

diff --git a/app/src/main/java/com/sopt/now/presentation/Home/HomeViewModel.kt b/app/src/main/java/com/sopt/now/presentation/Home/HomeViewModel.kt
@@ -1,9 +1,7 @@
 package com.sopt.now.presentation.Home
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.sopt.now.domain.model.Friend
 import com.sopt.now.domain.model.FriendsList
 import com.sopt.now.domain.model.User
 import com.sopt.now.domain.repository.AuthRepository
@@ -16,7 +14,7 @@ import kotlinx.coroutines.launch
 class HomeViewModel(
     private val authRepository: AuthRepository,
     private val friendRepository: FriendRepository,
-): ViewModel() {
+) : ViewModel() {
     private val _homeUserState = MutableStateFlow<UiState<User>>(UiState.Empty)
     val homeUserState get() = _homeUserState.asStateFlow()
 

diff --git a/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt
@@ -2,7 +2,6 @@ package com.sopt.now.presentation.Login
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -57,7 +56,10 @@ class LoginActivity : AppCompatActivity() {
                     }
                 }
 
-                is UiState.Error -> showToastMessage(loginState.message)
+                is UiState.Error -> {
+                    showToastMessage(loginState.message)
+                }
+
                 else -> Unit
             }
         }.launchIn(lifecycleScope)

diff --git a/app/src/main/java/com/sopt/now/presentation/Signup/SignupActivity.kt b/app/src/main/java/com/sopt/now/presentation/Signup/SignupActivity.kt
@@ -68,7 +68,10 @@ class SignupActivity : AppCompatActivity() {
                     startActivity(Intent(this@SignupActivity, LoginActivity::class.java))
                 }
 
-                is UiState.Error -> showToastMessage(R.string.server_connection_error)
+                is UiState.Error -> {
+                    showToastMessage(R.string.server_connection_error)
+                }
+
                 else -> Unit
             }
         }.launchIn(lifecycleScope)