Skip to content

[#67] 로그인 버튼 텍스트만 바꿔서 다시 시도해보기 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[#67] 로그인 버튼 텍스트만 바꿔서 다시 시도해보기 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {

defaultConfig {
applicationId = "project.side.ikdaman"
versionCode = 7
versionName = "1.0.7"
versionCode = 8
versionName = "1.0.8"

val kakaoAppKey = properties.getProperty("KAKAO_APP_KEY")
buildConfigField("String", "KAKAO_APP_KEY", "\"$kakaoAppKey\"")
Expand Down
7 changes: 3 additions & 4 deletions feature/src/main/java/project/side/ikdaman/feature/login/LoginScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ fun LoginScreen(
LaunchedEffect(loginState.value) {
when (loginState.value) {
is LoginState.Success -> {
// TODO 최초 1번만 튜토리얼 화면으로 이동
navigateToHomeScreen(navController)
}

Expand Down Expand Up @@ -153,7 +152,7 @@ fun LoginScreenUI(
.padding(top = 15.dp)
) {
SocialButton(
text = "구글로 시작하기",
text = "Google 계정으로 로그인하기",
backgroundColor = Color(0xFFFFFFFF),
textColor = Color(0xFF1F1F1F),
borderColor = Color(0xFF747775),
Expand All @@ -163,7 +162,7 @@ fun LoginScreenUI(
}
Spacer(Modifier.height(10.dp))
SocialButton(
text = "네이버로 시작하기",
text = "Naver 계정으로 로그인",
backgroundColor = Color(0xFF03C75A),
textColor = Color(0xFFFFFFFF),
imageResId = R.drawable.naver_logo
Expand All @@ -172,7 +171,7 @@ fun LoginScreenUI(
}
Spacer(Modifier.height(10.dp))
SocialButton(
text = "카카오로 시작하기",
text = "KAKAO 계정으로 로그인",
backgroundColor = Color(0xFFFEE500),
textColor = Color(0xD9000000),
imageResId = R.drawable.kakao_logo
Expand Down