Feat/week06-xml-advanced

.gitignore

@@ -184,4 +184,10 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
+# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride

app/src/main/java/com/sopt/now/network/service/AuthService.kt

@@ -5,28 +5,28 @@ import com.sopt.now.network.request.RequestLoginDto
 import com.sopt.now.network.request.RequestSignUpDto
 import com.sopt.now.network.response.ResponseDto
 import com.sopt.now.network.response.ResponseInfoDto
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("member/join")
-    fun signUp(
+    suspend fun signUp(
         @Body request: RequestSignUpDto,
-    ): Call<ResponseDto>
+    ): Response<ResponseDto>
 
     @POST("member/login")
-    fun login(
+    suspend fun login(
         @Body request: RequestLoginDto,
-    ): Call<ResponseDto>
+    ): Response<ResponseDto>
 
     @PATCH("member/password")
-    fun changePassword(
+    suspend fun changePassword(
         @Body request: RequestChangePasswordDto,
-    ): Call<ResponseDto>
+    ): Response<ResponseDto>
 
     @GET("member/info")
-    fun info(): Call<ResponseInfoDto>
+    suspend fun info(): Response<ResponseInfoDto>
 }

app/src/main/java/com/sopt/now/network/service/FollowerService.kt

@@ -2,12 +2,13 @@ package com.sopt.now.network.service
 
 import com.sopt.now.network.response.ResponseFollowerDto
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query
 
 interface FollowerService {
     @GET("users")
-    fun getFollowers(
+    suspend fun getFollowers(
         @Query("page") page: Int,
-    ): Call<ResponseFollowerDto>
+    ): Response<ResponseFollowerDto>
 }

app/src/main/java/com/sopt/now/ui/change_password/ChangePasswordViewModel.kt

@@ -2,39 +2,43 @@ package com.sopt.now.ui.change_password
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.sopt.now.data.UserRepository
 import com.sopt.now.network.request.RequestChangePasswordDto
 import com.sopt.now.network.response.ResponseDto
 import com.sopt.now.network.service.ServicePool
 import com.sopt.now.ui.AuthState
