-
Notifications
You must be signed in to change notification settings - Fork 0
[FEAT] 이번달 챙길사람 기능 #59
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 20 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
97e2c5d
feat: 이번달 챙길사람 전체보기 화면 네비게이션 추가
stopstone 525fc6b
feat: 월별 리마인더 친구 카드 컴포저블 추가
stopstone 2daa449
feat: 월별 리마인더 화면 빈 상태 컴포저블 추가
stopstone 1bc2ad3
feat: 월별 리마인더 완료 목록 아이템 컴포저블 추가
stopstone 7dc900c
refactor: 월별 리마인더 전체보기 화면 파일 이동 및 ViewModel 연결
stopstone 19cf75d
feat: 이번달 챙길 사람 전체보기 화면 구현
stopstone eb7cf4c
feat: 이달의 챙김 친구 카드 UI 모델 적용
stopstone d85077a
feat: iewModel 및 UI State 구현
stopstone 7f86285
feat: 이달의 챙김 완료 친구 목록 조회 API 추가
stopstone 1bf63ed
chore: MonthlyReminderFriendCard 패딩 삭제
stopstone 05ac850
feat: 챙김 완료 목록 아이템 UI 구현
stopstone 5b178df
feat: 챙김 완료 목록 추가
stopstone 767fe0c
feat: 연락 기록 성공 다이얼로그 추가
stopstone 761cdaf
refactor: 챙김 친구 완료 시 UI 즉시 업데이트
stopstone 7a7334d
refactor: 월별 리마인더 없음 화면 UI 수정
stopstone 39c7efc
refactor: 이번달 챙길 사람 화면 문자열 리소스 적용
stopstone b7146ad
refactor: 이번달 챙길 사람 화면 챙김 완료 상단 패딩 수정
stopstone 6e8b124
refactor: 연락 완료 여부 확인 로직을 uiState로 관리
stopstone 8409fed
refactor: 이번달 챙길 사람 화면 간격 추가
stopstone 3b8db78
feat: 이번달 챙길 사람 리스트 정렬
stopstone 3c61c80
refactor: 월별 리마인더 데이터 로딩 로직 개선
stopstone 3cd540b
refactor: 홈 화면 "전체 보기" 텍스트를 문자열 리소스로 분리
stopstone 0f0ec16
refactor: 에러 처리 방식 개선
stopstone de9c02c
refactor: Flow 에러 처리 로직 공통화
stopstone 42fabc6
refactor: 기록 완료 다이얼로그 색상 수정
stopstone 61d61ac
chore: MonthlyReminderFriendCard.kt 코드 스타일 수정
stopstone 31a0e66
refactor: 이번달 챙길사람 하단 패딩 수정
stopstone 1672ffa
chore: "D-day"를 "D-DAY"로 수정
stopstone c9c4326
feat: 연락일이 오늘일 경우 D-day 스타일 적용 및 중복 데이터 제거
stopstone be85484
refactor: MonthlyReminderAllScreen의 불필요한 launch 제거
stopstone 186e13b
refactor: MonthlyReminderAllViewModel 내 불필요한 private backing property 제거
stopstone 49e421e
refactor: updateUIState 함수의 이름 변경
stopstone 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
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
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
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
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 |
|---|---|---|
|
|
@@ -31,9 +31,11 @@ import androidx.compose.runtime.mutableStateOf | |
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.alpha | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.draw.paint | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.ColorFilter | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.platform.LocalDensity | ||
| import androidx.compose.ui.res.painterResource | ||
|
|
@@ -74,6 +76,7 @@ internal fun HomeRoute( | |
| onAlarmClick: () -> Unit = {}, | ||
| onMyPageClick: () -> Unit = {}, | ||
| onAddContactClick: () -> Unit = {}, | ||
| onMonthlyReminderAllClick: () -> Unit = {}, | ||
| ) { | ||
| LaunchedEffect(Unit) { | ||
| launch { | ||
|
|
@@ -90,6 +93,7 @@ internal fun HomeRoute( | |
| onAlarmClick = onAlarmClick, | ||
| onMyPageClick = onMyPageClick, | ||
| onAddContactClick = onAddContactClick, | ||
| onMonthlyReminderAllClick = onMonthlyReminderAllClick, | ||
| contacts = friends.value, | ||
| monthlyFriends = monthlyFriends.value, | ||
| memberInfo = memberInfo.value, | ||
|
|
@@ -104,6 +108,7 @@ internal fun HomeScreen( | |
| onMyPageClick: () -> Unit = {}, | ||
| onAlarmClick: () -> Unit = {}, | ||
| onAddContactClick: () -> Unit = {}, | ||
| onMonthlyReminderAllClick: () -> Unit = {}, | ||
| memberInfo: MemberInfo?, | ||
| contacts: List<FriendSummary>, | ||
| monthlyFriends: List<MonthlyFriend>, | ||
|
|
@@ -130,7 +135,8 @@ internal fun HomeScreen( | |
| R.drawable.img_bg, | ||
| ), | ||
| contentScale = ContentScale.FillBounds, | ||
| ).fillMaxSize(), | ||
| ) | ||
| .fillMaxSize(), | ||
| ) { | ||
| Spacer(modifier = Modifier.height(statusBarHeightDp)) | ||
| Row( | ||
|
|
@@ -174,12 +180,23 @@ internal fun HomeScreen( | |
| color = NearTheme.colors.WHITE_FFFFFF, | ||
| ) | ||
| Spacer(modifier = Modifier.height(32.dp)) | ||
| Text( | ||
| text = stringResource(R.string.home_this_month_people), | ||
| modifier = Modifier.padding(horizontal = 24.dp), | ||
| style = NearTheme.typography.B1_16_BOLD, | ||
| color = NearTheme.colors.WHITE_FFFFFF, | ||
| ) | ||
|
|
||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.SpaceBetween, | ||
| ) { | ||
| Text( | ||
| text = stringResource(R.string.home_this_month_people), | ||
| modifier = Modifier.padding(horizontal = 24.dp), | ||
| style = NearTheme.typography.B1_16_BOLD, | ||
| color = NearTheme.colors.WHITE_FFFFFF, | ||
| ) | ||
|
|
||
| MonthlyReminderFriendsViewAll( | ||
| modifier = Modifier.padding(horizontal = 24.dp), | ||
| onMonthlyReminderAllClick = onMonthlyReminderAllClick, | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| if (monthlyFriends.isEmpty()) { | ||
| Surface( | ||
|
|
@@ -370,6 +387,36 @@ private fun PagerIndicator(pagerState: PagerState) { | |
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun MonthlyReminderFriendsViewAll( | ||
| modifier: Modifier = Modifier, | ||
| onMonthlyReminderAllClick: () -> Unit = {}, | ||
| ) { | ||
| Row( | ||
| modifier = | ||
| modifier.onNoRippleClick( | ||
| onClick = onMonthlyReminderAllClick, | ||
| ), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Text( | ||
| text = "전체보기", | ||
|
||
| style = NearTheme.typography.B2_14_MEDIUM, | ||
| color = NearTheme.colors.WHITE_FFFFFF, | ||
| modifier = Modifier.alpha(0.8f), | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.size(6.dp)) | ||
|
|
||
| Image( | ||
| painter = painterResource(id = R.drawable.ic_front_8), | ||
| colorFilter = ColorFilter.tint(NearTheme.colors.WHITE_FFFFFF), | ||
| alpha = 1f, | ||
| contentDescription = null, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| internal fun HomeScreenPreview() { | ||
|
|
@@ -408,3 +455,11 @@ internal fun HomeScreenPreview() { | |
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun MonthlyReminderFriendsViewAllPreview() { | ||
| NearTheme { | ||
| MonthlyReminderFriendsViewAll() | ||
| } | ||
| } | ||
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.