diff --git a/app/build.gradle b/app/build.gradle index 9125f2c..74be30c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 157 - versionName "1.33.0" + versionCode 158 + versionName "1.34.0" } buildTypes { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt index 52de3d7..63b25f4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt @@ -95,20 +95,6 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i login() } - binding.tvSignUp.setOnClickListener { - val nextIntent = Intent(applicationContext, SignUpActivity::class.java) - val extras = intent.getBundleExtra(Constants.EXTRA_DATA) - ?: if (intent.extras != null) { - intent.extras - } else { - null - } - if (extras != null) { - nextIntent.putExtra(Constants.EXTRA_DATA, extras) - } - startActivity(nextIntent) - } - binding.tvForgotPassword.setOnClickListener { startActivity( Intent( @@ -118,6 +104,9 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i ) } + binding.tvSignUp.setOnClickListener { startSignUp() } + binding.ivSignUpEmail.setOnClickListener { startSignUp() } + binding.ivLoginGoogle.setOnClickListener { loadingDialog.show(width = screenWidth) val credentialManager = CredentialManager.create(this) @@ -145,7 +134,7 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i // Extract credential from the result returned by Credential Manager handleSignIn(result.credential) } catch (e: GetCredentialException) { - showToast("로그인을 하지 못했습니다. 다시 시도해 주세요") + showToast("구글 로그인을 하지 못했습니다. 다시 시도해 주세요") Logger.e("Couldn't retrieve user's credentials: ${e.localizedMessage}") loadingDialog.dismiss() } @@ -316,4 +305,18 @@ class LoginActivity : BaseActivity(ActivityLoginBinding::i startActivity(nextIntent) } } + + private fun startSignUp() { + val nextIntent = Intent(applicationContext, SignUpActivity::class.java) + val extras = intent.getBundleExtra(Constants.EXTRA_DATA) + ?: if (intent.extras != null) { + intent.extras + } else { + null + } + if (extras != null) { + nextIntent.putExtra(Constants.EXTRA_DATA, extras) + } + startActivity(nextIntent) + } } diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_email.png b/app/src/main/res/drawable-xxhdpi/ic_login_email.png new file mode 100644 index 0000000..5e21348 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_login_email.png differ diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 7b2ec9a..4b54198 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -96,6 +96,28 @@ android:textColor="@color/white" android:textSize="15sp" /> + + + + + + - - - -