diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenRequest.kt b/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenRequest.kt index 298de768..8b48f005 100644 --- a/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenRequest.kt +++ b/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenRequest.kt @@ -2,5 +2,7 @@ package com.moneymong.moneymong.model.sign data class TokenRequest ( val provider : String, - val accessToken : String + val accessToken : String, + val name: String, + val code: String ) \ No newline at end of file diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenResponse.kt b/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenResponse.kt index 470bac3c..a52d62a0 100644 --- a/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenResponse.kt +++ b/core/model/src/main/java/com/moneymong/moneymong/model/sign/TokenResponse.kt @@ -4,5 +4,6 @@ data class TokenResponse( val accessToken : String, val refreshToken : String, val loginSuccess : Boolean, - val schoolInfoExist : Boolean + val schoolInfoExist : Boolean, + val schoolInfoProvided: Boolean ) diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivRequest.kt b/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivRequest.kt index 19fb0f42..c11c53de 100644 --- a/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivRequest.kt +++ b/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivRequest.kt @@ -1,6 +1,6 @@ package com.moneymong.moneymong.model.sign data class UnivRequest( - val universityName: String, - val grade: Int + val universityName: String?, + val grade: Int? ) \ No newline at end of file diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/TokenRemoteDataSourceImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/TokenRemoteDataSourceImpl.kt index 319e2bc8..bbd096c3 100644 --- a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/TokenRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/TokenRemoteDataSourceImpl.kt @@ -18,7 +18,7 @@ class TokenRemoteDataSourceImpl @Inject constructor( type: LoginType, accessToken: String ): Result { - return accessTokenApi.postAccessToken(TokenRequest(type.name, accessToken)) + return accessTokenApi.postAccessToken(TokenRequest(type.name, accessToken, "", "")) } override suspend fun getUpdateToken(refreshToken: String): Result { diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/SignUpScreen.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/SignUpScreen.kt index c4be6bd0..bb4d49c1 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/SignUpScreen.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/SignUpScreen.kt @@ -209,7 +209,7 @@ fun SignUpContent( } } - Box( + Column( modifier = Modifier .fillMaxWidth() .align(Alignment.BottomCenter) diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpButtonView.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpButtonView.kt index 46bc3930..685a9633 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpButtonView.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpButtonView.kt @@ -4,33 +4,39 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.material.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.moneymong.moneymong.design_system.component.button.MDSButton import com.moneymong.moneymong.design_system.component.button.MDSButtonSize import com.moneymong.moneymong.design_system.component.button.MDSButtonType import com.moneymong.moneymong.design_system.error.ErrorDialog +import com.moneymong.moneymong.design_system.theme.Blue04 +import com.moneymong.moneymong.design_system.theme.Body3 +import com.moneymong.moneymong.feature.sign.sideeffect.SignUpSideEffect @Composable fun SignUpButtonView( - modifier: Modifier = Modifier , - isEnabled : Boolean, - visiblePopUpError : Boolean, - popUpErrorMessage : String, - visiblePopUpErrorChanged : (Boolean) -> Unit, - onCreateUniversity : () -> Unit, - storeSchoolInfoExist : (Boolean) -> Unit + modifier: Modifier = Modifier, + isEnabled: Boolean, + visiblePopUpError: Boolean, + popUpErrorMessage: String, + visiblePopUpErrorChanged: (Boolean) -> Unit, + onCreateUniversity: () -> Unit, + storeSchoolInfoExist: (Boolean) -> Unit ) { - if(visiblePopUpError){ + if (visiblePopUpError) { ErrorDialog( message = popUpErrorMessage, onConfirm = { visiblePopUpErrorChanged(false) } ) - } - else{ + } else { Column( modifier = modifier ) { @@ -46,7 +52,17 @@ fun SignUpButtonView( enabled = isEnabled ) Spacer(modifier = Modifier.height(8.dp)) - + TextButton( + modifier = Modifier.align(Alignment.CenterHorizontally), + onClick = { onCreateUniversity() } + ){ + Text( + textAlign = TextAlign.Center, + text = "입력할 대학 정보가 없어요", + color = Blue04, + style = Body3 + ) + } } } } \ No newline at end of file diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SignUpViewModel.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SignUpViewModel.kt index 5ccca470..a1a3fd63 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SignUpViewModel.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SignUpViewModel.kt @@ -23,7 +23,7 @@ class SignUpViewModel @Inject constructor( private val univUseCase: UnivUseCase, private val schoolInfoUseCase : SchoolInfoUseCase, ) : BaseViewModel(SignUpState()) { - fun createUniv(universityName: String, grade: Int) = intent { + fun createUniv(universityName: String?, grade: Int?) = intent { val body = UnivRequest(universityName, grade) univUseCase.createUniv(body) .onSuccess {