From 67ebd4f634262c3d63acab25df59220e3923cdbc Mon Sep 17 00:00:00 2001 From: junseo511 Date: Fri, 24 May 2024 15:15:22 +0900 Subject: [PATCH] =?UTF-8?q?feat:=206=EC=A3=BC=EC=B0=A8=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/now/compose/feature/signIn/SignInScreen.kt | 12 ++++++++++++ .../now/compose/feature/signIn/SignInViewModel.kt | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 20 insertions(+) diff --git a/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInScreen.kt b/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInScreen.kt index c6e5062..314848a 100644 --- a/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInScreen.kt +++ b/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInScreen.kt @@ -72,6 +72,17 @@ fun SignInScreen(navController: NavController) { } } + val isWeekSixthHomeworkFinished = signInViewModel.isWeekSixthHomeworkFinished.observeAsState() + isWeekSixthHomeworkFinished.value?.let { + if (it) { + Toast.makeText( + context, + context.getString(R.string.finish_week_sixth_homework), + Toast.LENGTH_SHORT, + ).show() + } + } + Column(modifier = Modifier.padding(24.dp)) { Text(text = stringResource(id = R.string.sign_in_title)) OutlinedTextField( @@ -98,6 +109,7 @@ fun SignInScreen(navController: NavController) { Button( onClick = { signInViewModel.performSignIn(SignInRequest(username, password)) + signInViewModel.finishWeekSixthHomework() }, modifier = Modifier diff --git a/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInViewModel.kt b/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInViewModel.kt index 04ec2da..65b2e6e 100644 --- a/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInViewModel.kt +++ b/app/src/main/java/com/sopt/now/compose/feature/signIn/SignInViewModel.kt @@ -13,6 +13,9 @@ class SignInViewModel : ViewModel() { private val _signInMessage = MutableLiveData() val signInMessage: LiveData = _signInMessage + private val _isWeekSixthHomeworkFinished = MutableLiveData(false) + val isWeekSixthHomeworkFinished: LiveData = _isWeekSixthHomeworkFinished + fun performSignIn(request: SignInRequest) { viewModelScope.launch { runCatching { @@ -32,6 +35,10 @@ class SignInViewModel : ViewModel() { } } + fun finishWeekSixthHomework() { + _isWeekSixthHomeworkFinished.value = true + } + companion object { const val SUCCESS_SIGN_IN = "SUCCESS" } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e1d4d2..e8226e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ 로그인 로그인 로그인에 성공하셨습니다! + 6주차 과제 완료!