From 8d3d47f3ee7cba1316228033d8f36aafe19f9e43 Mon Sep 17 00:00:00 2001 From: boiledegg Date: Fri, 7 Jun 2024 17:07:13 +0900 Subject: [PATCH] =?UTF-8?q?REFACTOR/#19:=20week4=20=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=EA=B8=B0=EB=B0=98=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../now/compose/network/dto/ResponseFollowListDto.kt | 4 ++-- .../sopt/now/compose/ui/screens/login/LoginScreen.kt | 4 +--- .../now/compose/ui/screens/login/LoginUiState.kt | 2 +- .../now/compose/ui/screens/login/LoginViewModel.kt | 12 +++++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/sopt/now/compose/network/dto/ResponseFollowListDto.kt b/app/src/main/java/com/sopt/now/compose/network/dto/ResponseFollowListDto.kt index aa2b49a..d9d8967 100644 --- a/app/src/main/java/com/sopt/now/compose/network/dto/ResponseFollowListDto.kt +++ b/app/src/main/java/com/sopt/now/compose/network/dto/ResponseFollowListDto.kt @@ -9,11 +9,11 @@ data class ResponseFollowListDto( @SerialName("page") val page:Int, @SerialName("per_page") - val per_page:Int, + val perPage:Int, @SerialName("total") val total:Int, @SerialName("total_pages") - val total_pages:Int, + val totalPages:Int, @SerialName("data") val data:List, @SerialName("support") diff --git a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginScreen.kt b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginScreen.kt index 67c9d7c..5b23794 100644 --- a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginScreen.kt @@ -2,7 +2,6 @@ package com.sopt.now.compose.ui.screens.login import android.app.Activity import android.content.Context -import android.util.Log import android.widget.Toast import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,7 +12,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -104,7 +102,7 @@ private fun LoginScreen( TextFieldWithTitleComposable( title = R.string.title_pw, label = R.string.login_label_pw, - textFieldText = uiState.pw, + textFieldText = uiState.password, onValueChange = onPwTextFieldChanged, keyboardType = KeyboardType.Password, imeAction = ImeAction.Done, diff --git a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginUiState.kt b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginUiState.kt index b7a8b1c..27e9ed8 100644 --- a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginUiState.kt +++ b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginUiState.kt @@ -2,7 +2,7 @@ package com.sopt.now.compose.ui.screens.login data class LoginUiState( val id: String = "", - val pw: String = "", + val password: String = "", val isSuccess: Boolean = false, val message:String = "" ) diff --git a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt index 0631c5b..d44691e 100644 --- a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt +++ b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt @@ -9,6 +9,8 @@ import androidx.lifecycle.viewmodel.viewModelFactory import com.sopt.now.compose.SoptApplication import com.sopt.now.compose.container.impl.AuthRepositoryImpl import com.sopt.now.compose.container.impl.UserRepositoryImpl +import com.sopt.now.compose.container.repository.AuthRepository +import com.sopt.now.compose.container.repository.UserRepository import com.sopt.now.compose.network.dto.RequestLoginDto import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -19,15 +21,15 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject class LoginViewModel( - private val userRepository: UserRepositoryImpl, - private val authRepository: AuthRepositoryImpl + private val userRepository: UserRepository, + private val authRepository: AuthRepository ): ViewModel() { private val _uiState = MutableStateFlow(LoginUiState()) val uiState: StateFlow = _uiState.asStateFlow() fun updateUiState( id: String = _uiState.value.id, - pw: String = _uiState.value.pw, + pw: String = _uiState.value.password, isSuccess:Boolean = _uiState.value.isSuccess, message: String = _uiState.value.message @@ -35,7 +37,7 @@ class LoginViewModel( _uiState.update { currentState -> currentState.copy( id = id, - pw = pw, + password = pw, isSuccess = isSuccess, message = message ) @@ -77,7 +79,7 @@ class LoginViewModel( private fun getRequestLoginDto(): RequestLoginDto = RequestLoginDto( authenticationId = _uiState.value.id, - password = _uiState.value.pw + password = _uiState.value.password ) private fun setUserIdInPreference(userId: String) {