From 01dc0cabbe2c9c5bbae83d633ccdf8ea41a5559a Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 7 Apr 2025 20:46:02 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20-=20?= =?UTF-8?q?=EC=86=8C=EC=85=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EA=B3=BC=20?= =?UTF-8?q?=EA=B0=99=EC=9D=80=20=ED=81=AC=EA=B8=B0=EC=9D=98=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../sodalive/user/login/LoginActivity.kt | 33 ++++++----- .../res/drawable-xxhdpi/ic_login_email.png | Bin 0 -> 2994 bytes app/src/main/res/layout/activity_login.xml | 52 ++++++++++-------- 4 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_login_email.png 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 0000000000000000000000000000000000000000..5e213486585217c839c352834b8f29062fda34ae GIT binary patch literal 2994 zcmV;j3r+NiP)F&#h{E5rQ<4K*|bNBo?spSZq+_ae6i&Ryat>0_=Du66_LtU=;)Mj0DLJKiGj3 z_r#7DfRynnuyV&UvDlz#uM&w!l(UKi5{(qHnCa@9b8b~l*Yu-aT~%H8*7>Ay_w;M3 zU4Q-OajWhX&@g0sZ3zwz9I)+WkkSDmPT|8#c91M36b-APLU z9XSn%%b<^FW}(C+9=@{;8lsheP&f_@(QTx>0_Ep2RpSDQ>CoQN$(6JakUV<<^BQpt z^mm)IbnqbA7JGNQP;+W6pau$OoGuD!tIk5IrGQvC6HsVduVZMdm4H-^<9XNd?s;IQ z(WzUGR2u=wbFW-8G&wFFAvUpU+kzUfZ~+D3>NehWfXRZ3ZnU~+H(Hp0R4->J(RGGb zfXUB--Dn{K^7}c1_i%h_8JHqim>XG8F_`OI#zc9a#ZxE_obdML%Eijvyix~}=Pq66 zkX14QZit6>HlQLZ5fF#0ilNc}1M9^qLR#qp3VJ&afUB&ksU$BdRY3CjwPmoCc(}K- z82Whdu8K$ZdQcLjCDE8HUt;kroF%aB2WnrGL@5rWHdx9IF!e!*wKC2*DqKJ;o*Gkv zhzb=Di$?s_j?`6IItTIwo4_;)8tO>Z zU`%u%cAo~5BB4%pAkWK`R51qO&yW&Jtbo*Y>paCulW7MUm`S_?rBEPaI0+h@W;>98HDDMb#)YO8C(zKK}yX{at|HzYE$B31cG% zQtNMN!b{)xe{>fQLEnMC%leC;4UuXr8p8BhpJMkP{!wcRfBu{QqYHAl8r~fVNWy8* zh0p#2@YWvz-o&5J{tepl`Tqf~-t@y4g)&_b;wTSNIgr-n`?Fv3^P!dRfL8QA#slCF z{=uLlK_28gkT=kGf&|(Dzr>^XmL^Fkxehtb>u>5S9^$}LDUUB8X~20uf59B$<)7C( zq^0STc`{u2is(J%i3;P%|p-V_gshQy<@>qH4O6DHAmg)qu{ z;vfOl#f@kiC|o7=dGu>Z_zn~d(d#wS#;vQk`QM6v4ISx=4i};8P{JGseV4a?1Ddf! z+G)W66KJupb?5Ry4n!g%r-=(!R2tKf|IbfxM`F(R?AM_Z!ty*xIOICiK%_>ZjvO2~ z7K+CKU7`Q{Km9H_r2Q3}j<3H}P4khOoRo(piRYW&@Lfk&@hI$N3#4>FXGlCGqNJgK zu=z;kJ~>3ugylK46q1^PFMZD!Pm=KKjwPKIwh|pM0TK}95+stiN{7n*J#>j%Zxk2O z(l!N2FmL=6;LNwd2!uF=RhT#hra(J}aw8h0kE6(PKW$SmbRAQ~LUhDavKmL|Mp?@Jusr|d)A-lX z_?&sJGeU|b^BgD&9sRTe)0}H_6pCWpDB2W^OO(lJXn^;(m(6pXF;GC7S7B*LTkcab zJgeNN@;pmZQ0wwMHCTl;h0u*C?}-anVY$EmvEO_o2O-CKe=qjqwQmaMq&Wg2!q7r_ z5eX@-a-!yA?<4t69s$(GD1$(rUN5;CY}0bbb3*pYqQP zeEKV(HRPtZck~jFZG8~lJ-*n=%08 zr+Ziy&4H!<*Z{)DUl7?B44@ft0dL4~wXd6fYj4l=Z@JG`E8{H1Ntf(cit=48RJz?c6e7$dWqukJ?R_jTZ z9+ypR7K~>%N=-jVlsBOU)J8yr??!`7+^kE$Ok)Sj^NmI1IPp!39SSaMV)gb;ga^@joe1SO`70+QN5gb&{jYpK_98Dm6%kBvUZ?lZR;qS zDB24s3W{k7LtGp0o<~8Q#=cTru2*w$xZyr-Q&(4~nT1gT8Yjq^mX$LN1qupCP-UOo zM!8H6hp8W{wMA`v$0WgwW3+&#pzyJUM literal 0 HcmV?d00001 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" /> + + + + + + - - - -