From 707250d612a2ede90340260ef9dd3b44b3da2f97 Mon Sep 17 00:00:00 2001 From: youjin09222 Date: Fri, 7 Jun 2024 08:04:03 +0900 Subject: [PATCH] =?UTF-8?q?mod/#9=20:=20=EB=A1=9C=EA=B7=B8=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=B6=94=EC=B6=9C=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../now/test/presentation/{ => signup}/SignUpActivity.kt | 8 +++++--- .../now/test/presentation/{ => signup}/SignUpViewModel.kt | 2 +- app/src/main/res/values/strings.xml | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) rename app/src/main/java/com/sopt/now/test/presentation/{ => signup}/SignUpActivity.kt (89%) rename app/src/main/java/com/sopt/now/test/presentation/{ => signup}/SignUpViewModel.kt (95%) diff --git a/app/src/main/java/com/sopt/now/test/presentation/SignUpActivity.kt b/app/src/main/java/com/sopt/now/test/presentation/signup/SignUpActivity.kt similarity index 89% rename from app/src/main/java/com/sopt/now/test/presentation/SignUpActivity.kt rename to app/src/main/java/com/sopt/now/test/presentation/signup/SignUpActivity.kt index ad23d3b..f9d4c8d 100644 --- a/app/src/main/java/com/sopt/now/test/presentation/SignUpActivity.kt +++ b/app/src/main/java/com/sopt/now/test/presentation/signup/SignUpActivity.kt @@ -1,13 +1,15 @@ -package com.sopt.now.test.presentation +package com.sopt.now.test.presentation.signup import android.content.Intent import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity +import com.sopt.now.R import com.sopt.now.databinding.ActivitySignUpBinding import com.sopt.now.test.core.util.context.showToast import com.sopt.now.test.core.view.UiState import com.sopt.now.test.data.dto.request.RequestSignUpDto +import com.sopt.now.test.presentation.login.LoginActivity import timber.log.Timber class SignUpActivity : AppCompatActivity() { @@ -35,13 +37,13 @@ class SignUpActivity : AppCompatActivity() { when (it) { is UiState.Success -> navigateToLogin(it.data.message) is UiState.Failure -> showToast(it.errorMessage) - is UiState.Loading -> Timber.d("로딩 중") + is UiState.Loading -> Timber.d(getString(R.string.message_loading)) } } } private fun getSignUpRequestDto(): RequestSignUpDto { - with(binding){ + with(binding) { val id = etSignUpId.text.toString() val password = etSignUpPw.text.toString() val nickname = etSignUpName.text.toString() diff --git a/app/src/main/java/com/sopt/now/test/presentation/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/test/presentation/signup/SignUpViewModel.kt similarity index 95% rename from app/src/main/java/com/sopt/now/test/presentation/SignUpViewModel.kt rename to app/src/main/java/com/sopt/now/test/presentation/signup/SignUpViewModel.kt index f9341a7..d13b6f0 100644 --- a/app/src/main/java/com/sopt/now/test/presentation/SignUpViewModel.kt +++ b/app/src/main/java/com/sopt/now/test/presentation/signup/SignUpViewModel.kt @@ -1,4 +1,4 @@ -package com.sopt.now.test.presentation +package com.sopt.now.test.presentation.signup import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f93e172..36b53d3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,7 @@ NOW SOPT Android + + Welcom to SOPT 회원가입 로그인 @@ -8,9 +10,14 @@ 비밀번호 비밀번호를 입력해주세요. + SIGN UP 닉네임 닉네임을 입력해주세요. 핸드폰 번호 핸드폰 번호를 입력해주세요. + + + 로딩 중 + 로그인 성공! 유저의 ID는 %1$s 입니다. \ No newline at end of file