Skip to content

[UI] 로그인 화면 아이콘, 코드 입력 로직 수정 #24

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

Merged
Nico1eKim merged 2 commits into from
Oct 2, 2025
Merged

[UI] 로그인 화면 아이콘, 코드 입력 로직 수정 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a30e1e
[ui]: 뒤로가기 아이콘 svg로 수정 (#12)
rbqks529 Sep 30, 2025
a378135
[ui]: 숫자 박스에 기존 숫자가 있을 때 변경하도록 수정 (#12)
rbqks529 Sep 30, 2025
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
20 changes: 11 additions & 9 deletions composeApp/src/commonMain/composeResources/files/ic_back.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions ...src/commonMain/kotlin/org/whosin/client/presentation/auth/clubcode/ClubCodeInputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -33,7 +32,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.delay
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
Expand All @@ -45,7 +44,6 @@ import whosinclient.composeapp.generated.resources.club_code_error_message
import whosinclient.composeapp.generated.resources.club_code_title_1
import whosinclient.composeapp.generated.resources.club_code_title_2
import whosinclient.composeapp.generated.resources.confirm_button
import whosinclient.composeapp.generated.resources.ic_back


@Composable
Expand Down Expand Up @@ -108,10 +106,9 @@ fun ClubCodeInputScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier.size(18.dp)
)
}
Expand Down
11 changes: 5 additions & 6 deletions ...rc/commonMain/kotlin/org/whosin/client/presentation/auth/login/EmailVerificationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -29,7 +28,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.delay
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
Expand All @@ -38,7 +37,6 @@ import whosinclient.composeapp.generated.resources.Res
import whosinclient.composeapp.generated.resources.back_button
import whosinclient.composeapp.generated.resources.confirm_button
import whosinclient.composeapp.generated.resources.email_verification_title
import whosinclient.composeapp.generated.resources.ic_back

@Composable
fun EmailVerificationScreen(
Expand Down Expand Up @@ -86,10 +84,9 @@ fun EmailVerificationScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier.size(18.dp)
)
}
Expand Down Expand Up @@ -123,6 +120,8 @@ fun EmailVerificationScreen(
} else if (input.isEmpty() && !wasEmpty && index > 0) {
currentFocusIndex = index - 1
focusRequesters[index - 1].requestFocus()
} else if (input.isNotEmpty()) {
currentFocusIndex = index
}
}
},
Expand Down
12 changes: 4 additions & 8 deletions ...App/src/commonMain/kotlin/org/whosin/client/presentation/auth/login/FindPasswordScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -21,15 +20,14 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
import org.whosin.client.presentation.auth.login.component.CommonLoginInputField
import whosinclient.composeapp.generated.resources.Res
import whosinclient.composeapp.generated.resources.back_button
import whosinclient.composeapp.generated.resources.email_placeholder
import whosinclient.composeapp.generated.resources.ic_back
import whosinclient.composeapp.generated.resources.password_reset_title
import whosinclient.composeapp.generated.resources.send_email_button

Expand Down Expand Up @@ -59,12 +57,10 @@ fun FindPasswordScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier
.size(18.dp)
modifier = Modifier.size(18.dp)
)
}

Expand Down
9 changes: 3 additions & 6 deletions ...pp/src/commonMain/kotlin/org/whosin/client/presentation/auth/login/NicknameInputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -21,14 +20,13 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
import org.whosin.client.presentation.auth.login.component.CommonLoginInputField
import whosinclient.composeapp.generated.resources.Res
import whosinclient.composeapp.generated.resources.back_button
import whosinclient.composeapp.generated.resources.ic_back
import whosinclient.composeapp.generated.resources.next_button
import whosinclient.composeapp.generated.resources.nickname_input_placeholder
import whosinclient.composeapp.generated.resources.nickname_input_title
Expand Down Expand Up @@ -60,10 +58,9 @@ fun NicknameInputScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier.size(18.dp)
)
}
Expand Down
9 changes: 3 additions & 6 deletions ...pp/src/commonMain/kotlin/org/whosin/client/presentation/auth/login/PasswordInputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -21,14 +20,13 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
import org.whosin.client.presentation.auth.login.component.CommonLoginInputField
import whosinclient.composeapp.generated.resources.Res
import whosinclient.composeapp.generated.resources.back_button
import whosinclient.composeapp.generated.resources.ic_back
import whosinclient.composeapp.generated.resources.next_button
import whosinclient.composeapp.generated.resources.password_confirm_label
import whosinclient.composeapp.generated.resources.password_confirm_placeholder
Expand Down Expand Up @@ -65,10 +63,9 @@ fun PasswordInputScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier.size(18.dp)
)
}
Expand Down
12 changes: 4 additions & 8 deletions ...src/commonMain/kotlin/org/whosin/client/presentation/auth/login/SignupEmailInputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -21,15 +20,14 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.compose.resources.painterResource
import coil3.compose.AsyncImage
import org.jetbrains.compose.resources.stringResource
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.whosin.client.presentation.auth.login.component.CommonLoginButton
import org.whosin.client.presentation.auth.login.component.CommonLoginInputField
import whosinclient.composeapp.generated.resources.Res
import whosinclient.composeapp.generated.resources.back_button
import whosinclient.composeapp.generated.resources.email_placeholder
import whosinclient.composeapp.generated.resources.ic_back
import whosinclient.composeapp.generated.resources.next_button
import whosinclient.composeapp.generated.resources.signup_title

Expand Down Expand Up @@ -59,12 +57,10 @@ fun SignupScreen(
.padding(bottom = 32.dp)
.size(24.dp)
) {
Icon(
painter = painterResource(Res.drawable.ic_back),
AsyncImage(
model = Res.getUri("files/ic_back.svg"),
contentDescription = stringResource(Res.string.back_button),
tint = Color.Black,
modifier = Modifier
.size(18.dp)
modifier = Modifier.size(18.dp)
)
}

Expand Down
11 changes: 7 additions & 4 deletions ...c/commonMain/kotlin/org/whosin/client/presentation/auth/login/component/NumberInputBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,17 @@ fun NumberInputBox(
value = textFieldValue,
onValueChange = { newValue ->
val cleaned = newValue.text.replace("\u200B", "")
val filtered = cleaned.filter { it.isDigit() }.take(1)

val filtered = cleaned.filter { it.isDigit() }
if (newValue.text.isEmpty() && value.isEmpty()) {
onBackspace?.invoke()
return@BasicTextField
}

onValueChange(filtered)

if (filtered.isNotEmpty()) {
onValueChange(filtered.last().toString())
} else {
onValueChange("")
}
},
textStyle = textStyle.copy(
color = if (value.isEmpty()) Color.Transparent else Color.Black
Expand Down