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

Feat/#45 UI 비율을 360800 수정 #46

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Feat/#45 UI 비율을 360800 수정 #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cffda3f
fix: 디자인 스펙 수정
rhkrwngud445 Mar 6, 2024
15b2330
chore: 불필요한 import 제거
rhkrwngud445 Mar 6, 2024
d2afd5f
refactor: PaddingValues 대신 기본 padding 속성 사용
rhkrwngud445 Mar 6, 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
13 changes: 10 additions & 3 deletions feature/login/src/main/java/com/withpeace/withpeace/feature/login/LoginScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.PlatformTextStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme
import com.withpeace.withpeace.googlelogin.GoogleLoginManager
Expand Down Expand Up @@ -81,6 +84,7 @@ fun LoginScreen(
) {
Spacer(modifier = Modifier.height(152.dp))
Image(
modifier = Modifier.size(150.dp),
painter = painterResource(id = R.drawable.app_logo),
contentDescription = stringResource(R.string.app_logo_content_description),
)
Expand All @@ -92,6 +96,7 @@ fun LoginScreen(
)
Spacer(modifier = Modifier.height(24.dp))
Text(
lineHeight = 19.sp,
style = WithpeaceTheme.typography.body,
text = stringResource(R.string.welcome_introduction),
textAlign = TextAlign.Center,
Expand Down Expand Up @@ -125,16 +130,18 @@ fun LoginScreen(
) {
Image(
modifier = Modifier
.padding(16.dp)
.padding(start = 16.dp)
.align(Alignment.CenterStart)
.size(24.dp),
painter = painterResource(id = R.drawable.img_google_logo),
contentDescription = stringResource(R.string.image_google_logo),
)
Text(
modifier = Modifier.align(Alignment.Center),
modifier = Modifier.align(Alignment.Center).padding(vertical = 18.dp),
color = WithpeaceTheme.colors.SystemBlack,
style = WithpeaceTheme.typography.notoSans,
style = WithpeaceTheme.typography.notoSans.merge(
TextStyle(platformStyle = PlatformTextStyle(includeFontPadding = false))
),
Comment on lines +142 to +144
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

platformStyle을 DesignSystem의 Typhograpy 부분에 기본적으로 모두 적용시키는게 좋아 보입니다!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

디자인 시스템에서 텍스트 패딩을 모두 제외하는 것을 말씀하시는 걸까요?!🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

네 맞습니다! 피그마에서는 폰트패딩이 적용되지 않은 상태로 보여주기 때문에 현재 제외하신거 아닌가요?
항상 이코드가 추가될 것 같은데 디자인시스템에서 폰트패딩을 모두 제거하는게 어떤가요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LineSpacing: 게시글 기능 기준으로 디자인 가이드 정립 주신다고 하여 추후(스펙이 나올 때) 적용하면 될 것으로 보입니다!

text = stringResource(R.string.login_to_google),
)
}
Expand Down
Loading