Skip to content

Commit d68fe5a

Browse files
committed
[BOOK-475] feat: 구글 로그인 버튼 툴팁 추가
1 parent 461ba51 commit d68fe5a

1 file changed

Lines changed: 38 additions & 20 deletions

File tree

  • feature/login/src/main/kotlin/com/ninecraft/booket/feature/login

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
3131
import com.ninecraft.booket.core.designsystem.component.button.smallButtonStyle
3232
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
3333
import com.ninecraft.booket.core.designsystem.theme.White
34+
import com.ninecraft.booket.core.model.LoginMethod
3435
import com.ninecraft.booket.core.ui.ReedScaffold
3536
import com.ninecraft.booket.core.ui.component.ReedCloseTopAppBar
3637
import com.ninecraft.booket.core.ui.component.ReedLoadingIndicator
@@ -118,8 +119,7 @@ internal fun LoginUi(
118119
},
119120
)
120121

121-
// TODO: 구글 로그인 추가 후 툴팁 위치 조정 필요
122-
if (state.showLoginTooltip) {
122+
if (state.showLoginTooltip && state.recentLoginMethod == LoginMethod.KAKAO) {
123123
LoginTooltipBox(
124124
messageResId = R.string.recent_login,
125125
modifier = Modifier
@@ -136,25 +136,43 @@ internal fun LoginUi(
136136

137137
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing2))
138138

139-
// 구글 로그인 버튼
140-
ReedButton(
141-
onClick = {
142-
state.eventSink(LoginUiEvent.OnGoogleLoginButtonClick)
143-
},
144-
sizeStyle = largeButtonStyle,
145-
colorStyle = ReedButtonColorStyle.GOOGLE,
146-
modifier = Modifier
147-
.fillMaxWidth()
148-
.padding(horizontal = ReedTheme.spacing.spacing5),
149-
text = stringResource(id = R.string.google_login),
150-
leadingIcon = {
151-
Icon(
152-
imageVector = ImageVector.vectorResource(id = R.drawable.ic_google),
153-
contentDescription = "Google Icon",
154-
tint = Color.Unspecified,
139+
// 구글 로그인 버튼 + 툴팁
140+
Box(
141+
modifier = Modifier.fillMaxWidth(),
142+
) {
143+
ReedButton(
144+
onClick = {
145+
state.eventSink(LoginUiEvent.OnGoogleLoginButtonClick)
146+
},
147+
sizeStyle = largeButtonStyle,
148+
colorStyle = ReedButtonColorStyle.GOOGLE,
149+
modifier = Modifier
150+
.fillMaxWidth()
151+
.padding(horizontal = ReedTheme.spacing.spacing5),
152+
text = stringResource(id = R.string.google_login),
153+
leadingIcon = {
154+
Icon(
155+
imageVector = ImageVector.vectorResource(id = R.drawable.ic_google),
156+
contentDescription = "Google Icon",
157+
tint = Color.Unspecified,
158+
)
159+
},
160+
)
161+
162+
if (state.showLoginTooltip && state.recentLoginMethod == LoginMethod.GOOGLE) {
163+
LoginTooltipBox(
164+
messageResId = R.string.recent_login,
165+
modifier = Modifier
166+
.align(Alignment.BottomEnd)
167+
.offset {
168+
IntOffset(
169+
x = (-28).dp.roundToPx(),
170+
y = (-32).dp.roundToPx(),
171+
)
172+
},
155173
)
156-
},
157-
)
174+
}
175+
}
158176

159177
Spacer(
160178
modifier = Modifier.height(

0 commit comments

Comments
 (0)