#8 [feat] : 유저 취미 띄우기

AND-SOPT-ANDROID · Nov 14, 2024 · a61fc26 · a61fc26
1 parent 09cb792
commit a61fc26
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app/src/main/java/org/sopt/and/feature/mypage/MyScreen.kt b/app/src/main/java/org/sopt/and/feature/mypage/MyScreen.kt
@@ -13,6 +13,8 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -25,7 +27,6 @@ import org.sopt.and.core.designsystem.component.EmptyBox
 import org.sopt.and.core.designsystem.component.ProfileBox
 import org.sopt.and.core.designsystem.component.TicketBox
 import org.sopt.and.ui.theme.WavveTheme
-import org.sopt.and.utils.AuthKey.DEFAULT_NAME
 
 @Composable
 fun MyScreen(
@@ -36,11 +37,14 @@ fun MyScreen(
     val sharedPreferences = context.getSharedPreferences("token", Context.MODE_PRIVATE)
     val token = sharedPreferences.getString("loginToken", "none") ?: "none"
 
+    viewModel.getUserHobby(token = token)
+
+    val hobby by viewModel.hobby.observeAsState("")
+
     val snackbarHostState = remember { SnackbarHostState() }
 
     LaunchedEffect(Unit) {
         snackbarHostState.showSnackbar(context.getString(R.string.welcome))
-        viewModel.getUserHobby(token = token)
     }
 
     Scaffold(
@@ -60,7 +64,7 @@ fun MyScreen(
             Column {
                 //프로필 박스
                 ProfileBox(
-                    userEmail = viewModel.userState.value?.result?.hobby ?: DEFAULT_NAME,
+                    userEmail = hobby,
                     modifier = Modifier
                 )
 

diff --git a/app/src/main/java/org/sopt/and/feature/mypage/MyViewModel.kt b/app/src/main/java/org/sopt/and/feature/mypage/MyViewModel.kt
@@ -18,6 +18,9 @@ class MyViewModel : ViewModel() {
     private val _userState = mutableStateOf<ResponseUserHobbyDto?>(null)
     val userState: State<ResponseUserHobbyDto?> get() = _userState
 
+    private val _hobby = MutableLiveData("")
+    val hobby: LiveData<String> get() = _hobby
+
     fun getUserHobby(token: String) {
         userService.getUserHobby(token = token)
             .enqueue(object : Callback<ResponseUserHobbyDto> {
@@ -27,6 +30,7 @@ class MyViewModel : ViewModel() {
                 ) {
                     if (response.isSuccessful) {
                         _userState.value = response.body()
+                        _hobby.value = response.body()?.result?.hobby
                         Log.d("getUserHobby", response.body().toString())
 
                     } else {
@@ -41,10 +45,4 @@ class MyViewModel : ViewModel() {
             })
     }
 
-    private var _userEmail = MutableLiveData("")
-    val userEmail: LiveData<String> get() = _userEmail
-
-    fun setUserEmail(userEmail: String) {
-        _userEmail.value = userEmail
-    }
 }