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.

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

Feature/boolti 235 티켓 N매 구현 #261

Merged
merged 23 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
df24f33
Boolti-235 feat: N매 티켓 새로운 API 연결 및 티켓 목록 UI 변경사항 반영
mangbaam Jun 9, 2024
4319abc
Boolti-235 feat: 인스타그램 인디케이터 작성 (보수 필요)
mangbaam Jun 16, 2024
84e3117
Boolti-235 feat: 티켓 상세에 N매 티켓 반영
mangbaam Jun 16, 2024
776f308
Boolti-235 feat: QR FullScreen 을 TicketDetailScreen 로 이동
mangbaam Jun 21, 2024
8a4795d
Boolti-235 feat: 티켓 목록의 QR 아이콘 수정
mangbaam Jun 21, 2024
7b60ec5
Boolti-235 feat: QR 상세 화면 디자인 변경 (N매 등)
mangbaam Jun 23, 2024
82f4049
Boolti-235 feat: QR 상세 화면에도 티켓 상태에 따른 커버 뷰 추가
mangbaam Jun 23, 2024
390d8e4
Boolti-235 feat: InstagramIndicator dot count 대응
mangbaam Jun 24, 2024
2faebd0
Boolti-235 feat: 티켓 상세, QR 화면 페이지 동기화
mangbaam Jun 24, 2024
dc39fa3
Boolti-235 style: 티켓 상세 티켓 정보 영역 제거 및 디자인 변경 반영
mangbaam Jun 24, 2024
4aa99a3
Boolti-235 style: QR 화면에서 1개 이상일 때만 인디케이터 노출
mangbaam Jun 24, 2024
e89142e
Boolti-235 fix: 인디케이터 시작 페이지 수정
mangbaam Jun 25, 2024
fd1a3fc
Boolti-235 refactor: snapshotFlow 코드 수정
mangbaam Jun 26, 2024
ecb8d1a
Boolti-235 refactor: IndicatorRange 네이밍 변경
mangbaam Jun 26, 2024
b691c9f
Boolti-235 refactor: IndicatorRange contains 제거
mangbaam Jun 26, 2024
d2da962
Merge branch 'refs/heads/develop' into feature/Boolti-235
mangbaam Jun 26, 2024
399abb5
Boolti-235 style: 티켓 탭 디자인 QA 반영
mangbaam Jun 28, 2024
568e7e0
Boolti-235 style: 티켓 상세 디자인 QA 반영
mangbaam Jun 28, 2024
981f03b
디자인 QA 2차 반영
Jul 2, 2024
df68959
문구 수정 (예매 -> 결제), subhead0 fontSize, lineHeight 수정
mangbaam Jul 2, 2024
6500c22
종료된 공연 비활성화 해제
mangbaam Jul 2, 2024
8901b84
Boolti-235 feat: 티켓 상세 - 안내사항 자동 하이라이팅 적용
mangbaam Jul 2, 2024
359d60c
fix : 디자인 추가 QA
HamBP Jul 5, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,20 @@ private fun Title(
modifier = Modifier
.background(White.copy(alpha = 0.3f))
.alpha(0.65f)
.padding(horizontal = 20.dp, vertical = 6.dp),
.padding(vertical = 6.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
modifier = Modifier.weight(1f),
modifier = Modifier
.padding(start = 20.dp)
.weight(1f),
text = ticketName + " • " + stringResource(R.string.ticket_count, ticketCount),
style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.SemiBold),
color = Grey80,
)
Icon(
modifier = Modifier
.padding(end = 4.dp)
.padding(end = 16.dp)
.size(22.dp),
painter = painterResource(R.drawable.ic_logo),
tint = Grey80,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ private fun Title(showName: String = "") {
Text(
modifier = Modifier.weight(1f),
text = showName,
style = MaterialTheme.typography.titleMedium,
style = MaterialTheme.typography.titleSmall,
color = Grey80,
)
Image(
Expand Down Expand Up @@ -493,7 +493,7 @@ private fun QrCode(
.padding(horizontal = 16.dp, vertical = 4.dp),
text = ticketName,
color = Grey70,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
)
Box(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ private val subhead1 = createTextStyle(
lineHeight = 24.sp,
)

private val subhead0 = createTextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Normal,
fontSize = 15.sp,
lineHeight = 21.sp,
mangbaam marked this conversation as resolved.
Show resolved Hide resolved
)

private val body4 = createTextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Normal,
Expand Down Expand Up @@ -154,11 +161,11 @@ val Typography = Typography(

titleLarge = subhead2,
titleMedium = subhead1,
titleSmall = subhead0,
mangbaam marked this conversation as resolved.
Show resolved Hide resolved

titleSmall = body4,
bodyLarge = body3,
bodyMedium = body2,
bodySmall = body1,

labelMedium = caption,
)
)
Loading