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: 도서관 남은 좌석 UI 로직 #403

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

feat: 도서관 남은 좌석 UI 로직 #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5c60581
[추가] 잔여좌석화면 전환용 배너 추가
boiledEgg-s Dec 23, 2024
d095aba
[수정] api 쿼리파라미터 수정
boiledEgg-s Dec 23, 2024
1686a5a
[수정] 상태창 패딩 추가
boiledEgg-s Dec 23, 2024
35fd044
[제거] 주석 코드 삭제
boiledEgg-s Dec 23, 2024
95b7050
[추가] 뷰모델 추가 및 레포지토리 연결
boiledEgg-s Dec 23, 2024
c8b3284
[추가] 도서관 앱 이동 로직 추가
boiledEgg-s Dec 24, 2024
69fd392
[수정] 도서관 잔여좌석 오류UI 수정
boiledEgg-s Dec 24, 2024
bcea715
[수정] 폰트 수정
boiledEgg-s Dec 29, 2024
0b29e9f
[수정] StateFlow 선언 수정
boiledEgg-s Jan 3, 2025
da791e7
[수정] indicator 패키지 이름
boiledEgg-s Jan 3, 2025
a90b662
[수정] PagingLoadingIndicator 컴포넌트화
boiledEgg-s Jan 3, 2025
b9b72a2
[삭제] 미사용 라이브러리 삭제
boiledEgg-s Jan 3, 2025
ffe7a60
[추가] 패키지 에러 크래시리틱
boiledEgg-s Jan 3, 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
18 changes: 11 additions & 7 deletions feature/library/src/main/java/com/ku_stacks/ku_ring/library/compose/LibrarySeatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ private fun LibrarySeatScreen(

is SeatLoadState.Error -> {
item(span = { GridItemSpan(maxLineSpan) }) {
LoadingErrorText()
LoadingErrorText(
modifier = Modifier
)
}
}

Expand Down Expand Up @@ -179,13 +181,15 @@ private fun PagingLoadingIndicator(modifier: Modifier = Modifier) {
@Composable
private fun LoadingErrorText(modifier: Modifier = Modifier) {
Box(modifier = modifier) {
androidx.compose.material.Text(
text = stringResource(id = com.ku_stacks.ku_ring.designsystem.R.string.notice_refresh_error_message),
Text(
text = stringResource(id = R.string.library_seats_load_fail),
fontFamily = SfProDisplay,
Copy link
Member

Choose a reason for hiding this comment

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

SfProDisplay 글꼴을 사용하신 이유가 있나요?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

수정했습니다,,

fontWeight = FontWeight.Normal,
fontSize = 14.sp,
color = colorResource(id = com.ku_stacks.ku_ring.designsystem.R.color.kus_label),
modifier = Modifier.align(Alignment.Center),
color = KuringTheme.colors.textCaption1,
modifier = Modifier
.align(Alignment.Center)
.padding(top = 30.dp),
textAlign = TextAlign.Center,
)
}
Expand Down Expand Up @@ -232,14 +236,14 @@ private fun LibrarySeatScreenPreview() {

@LightAndDarkPreview
@Composable
private fun LoadingPreview() {
private fun LibrarySeatFailPreview() {
KuringTheme {
LibrarySeatScreen(
onBackButtonClick = {},
onReservationButtonClick = {},
onStatusReloadButtonClick = { },
isLoading = false,
seatStatus = SeatLoadState.InitialLoading
seatStatus = SeatLoadState.Error
)
}
}
1 change: 1 addition & 0 deletions feature/library/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<string name="library_seats_title">도서관 잔여좌석</string>
<string name="library_seats_description">도서관 잔여좌석을 확인할 수 있어요.\n열람실 예약하러가기 버튼을 누르면 \n도서관 앱으로 이동해요.</string>
<string name="library_seats_button_reservation">예약하기</string>
<string name="library_seats_load_fail">홈페이지 사정 상,\n잔여좌석 정보를 불러올 수 없어요.</string>
</resources>
Loading