Skip to content
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

[refactor #90] :: 로그인 회원가입 코드 제거 #91

Merged
merged 4 commits into from
Dec 31, 2024
Merged

[refactor #90] :: 로그인 회원가입 코드 제거 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65cb712
refactor :: 로그인 화면 제거
parkuiery Dec 31, 2024
8b8c095
refactor :: 회원가입 화면 제거
parkuiery Dec 31, 2024
8c92e5f
refactor :: ktlint
parkuiery Dec 31, 2024
502de73
refactor :: ktlint
parkuiery Dec 31, 2024
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
121 changes: 0 additions & 121 deletions feature/signin/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signin/ui/SignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,14 @@
package team.aliens.dms.kmp.feature.signin.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import org.koin.compose.koinInject
import team.aliens.dms.kmp.core.common.ui.PaddingDefaults
import team.aliens.dms.kmp.core.common.ui.bottomPadding
import team.aliens.dms.kmp.core.common.ui.horizontalPadding
import team.aliens.dms.kmp.core.common.ui.topPadding
import team.aliens.dms.kmp.core.designsystem.button.DmsButton
import team.aliens.dms.kmp.core.designsystem.button.DmsOutlineButton
import team.aliens.dms.kmp.core.designsystem.foundation.DmsSymbol
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTypography
import team.aliens.dms.kmp.core.designsystem.text.DmsText
import team.aliens.dms.kmp.core.designsystem.textfield.DmsTextField
import team.aliens.dms.kmp.feature.signin.viewmodel.SignInState
import team.aliens.dms.kmp.feature.signin.viewmodel.SignInViewModel

Expand Down Expand Up @@ -62,108 +44,5 @@ fun SignInScreen(
.fillMaxSize()
.background(DmsTheme.colors.background),
) {
DmsSymbol(
modifier = Modifier
.topPadding(36.dp)
.horizontalPadding(),
)
UserInformationInputs(
modifier = Modifier.topPadding(PaddingDefaults.ExtraLarge),
accountId = state.accountId,
onAccountIdChange = onAccountIdChange,
password = state.password,
onPasswordChange = onPasswordChange,
)
DmsButton(
modifier = Modifier
.fillMaxWidth()
.topPadding(28.dp)
.horizontalPadding(),
text = "로그인",
enabled = state.buttonEnabled,
onClick = navigateToMain,
)
UnauthorizedActions(
onFindId = { },
onFindPassword = { },
)
Spacer(modifier = Modifier.weight(1f))
DmsOutlineButton(
modifier = Modifier
.fillMaxWidth()
.horizontalPadding()
.bottomPadding(16.dp),
text = "회원가입 하기",
onClick = navigateToSignUp,
)
}
}

@Composable
private fun UserInformationInputs(
modifier: Modifier = Modifier,
accountId: String,
onAccountIdChange: (String) -> Unit,
password: String,
onPasswordChange: (String) -> Unit,
) {
Column(
modifier = modifier
.fillMaxWidth()
.horizontalPadding(),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
DmsTextField(
value = accountId,
onValueChange = onAccountIdChange,
hint = "아이디를 입력해주세요",
label = "아이디",
showClearIcon = true,
)
DmsTextField(
value = password,
onValueChange = onPasswordChange,
hint = "비밀번호를 입력해주세요",
label = "비밀번호",
keyboardType = KeyboardType.Password,
showVisibleIcon = true,
)
}
}

@Composable
private fun UnauthorizedActions(
modifier: Modifier = Modifier,
onFindId: () -> Unit,
onFindPassword: () -> Unit,
) {
Row(
modifier = modifier
.fillMaxWidth()
.topPadding(PaddingDefaults.ExtraLarge)
.horizontalPadding(),
horizontalArrangement = Arrangement.spacedBy(
space = PaddingDefaults.Medium,
alignment = Alignment.CenterHorizontally,
),
) {
DmsText(
modifier = Modifier.clickable(
onClick = onFindId,
),
text = "아이디 찾기",
style = DmsTypography.Body1Medium,
)
DmsText(
text = "|",
style = DmsTypography.Body1Medium,
)
DmsText(
modifier = Modifier.clickable(
onClick = onFindPassword,
),
text = "비밀번호 찾기",
style = DmsTypography.Body1Medium,
)
}
}
32 changes: 0 additions & 32 deletions ...re/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/EnterEmailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,14 @@ package team.aliens.dms.kmp.feature.signup.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import org.koin.compose.koinInject
import team.aliens.dms.kmp.core.common.ui.PaddingDefaults
import team.aliens.dms.kmp.core.common.ui.bottomPadding
import team.aliens.dms.kmp.core.common.ui.horizontalPadding
import team.aliens.dms.kmp.core.common.ui.topPadding
import team.aliens.dms.kmp.core.designsystem.appbar.DmsLargeTopAppBar
import team.aliens.dms.kmp.core.designsystem.button.DmsButton
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme
import team.aliens.dms.kmp.core.designsystem.textfield.DmsTextField
import team.aliens.dms.kmp.feature.signup.model.SignUpData
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterEmailSideEffect
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterEmailState
Expand Down Expand Up @@ -63,28 +54,5 @@ private fun EnterEmailScreen(
.fillMaxSize()
.background(DmsTheme.colors.background),
) {
DmsLargeTopAppBar(
onBackPressed = onBackPressed,
title = "이메일을 입력해주세요",
description = "학교 이메일을 입력해주세요.",
)
DmsTextField(
modifier = Modifier
.fillMaxWidth()
.topPadding(PaddingDefaults.ExtraLarge)
.horizontalPadding(),
value = state.email,
onValueChange = onEmailChange,
)
Spacer(modifier = Modifier.weight(1f))
DmsButton(
modifier = Modifier
.fillMaxWidth()
.horizontalPadding()
.bottomPadding(),
text = "다음",
onClick = onNextClick,
enabled = state.buttonEnabled,
)
}
}
82 changes: 0 additions & 82 deletions ...mmonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/EnterEmailVerificationCodeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,15 @@
package team.aliens.dms.kmp.feature.signup.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.material.Icon
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import org.jetbrains.compose.resources.painterResource
import org.koin.compose.koinInject
import team.aliens.dms.kmp.core.common.ui.PaddingDefaults
import team.aliens.dms.kmp.core.common.ui.bottomPadding
import team.aliens.dms.kmp.core.common.ui.horizontalPadding
import team.aliens.dms.kmp.core.common.ui.topPadding
import team.aliens.dms.kmp.core.designsystem.appbar.DmsLargeTopAppBar
import team.aliens.dms.kmp.core.designsystem.button.DmsButton
import team.aliens.dms.kmp.core.designsystem.foundation.DmsIcon
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTypography
import team.aliens.dms.kmp.core.designsystem.numberfield.DmsNumberField
import team.aliens.dms.kmp.core.designsystem.text.DmsText
import team.aliens.dms.kmp.core.designsystem.timer.DmsTimer
import team.aliens.dms.kmp.feature.signup.model.SignUpData
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterEmailVerificationCodeSideEffect
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterEmailVerificationCodeState
Expand Down Expand Up @@ -75,66 +54,5 @@ private fun EnterEmailVerificationCodeScreen(
.fillMaxSize()
.background(DmsTheme.colors.background),
) {
DmsLargeTopAppBar(
onBackPressed = onBackPressed,
title = "인증코드를 입력해주세요",
description = "입력하신 이메일 주소로 인증코드가 전송되었어요.",
)
VerificationCode(
emailVerificationCode = state.emailVerificationCode,
onEmailVerificationCodeChange = onEmailVerificationCodeChange,
)
Spacer(modifier = Modifier.weight(1f))
DmsButton(
modifier = Modifier
.fillMaxWidth()
.horizontalPadding()
.bottomPadding(),
text = "다음",
onClick = onNextClick,
enabled = state.buttonEnabled,
)
}
}

