-
Notifications
You must be signed in to change notification settings - Fork 0
[feat/#11] 홈 화면 작업 #13
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
app/src/main/java/com/hsLink/hslink/presentation/home/component/HomeBottomContent.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package com.hsLink.hslink.presentation.home.component | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.hsLink.hslink.R | ||
| import com.hsLink.hslink.core.designsystem.theme.HsLinkTheme | ||
| import com.hsLink.hslink.core.util.noRippleClickable | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun HomeBottomContentPreview() { | ||
| HsLinkTheme { | ||
| HomeBottomContent( | ||
| onClick = {}, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun HomeBottomContent( | ||
| onClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 24.dp, vertical = 32.dp), | ||
| horizontalAlignment = Alignment.Start, | ||
| verticalArrangement = Arrangement.spacedBy(4.dp) | ||
| ) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.img_home_logo), | ||
| contentDescription = null, | ||
| modifier = Modifier | ||
| .height(48.dp) | ||
| .width(92.dp), | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
|
|
||
| Text( | ||
| text = "이용약관 및 개인정보 취급방침", | ||
| color = HsLinkTheme.colors.Grey400, | ||
| style = HsLinkTheme.typography.btm_M, | ||
| modifier = Modifier.noRippleClickable(onClick = onClick) | ||
| ) | ||
| Text( | ||
| text = "리뷰운영정책", | ||
| color = HsLinkTheme.colors.Grey400, | ||
| style = HsLinkTheme.typography.btm_M, | ||
| modifier = Modifier.noRippleClickable(onClick = onClick) | ||
| ) | ||
|
|
||
| } | ||
| } |
91 changes: 91 additions & 0 deletions
91
app/src/main/java/com/hsLink/hslink/presentation/home/component/HomeCardItem.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package com.hsLink.hslink.presentation.home.component | ||
|
|
||
| import androidx.compose.foundation.border | ||
| 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.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.res.vectorResource | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.hsLink.hslink.R | ||
| import com.hsLink.hslink.core.designsystem.theme.HsLinkTheme | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun PreviewHomeCardItem() { | ||
| HsLinkTheme { | ||
| HomeCardItem( | ||
| userName = "John Doe", | ||
| userMajor = "Computer Science", | ||
| userInfo = "Senior at XYZ University", | ||
| modifier = Modifier | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun HomeCardItem( | ||
| userName: String, | ||
| userMajor: String, | ||
| userInfo: String, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Row( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .border( | ||
| width = 1.dp, | ||
| color = HsLinkTheme.colors.Grey100, | ||
| shape = RoundedCornerShape(8.dp) | ||
| ) | ||
| .padding(16.dp), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier.weight(1f), | ||
| verticalArrangement = Arrangement.spacedBy(4.dp) | ||
| ) { | ||
| Text( | ||
| text = userName, | ||
| color = HsLinkTheme.colors.Grey700, | ||
| style = HsLinkTheme.typography.title_16Strong, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
|
|
||
| Text( | ||
| text = userMajor, | ||
| color = HsLinkTheme.colors.Grey700, | ||
| style = HsLinkTheme.typography.body_14Normal, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
|
|
||
| Text( | ||
| text = userInfo, | ||
| color = HsLinkTheme.colors.Grey400, | ||
| style = HsLinkTheme.typography.caption_12Normal, maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.weight(1f)) | ||
|
|
||
| Icon( | ||
| imageVector = ImageVector.vectorResource(id = R.drawable.ic_home_arrow_right), | ||
| contentDescription = null, | ||
| tint = HsLinkTheme.colors.Grey200 | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
Replace invalid carousel items or add image placeholders
The entries "image2" and "image3" are not valid URIs and will fail image loading. Either supply valid URLs or ensure HomeCarousel’s AsyncImage has placeholder/error.
Run to confirm placeholder/error handling in HomeCarousel:
Expected: AsyncImage configured with placeholder() and error() or a fallback painter.
🏁 Script executed:
Length of output: 191
Running verification to see the complete AsyncImage configuration:
Length of output: 385
Add placeholder/error handling or replace invalid carousel URLs
The AsyncImage in HomeCarousel lacks placeholder/error parameters. Invalid URIs ("image2", "image3") will fail to load with no visual fallback. Either supply valid URLs or add
placeholder()anderror()parameters to AsyncImage (lines 54-58 of HomeCarousel.kt).🤖 Prompt for AI Agents