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

[FIX/#51] YearPicker 컴포넌트 수정 #52

Merged
merged 3 commits into from
Jan 22, 2025
Merged

[FIX/#51] YearPicker 컴포넌트 수정 #52

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52699a1
#51 [fix] : route 없어짐 충돌 해결
yskim6772 Jan 21, 2025
3a63ed0
#51 [fix] : YearPicker padding 수정, 선택된 값 반영 여부 확인
yskim6772 Jan 21, 2025
6c9c7a7
Merge branch 'develop' of https://github.com/SOPT-all/35-APPJAM-ANDRO…
yskim6772 Jan 22, 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
6 changes: 3 additions & 3 deletions app/src/main/java/com/sopt/withsuhyeon/core/component/picker/YearPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ fun YearPicker(
startLocalDate: LocalDate = currentDate,
yearItems: List<Int> = YEAR_RANGE.reversed(),
visibleItemsCount: Int = 3,
itemPadding: PaddingValues = PaddingValues(top = 12.dp, bottom = 16.dp),
textStyle: TextStyle = typography.title02_SB.copy(color = colors.Grey400),
selectedTextStyle: TextStyle = typography.title02_SB.copy(color = colors.Black),
itemPadding: PaddingValues = PaddingValues(top = 11.dp, bottom = 15.dp),
textStyle: TextStyle = typography.title03_SB.copy(color = colors.Grey400),
selectedTextStyle: TextStyle = typography.title03_SB.copy(color = colors.Grey800),
dividerColor: Color = Transparent,
fadingEdgeGradient: Brush = Brush.verticalGradient(
0f to Transparent,
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/sopt/withsuhyeon/core/navigation/RouteModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ sealed interface Route {
data object PostProfileImage : Route
@Serializable
data object SelectLocation : Route
@Serializable
data object GalleryUpload : Route
@Serializable
data object GalleryPostDetail : Route
}

sealed interface MainTabRoute : Route {
Expand Down