@Composable
fun VerificationCode(
modifier: Modifier = Modifier,
emailVerificationCode: String,
onEmailVerificationCodeChange: (String) -> Unit,
) {
Column(
modifier = modifier
.fillMaxWidth()
.topPadding(PaddingDefaults.ExtraLarge)
.horizontalPadding(),
) {
DmsTimer()
Spacer(modifier = Modifier.height(PaddingDefaults.Large))
DmsNumberField(
modifier = Modifier.fillMaxWidth(),
value = emailVerificationCode,
onValueChange = onEmailVerificationCodeChange,
totalLength = 6,
)
Spacer(modifier = Modifier.height(PaddingDefaults.ExtraLarge))
Row(
modifier = Modifier.clickable(
onClick = { },
),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Icon(
painter = painterResource(DmsIcon.Refresh),
contentDescription = "refresh",
tint = DmsTheme.colors.secondary,
)
DmsText(
text = "인증문자 재발송",
style = DmsTypography.Body1Medium,
color = DmsTheme.colors.secondary,
)
}
}
}
33 changes: 0 additions & 33 deletions ...monMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/EnterSchoolVerificationCodeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,14 @@ package team.aliens.dms.kmp.feature.signup.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import org.koin.compose.koinInject
import team.aliens.dms.kmp.core.common.ui.PaddingDefaults
import team.aliens.dms.kmp.core.common.ui.bottomPadding
import team.aliens.dms.kmp.core.common.ui.horizontalPadding
import team.aliens.dms.kmp.core.common.ui.topPadding
import team.aliens.dms.kmp.core.designsystem.appbar.DmsLargeTopAppBar
import team.aliens.dms.kmp.core.designsystem.button.DmsButton
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme
import team.aliens.dms.kmp.core.designsystem.numberfield.DmsNumberField
import team.aliens.dms.kmp.feature.signup.model.SignUpData
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterSchoolVerificationCodeSideEffect
import team.aliens.dms.kmp.feature.signup.viewmodel.EnterSchoolVerificationCodeState
Expand Down Expand Up @@ -64,29 +55,5 @@ private fun EnterSchoolVerificationCodeScreen(
.fillMaxSize()
.background(DmsTheme.colors.background),
) {
DmsLargeTopAppBar(
onBackPressed = onBackPressed,
title = "인증코드를 입력해주세요",
description = "학교 인증코드를 입력해주세요.",
)
DmsNumberField(
modifier = Modifier
.fillMaxWidth()
.topPadding(PaddingDefaults.ExtraLarge)
.horizontalPadding(),
value = state.verificationCode,
onValueChange = onVerificationCodeChange,
totalLength = VERIFICATION_CODE_LENGTH,
)
Spacer(modifier = Modifier.weight(1f))
DmsButton(
modifier = Modifier
.fillMaxWidth()
.horizontalPadding()
.bottomPadding(),
text = "다음",
onClick = onNextClick,
enabled = state.buttonEnabled,
)
}
}
Loading
Loading