klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

회원가입 

- 소셜 로그인과 같은 크기의 버튼 추가
This commit is contained in:
klaus 2025-04-07 20:46:02 +09:00
parent d4796257b3
commit 01dc0cabbe
4 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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 {

33
app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt
View File

@ -95,20 +95,6 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(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>(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>(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>(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)
}
}

BIN
app/src/main/res/drawable-xxhdpi/ic_login_email.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

52
app/src/main/res/layout/activity_login.xml
View File

@ -96,6 +96,28 @@
android:textColor="@color/white"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_forgot_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:fontFamily="@font/gmarket_sans_medium"
android:paddingVertical="10dp"
android:text="비밀번호를 잊으셨나요?"
android:textColor="@color/color_bbbbbb"
android:textSize="13.3sp" />
<TextView
android:id="@+id/tv_sign_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/gmarket_sans_medium"
android:paddingVertical="10dp"
android:text="보이스온 회원이 아닌가요? 지금 가입하세요."
android:textColor="@color/color_bbbbbb"
android:textSize="13.3sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -103,6 +125,14 @@
android:layout_marginTop="20dp"
android:gravity="center">
<ImageView
android:id="@+id/iv_sign_up_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="13.3dp"
android:contentDescription="@null"
android:src="@drawable/ic_login_email" />
<ImageView
android:id="@+id/iv_login_kakao"
android:layout_width="wrap_content"
@ -118,27 +148,5 @@
android:contentDescription="@null"
android:src="@drawable/ic_login_google" />
</LinearLayout>
<TextView
android:id="@+id/tv_forgot_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:fontFamily="@font/gmarket_sans_medium"
android:paddingVertical="10dp"
android:text="비밀번호를 잊으셨나요?"
android:textColor="@color/color_bbbbbb"
android:textSize="13.3sp" />
<TextView
android:id="@+id/tv_sign_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:fontFamily="@font/gmarket_sans_medium"
android:paddingVertical="10dp"
android:text="보이스온 회원이 아닌가요? 지금 가입하세요."
android:textColor="@color/color_bbbbbb"
android:textSize="13.3sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>