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

Jump to bottom

Feature/Component Design Change #97

Merged
merged 5 commits into from
May 13, 2024
Merged

Feature/Component Design Change #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcf34eb
chore: Edit Start Button Bottom Padding
wnsgur1 May 10, 2024
72565ae
feat: Add Red Start
wnsgur1 May 10, 2024
ecfb100
feat: Create OAuth Button Border
wnsgur1 May 10, 2024
4ab3aac
style: Apply Spotless Format
wnsgur1 May 10, 2024
2679f69
style: Apply Spotless Format
wnsgur1 May 12, 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
4 changes: 4 additions & 0 deletions designsystem/src/main/java/com/apeun/gidaechi/designsystem/component/OAuthButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package com.apeun.gidaechi.designsystem.component

import androidx.annotation.DrawableRes
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -34,6 +36,7 @@ import com.apeun.gidaechi.designsystem.animation.ButtonState
import com.apeun.gidaechi.designsystem.component.modifier.DropShadowType
import com.apeun.gidaechi.designsystem.component.modifier.dropShadow
import com.apeun.gidaechi.designsystem.theme.Black
import com.apeun.gidaechi.designsystem.theme.Gray300
import com.apeun.gidaechi.designsystem.theme.SeugiTheme
import com.apeun.gidaechi.designsystem.theme.White
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -65,6 +68,7 @@ fun SeugiOAuthButton(@DrawableRes image: Int, text: String, onClick: () -> Unit,
),

shape = RoundedCornerShape(12.dp),
border = BorderStroke((1.5).dp, Gray300),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
Expand Down
27 changes: 19 additions & 8 deletions feature-onboarding/login/src/main/java/com/apeun/gidaechi/login/EmailSignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.apeun.gidaechi.designsystem.component.textfield.SeugiPasswordTextFiel
import com.apeun.gidaechi.designsystem.component.textfield.SeugiTextField
import com.apeun.gidaechi.designsystem.theme.Gray600
import com.apeun.gidaechi.designsystem.theme.Primary500
import com.apeun.gidaechi.designsystem.theme.Red500
import com.apeun.gidaechi.designsystem.theme.SeugiTheme

@OptIn(ExperimentalMaterial3Api::class)
Expand Down Expand Up @@ -58,11 +59,16 @@ internal fun EmailSignInScreen(navigateToEmailSignUp: () -> Unit, popBackStack:
.padding(horizontal = 20.dp),
) {
Spacer(modifier = Modifier.height(6.dp))
Text(
text = "이메일",
style = MaterialTheme.typography.titleMedium,
Row(
modifier = Modifier.padding(start = 4.dp),
)
) {
Text(text = "이메일", style = MaterialTheme.typography.titleMedium)
Text(
text = " *",
style = MaterialTheme.typography.titleMedium,
color = Red500,
)
}
Spacer(modifier = Modifier.height(4.dp))
SeugiTextField(
value = emailValue,
Expand All @@ -79,11 +85,16 @@ internal fun EmailSignInScreen(navigateToEmailSignUp: () -> Unit, popBackStack:
.fillMaxWidth()
.padding(horizontal = 20.dp),
) {
Text(
text = "비밀번호",
style = MaterialTheme.typography.titleMedium,
Row(
modifier = Modifier.padding(start = 4.dp),
)
) {
Text(text = "비밀번호", style = MaterialTheme.typography.titleMedium)
Text(
text = " *",
style = MaterialTheme.typography.titleMedium,
color = Red500,
)
}
Spacer(modifier = Modifier.height(4.dp))
SeugiPasswordTextField(
value = pwValue,
Expand Down
21 changes: 14 additions & 7 deletions feature-onboarding/start/src/main/java/com/apeun/gidaechi/StartScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,20 @@ internal fun StartScreen(navigateToEmailSignIn: () -> Unit, navigateToOAuthSignI
)
}
Spacer(modifier = Modifier.weight(1f))
SeugiFullWidthButton(
onClick = { showBottomSheet = true },
type = ButtonType.Transparent,
text = "시작하기",
modifier = Modifier.padding(horizontal = 20.dp),
)
Spacer(modifier = Modifier.weight(1f))
Column(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 50.dp),
verticalArrangement = Arrangement.Bottom,
) {
SeugiFullWidthButton(
onClick = { showBottomSheet = true },
type = ButtonType.Transparent,
text = "시작하기",
modifier = Modifier
.padding(horizontal = 20.dp),
)
}

if (showBottomSheet) {
ModalBottomSheet(
Expand Down
Loading