Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -45,19 +45,22 @@ struct CalendarCellView: View {
.padding(.top, 36.adjustedH)
}

TypographyText("\(value.day)", style: .body1_r_14, color: dayTextColor)

if procedureCount > 0 && calendarMode == .none {
let displayCount = min(procedureCount, 3)
ZStack {
TypographyText("\(value.day)", style: .body1_r_14, color: dayTextColor)

VStack {
Spacer()
HStack(spacing: 4) {
ForEach(0..<displayCount, id: \.self) { _ in
scheduleCircle
if procedureCount > 0 && calendarMode == .none {
let displayCount = min(procedureCount, 3)

VStack {
Spacer()
HStack(spacing: 4) {
ForEach(0..<displayCount, id: \.self) { _ in
scheduleCircle
}
}
.padding(.bottom, 4.adjustedH)
.padding(.top, 19.adjustedH)
}
.padding(.bottom, 4)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ extension CalendarView {
let procedureCount = viewModel.procedureList.count
return VStack(spacing: 0) {
HStack {
TypographyText("일정 ・ \(procedureCount)개", style: .body1_r_14, color: .gray1000)
TypographyText("일정 ・ \(procedureCount)개", style: .body1_m_14, color: .gray1000)

Spacer()

Expand Down Expand Up @@ -263,14 +263,17 @@ extension CalendarView {

private var emptyScheduleView: some View {
VStack(alignment: .center) {
VStack(spacing: 8){
Spacer()
.frame(height: 50.adjustedH)

VStack(alignment: .center, spacing: 8){
Image(.illustrationNoschedule)
.resizable()
.frame(width: 148.adjustedW, height: 108.adjustedH)
.frame(width: 98.adjustedW, height: 80.adjustedH)

TypographyText("오늘 예정된 일정이 없어요.", style: .body1_r_14, color: .gray600)
}
.padding(.top, 50.adjustedH)
.frame(width: 148.adjustedW, height: 108.adjustedH)
.padding(.horizontal, 65.adjustedW)

Spacer()
Expand Down Expand Up @@ -318,7 +321,7 @@ extension CalendarView {
)
.frame(width: 12.adjustedW, height: 12.adjustedH)

TypographyText("\(state.title)", style: .body3_r_12, color: .gray800)
TypographyText("\(state.title)", style: .body3_m_12, color: .gray800)
}
.frame(width: 44.adjustedW, height: 20.adjustedH)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ extension ProcedureView {

VStack(alignment: .trailing, spacing: 1) {
TypographyText(treatmentDate.dateFormatter(), style: .body3_r_12, color: status.downtimeTextColor)
if status == .active {
if downTimeDays == 0 {
TypographyText("-", style: .body3_r_12, color: status.downtimeTextColor)
}
else {
TypographyText("다운타임 \(downTimeDays)일", style: .body3_r_12, color: status.downtimeTextColor)
}
if downTimeDays == 0 {
TypographyText("-", style: .body3_r_12, color: status.downtimeTextColor)
}
else {
TypographyText("다운타임 \(downTimeDays)일", style: .body3_r_12, color: status.downtimeTextColor)
}

}
.padding(.trailing, 10)
Copy link
Contributor

Choose a reason for hiding this comment

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

기기대응! 해주세용

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extension MyPageView {
.resizable()
.frame(width: 308.adjustedW, height: 250.adjustedH)

TypographyText("앗! 아직 준비 중이에요.", style: .body1_m_14, color: .gray500)
TypographyText("앗! 아직 준비 중이에요.", style: .body1_m_14, color: .gray600)

Spacer()
.frame(height: 110.adjustedH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct CherrishTabBar: View {
@Binding var selectedTab: CherrishTab

var body: some View {
HStack {
HStack(spacing: 50.adjustedW) {
ForEach(CherrishTab.allCases, id: \.self) { tab in
Button {
selectedTab = tab
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
{
"images" : [
{
"filename" : "illustration_profile.svg",
"idiom" : "universal"
"filename" : "illustration_profile.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "illustration_profile@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "illustration_profile@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.