관심강좌, 알림 아이콘 이동 #228
Merged
관심강좌, 알림 아이콘 이동 #228
Conversation
This file contains 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
Collaborator
eastshine2741
commented
Nov 29, 2023
eastshine2741
commented
- 관심강좌
- TimetablePage -> SearchPage로 이동
- Topbar UI 리팩토링
- AnimatedContent로 탭 전환 효과
- 알림
- SettingsPage -> TimetablePage로 이동
JuTaK97
approved these changes
Dec 23, 2023
Comment on lines
21
to
32
| sealed class SearchPageMode(val page: Int) { | ||
| data object Search : SearchPageMode(0) | ||
| data object Bookmark : SearchPageMode(1) | ||
|
|
||
| fun toggled(): SearchPageMode { | ||
| return when (this) { | ||
| is Search -> Bookmark | ||
| is Bookmark -> Search | ||
| } | ||
| } | ||
| } | ||
|
|
Comment on lines
86
to
89
| LaunchedEffect(Unit) { | ||
| searchViewModel.pageMode.collect { | ||
| pagerState.animateScrollToPage( | ||
| page = it.page, |
There was a problem hiding this comment.
이 코드랑 pagerState 의 존재 이유는 뭐지?
There was a problem hiding this comment.
아 원래 앱바는 AnimatedContent고 리스트는 HorizontalPager여서 pagerState를 썼는데 리스트도 AnimatedContent로 바꿔서 필요없는 코드가 됨... 지우는 걸 까먹었네
리스트를 HorizontalPager에서 AnimatedContent로 바꾼 이유는 제목 바뀌는 거랑 싱크가 안맞아서.. indicator나 탭이 있는 것도 아니고 해서 바꿨어
Comment on lines
101
to
86
| is SearchPageMode.Search -> { | ||
| slideInHorizontally { width -> -width } + fadeIn() togetherWith | ||
| slideOutHorizontally { width -> width } + fadeOut() using SizeTransform(clip = false) | ||
| } | ||
| is SearchPageMode.Bookmark -> { | ||
| slideInHorizontally { width -> width } + fadeIn() togetherWith | ||
| slideOutHorizontally { width -> -width } + fadeOut() using SizeTransform(clip = false) | ||
| } |
Comment on lines
220
to
217
| SearchPageMode.Search -> SearchResultList( | ||
| scope, | ||
| searchResultPagingItems, | ||
| searchViewModel, | ||
| timetableViewModel, | ||
| tableListViewModel, | ||
| lectureDetailViewModel, | ||
| userViewModel, | ||
| vacancyViewModel, | ||
| reviewBottomSheetWebViewContainer, | ||
| ) | ||
| SearchPageMode.Bookmark -> BookmarkList( | ||
| searchViewModel, | ||
| timetableViewModel, | ||
| tableListViewModel, | ||
| lectureDetailViewModel, | ||
| userViewModel, | ||
| vacancyViewModel, | ||
| reviewBottomSheetWebViewContainer, | ||
| ) |
There was a problem hiding this comment.
언젠가...... 커스텀테마 끝나고 해볼까...
Comment on lines
428
to
455
| @Composable | ||
| fun BookmarkPlaceHolder() { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize(), | ||
| verticalArrangement = Arrangement.spacedBy(5.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| Text( | ||
| text = stringResource(R.string.bookmark_page_placeholder_1), | ||
| style = SNUTTTypography.subtitle1.copy( | ||
| fontSize = 18.sp, | ||
| color = SNUTTColors.White700, | ||
| fontWeight = FontWeight.Bold, | ||
| ), | ||
| ) | ||
| Text( | ||
| text = stringResource(R.string.bookmark_page_placeholder_2), | ||
| style = SNUTTTypography.subtitle1.copy(fontSize = 18.sp, color = SNUTTColors.White700), | ||
| ) | ||
| Text( | ||
| text = stringResource(R.string.bookmark_page_placeholder_3), | ||
| style = SNUTTTypography.subtitle1.copy(fontSize = 18.sp, color = SNUTTColors.White700), | ||
| ) | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| } | ||
| } |
There was a problem hiding this comment.
파일 분리하자 SearchPage.kt 너무 길어
eastshine2741
commented
Dec 23, 2023
Comment on lines
67
to
72
| try { | ||
| fetchSearchTagList() // FIXME: 학기가 바뀔 때마다 불러주는 것으로 되어 있는데, 여기서 apiOnError 붙이기? | ||
| fetchSearchTagList() | ||
| getBookmarkList() | ||
| } catch (e: Exception) { | ||
| apiOnError(e) | ||
| } |
There was a problem hiding this comment.
fixme 놓친거 있길래 고쳤어요
VacancyViewModel에서 한 것처럼 ApiOnError 주입받아서 했슴다
eastshine2741
force-pushed
the
eastshine2741/move-bookmark-page
branch
from
a3cb235 to
a1b8e2d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.