-import retrofit2.Call
-import retrofit2.Callback
+import kotlinx.coroutines.launch
 import retrofit2.Response
 
 class ChangePasswordViewModel(private val userRepository: UserRepository) : ViewModel() {
     private val authService by lazy { ServicePool.authService }
     val changePasswordStatus = MutableLiveData<AuthState>()
 
     fun changePassword(request: RequestChangePasswordDto) {
-        authService.changePassword(request).enqueue(object : Callback<ResponseDto> {
-            override fun onResponse(
-                call: Call<ResponseDto>,
-                response: Response<ResponseDto>,
-            ) {
-                if (response.isSuccessful) {
-                    successResponse(response, request)
-                } else {
-                    failResponse(response)
-                }
-            }
-
-            override fun onFailure(call: Call<ResponseDto>, t: Throwable) {
+        viewModelScope.launch {
+            runCatching {
+                authService.changePassword(request)
+            }.onSuccess { response ->
+                handleSuccess(response, request)
+            }.onFailure {
                 changePasswordStatus.value = AuthState(
                     isSuccess = false,
                     message = "서버 에러"
                 )
             }
-        })
+        }
+    }
+
+    private fun handleSuccess(
+        response: Response<ResponseDto>,
+        request: RequestChangePasswordDto,
+    ) {
+        if (response.isSuccessful) {
+            successResponse(response, request)
+        } else {
+            failResponse(response)
+        }
     }
 
     private fun successResponse(

app/src/main/java/com/sopt/now/ui/follower/FollowerFragment.kt

@@ -17,15 +17,13 @@ class FollowerFragment : Fragment() {
     private lateinit var followerAdapter: FollowerAdapter
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         _binding = FragmentFollowerBinding.inflate(inflater, container, false)
-        return binding.root
+        return _binding?.root
     }
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -47,7 +45,7 @@ class FollowerFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        _binding?.rvFollower?.adapter = null
         _binding = null
-        binding.rvFollower.adapter = null
     }
 }

app/src/main/java/com/sopt/now/ui/follower/FollowerViewModel.kt

@@ -4,34 +4,35 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.sopt.now.network.response.ResponseFollowerDto
 import com.sopt.now.network.service.ServicePool
-import retrofit2.Call
-import retrofit2.Callback
+import kotlinx.coroutines.launch
 import retrofit2.Response
 
 class FollowerViewModel : ViewModel() {
     private val _followers = MutableLiveData<List<ResponseFollowerDto.Data>>()
     val followers: LiveData<List<ResponseFollowerDto.Data>> get() = _followers
 
     fun loadFollowers() {
-        ServicePool.followerService.getFollowers(2).enqueue(object : Callback<ResponseFollowerDto> {
-            override fun onResponse(
-                call: Call<ResponseFollowerDto>,
-                response: Response<ResponseFollowerDto>,
-            ) {
-                if (response.isSuccessful) {
-                    response.body()?.data?.let { followers ->
-                        _followers.value = followers
-                    }
-                } else {
-                    Log.e("FollowerViewModel", "Failed to fetch followers")
-                }
+        viewModelScope.launch {
+            runCatching {
+                ServicePool.followerService.getFollowers(2)
+            }.onSuccess { response ->
+                handleSuccess(response)
+            }.onFailure {t ->
+                Log.e("FollowerViewModel", "서버 에러", t)
             }
+        }
+    }
 
-            override fun onFailure(call: Call<ResponseFollowerDto>, t: Throwable) {
-                Log.e("FollowerViewModel", "Error fetching followers", t)
+    private fun handleSuccess(response: Response<ResponseFollowerDto>) {
+        if (response.isSuccessful) {
+            response.body()?.data?.let { followers ->
+                _followers.value = followers
             }
-        })
+        } else {
+            Log.e("FollowerViewModel", "Failed to fetch followers")
+        }
     }
 }

app/src/main/java/com/sopt/now/ui/login/LoginViewModel.kt

@@ -2,40 +2,43 @@ package com.sopt.now.ui.login
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.sopt.now.data.UserRepository
 import com.sopt.now.network.request.RequestLoginDto
 import com.sopt.now.network.response.ResponseDto
 import com.sopt.now.network.service.ServicePool
 import com.sopt.now.ui.AuthState
+import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class LoginViewModel(private val userRepository: UserRepository) : ViewModel() {
     private val authService by lazy { ServicePool.authService }
     val loginStatus = MutableLiveData<AuthState>()
-    fun login(request: RequestLoginDto) {
-        authService.login(request).enqueue(object : Callback<ResponseDto> {
-            override fun onResponse(
-                call: Call<ResponseDto>,
-                response: Response<ResponseDto>,
-            ) {
-                if (response.isSuccessful) {
-                    successResponse(response)
-                } else {
-                    failResponse(response)
-                }
-            }
 
-            override fun onFailure(call: Call<ResponseDto>, t: Throwable) {
-                loginStatus.value = AuthState(
+    fun login(request: RequestLoginDto) {
+        viewModelScope.launch {
+            runCatching {
+                authService.login(request)
+            }.onSuccess { response ->
+                handleSuccess(response)
+            }.onFailure {
+                loginStatus.value = AuthState (
                     isSuccess = false,
                     message = "서버 에러"
                 )
             }
-        })
+        }
     }
 
+    private fun handleSuccess(response: Response<ResponseDto>) {
+        if (response.isSuccessful) {
+            successResponse(response)
+        } else {
+            failResponse(response)
+        }
+    }
     private fun successResponse(response: Response<ResponseDto>) {
         val memberId = response.headers()["location"] ?: "unknown"
         userRepository.setUserLoggedIn(true)

app/src/main/java/com/sopt/now/ui/mypage/MypageViewModel.kt

@@ -2,40 +2,55 @@ package com.sopt.now.ui.mypage
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.sopt.now.data.UserRepository
 import com.sopt.now.network.response.ResponseInfoDto
 import com.sopt.now.network.response.UserInfo
 import com.sopt.now.network.service.ServicePool
 import com.sopt.now.ui.AuthState
-import retrofit2.Call
-import retrofit2.Callback
+import kotlinx.coroutines.launch
 import retrofit2.Response
 
-class MypageViewModel(private val userRepository: UserRepository): ViewModel() {
+class MypageViewModel(private val userRepository: UserRepository) : ViewModel() {
     private val authService by lazy { ServicePool.authService }
-    val userInfoStatus = MutableLiveData<AuthState>()
+    private val userInfoStatus = MutableLiveData<AuthState>()
     val userLiveData = MutableLiveData<UserInfo?>()
 
     fun info() {
-        authService.info().enqueue(object : Callback<ResponseInfoDto> {
-            override fun onResponse(call: Call<ResponseInfoDto>, response: Response<ResponseInfoDto>) {
-                if (response.isSuccessful) {
-                    val userInfo = response.body()?.data
-                    if (userInfo != null) {
-                        userLiveData.postValue(userInfo)
-                        userInfoStatus.value = AuthState(isSuccess = true, message = "회원 정보 조회 성공")
-                    } else {
-                        userInfoStatus.value = AuthState(isSuccess = false, message = "회원 정보 없음")
-                    }
-                } else {
-                    userInfoStatus.value = AuthState(isSuccess = false, message = "회원 정보 조회 실패")
-                }
+        viewModelScope.launch {
+            runCatching {
+                authService.info()
+            }.onSuccess { response ->
+                handleSuccess(response)
+            }.onFailure {
+                userInfoStatus.value = AuthState(
+                    isSuccess = false,
+                    message = "서버 에러"
+                )
             }
+        }
+    }
 
-            override fun onFailure(call: Call<ResponseInfoDto>, t: Throwable) {
-                userInfoStatus.value = AuthState(isSuccess = false, message = "서버 에러")
-            }
-        })
+    private fun handleSuccess(response: Response<ResponseInfoDto>) {
+        if (response.isSuccessful) {
+            successResponse(response)
+        } else {
+            failResponse()
+        }
+    }
+
+    private fun successResponse(response: Response<ResponseInfoDto>) {
+        val userInfo = response.body()?.data
+        if (userInfo != null) {
+            userLiveData.postValue(userInfo)
+            userInfoStatus.value = AuthState(isSuccess = true, message = "회원 정보 조회 성공")
+        } else {
+            userInfoStatus.value = AuthState(isSuccess = false, message = "회원 정보 없음")
+        }
+    }
+
+    private fun failResponse() {
+        userInfoStatus.value = AuthState(isSuccess = false, message = "회원 정보 조회 실패")
     }
 
     fun logout() {

app/src/main/java/com/sopt/now/ui/search/SearchFragment.kt

@@ -1,7 +1,9 @@
 package com.sopt.now.ui.search
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.sopt.now.databinding.FragmentSearchBinding
@@ -14,6 +16,14 @@ class SearchFragment : Fragment() {
     private val searchViewModel: SearchViewModel by viewModels()
     private lateinit var repoAdapter: RepoAdapter
 
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentSearchBinding.inflate(inflater, container, false)
+        return _binding?.root
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupAdapters()
@@ -34,7 +44,7 @@ class SearchFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        _binding?.rvRepo?.adapter = null
         _binding = null
-        binding.rvRepo.adapter = null
     }
 }