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

merge :: 디자인 시스템 - 폰트 변경사항 반영 #138

Merged
merged 3 commits into from
Nov 25, 2022
Merged

merge :: 디자인 시스템 - 폰트 변경사항 반영 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8de70da
feat :: Font 시스템 변경
baekteun Nov 22, 2022
09fc2d0
Merge branch 'develop' of https://github.com/DSM-FLOW/DMS-iOS into 13…
baekteun Nov 24, 2022
dbb6a14
:sparkles: :: gc -m "feat :: 최신 기능 개발 반영"
baekteun Nov 24, 2022
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
2 changes: 1 addition & 1 deletion Projects/App/Sources/Application/NeedleGenerated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi

#if !NEEDLE_DYNAMIC

private func register1() {
@inline(never) private func register1() {
registerProviderFactory("^->AppComponent", factoryEmptyDependencyProvider)
registerProviderFactory("^->AppComponent->SchoolConfirmationQuestionsComponent", factoryd462667f0418a53210fcf47b58f8f304c97af4d5)
registerProviderFactory("^->AppComponent->SchoolCodeComponent", factoryb65c1efbf06b87162473f47b58f8f304c97af4d5)
Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/FindIDFeature/Sources/Component/SchoolSelectButtonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct SchoolSelectButtonView: View {
VStack(alignment: .leading, spacing: 10) {
HStack(alignment: .bottom) {
Text(placeholderText)
.dmsFont(.text(.medium), color: textColor)
.dmsFont(.body(.body1), color: textColor)

Spacer()

Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/FindIDFeature/Sources/FindIDView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct FindIDView: View {

var body: some View {
VStack {
AuthHeaderView(subTitle: "아이디 찾기")
DMSHeaderTitleView(subTitle: "아이디 찾기")
.padding(.top, 24)

VStack(spacing: 60) {
Expand Down
4 changes: 2 additions & 2 deletions Projects/Features/HomeFeature/Sources/Component/CalendarSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct CalendarSheetView: View {
VStack {
HStack {
Text(selectedDateString)
.dmsFont(.text(.extraLarge), color: .GrayScale.gray6)
.dmsFont(.title(.title2), color: .GrayScale.gray6)

Spacer()
}
Expand All @@ -27,7 +27,7 @@ struct CalendarSheetView: View {
if model.day != -1 {
Text("\(model.day)")
.dmsFont(
.text(.large),
.body(.body1),
color: model.date.isSameDay(selectedDate) ? .GrayScale.gray1 : .GrayScale.gray6
)
.padding(8)
Expand Down
6 changes: 3 additions & 3 deletions Projects/Features/HomeFeature/Sources/Component/MealCarouselView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ struct MealCarouselView: View {
VStack {
if meal.isEmpty {
Text("급식이 없습니다.")
.dmsFont(.text(.large), color: .GrayScale.gray6)
.dmsFont(.body(.body1), color: .GrayScale.gray6)
.frame(maxHeight: .infinity)
} else {
ForEach(meal.indices, id: \.self) { index in
if index != meal.count - 1 {
Text(meal[index])
.dmsFont(.text(.medium), color: .GrayScale.gray6)
.dmsFont(.body(.body1), color: .GrayScale.gray6)
.frame(maxHeight: .infinity)
}
}
Expand All @@ -69,7 +69,7 @@ struct MealCarouselView: View {
.frame(maxHeight: .infinity)

Text(meal.last?.hasSuffix("Kcal") ?? false ? meal.last ?? "0Kcal" : "0Kcal")
.dmsFont(.text(.medium), color: .GrayScale.gray5)
.dmsFont(.body(.body2), color: .GrayScale.gray5)
.padding(.bottom, 16)
}
.redacted(reason: isLoading ? .placeholder : [])
Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/HomeFeature/Sources/Component/NoticeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct NoticeView: View {
.padding(.vertical, 12)

Text("새로운 공지가 있습니다.")
.dmsFont(.text(.small), color: .GrayScale.gray6)
.dmsFont(.body(.body3), color: .GrayScale.gray6)

Spacer()

Expand Down
6 changes: 3 additions & 3 deletions Projects/Features/HomeFeature/Sources/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct HomeView: View {
}

Text("오늘의 급식")
.dmsFont(.title(.small), color: .GrayScale.gray7)
.dmsFont(.title(.title1), color: .GrayScale.gray7)
.padding(.top, 16)

selectDateView()
Expand All @@ -65,7 +65,7 @@ struct HomeView: View {
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Text("로고")
.dmsFont(.title(.small), color: .GrayScale.gray7)
.dmsFont(.title(.title1), color: .GrayScale.gray7)
}
}
.dmsBackground()
Expand Down Expand Up @@ -97,7 +97,7 @@ struct HomeView: View {
} icon: {
Image(systemName: "calendar")
}
.dmsFont(.button(.default), color: .GrayScale.gray6)
.dmsFont(.etc(.button), color: .GrayScale.gray6)
.padding(.vertical, 8.5)
.padding(.horizontal, 12)
.overlay {
Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/MyPageFeature/Sources/ChangeProfile/ChangeProfileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct ChangeProfileView: View {

var body: some View {
VStack {
DMSHeaderView(subTitle: "프로필 사진")
DMSHeaderTitleView(subTitle: "프로필 사진")
.padding(.top, 24)

Button {
Expand Down
20 changes: 10 additions & 10 deletions Projects/Features/MyPageFeature/Sources/MyPageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ struct MyPageView: View {
HStack {
VStack(alignment: .leading, spacing: 8) {
Text("\(viewModel.profile?.gcn ?? "") \(viewModel.profile?.name ?? "Loading...")")
.dmsFont(.title(.small), color: .GrayScale.gray7)
.dmsFont(.title(.title1), color: .GrayScale.gray7)

Text(viewModel.profile?.schoolName ?? "")
.dmsFont(.text(.small), color: .GrayScale.gray6)
.dmsFont(.body(.body3), color: .GrayScale.gray6)
}

Spacer()
Expand Down Expand Up @@ -55,7 +55,7 @@ struct MyPageView: View {
.padding(.top, 48)

Text(viewModel.profile?.phrase ?? "")
.dmsFont(.text(.small), color: .GrayScale.gray7)
.dmsFont(.body(.body3), color: .GrayScale.gray7)
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity)
.padding(.vertical, 14)
Expand All @@ -74,14 +74,14 @@ struct MyPageView: View {

VStack(alignment: .leading, spacing: 0) {
myPageOptionRowCardView(title: "상벌점 내역 확인")
.dmsFont(.text(.medium), color: .GrayScale.gray6)
.dmsFont(.body(.body2), color: .GrayScale.gray6)
.cornerRadius(10, corners: [.topLeft, .topRight])

Divider()
.padding(.horizontal, 10)

myPageOptionRowCardView(title: "비밀번호 변경")
.dmsFont(.text(.medium), color: .GrayScale.gray6)
.dmsFont(.body(.body2), color: .GrayScale.gray6)
.cornerRadius(10, corners: [.bottomLeft, .bottomRight])
}
.background {
Expand All @@ -92,7 +92,7 @@ struct MyPageView: View {

VStack(alignment: .leading, spacing: 0) {
myPageOptionRowCardView(title: "로그아웃", action: viewModel.logoutButtonDidTap)
.dmsFont(.text(.medium), color: .System.error)
.dmsFont(.body(.body2), color: .System.error)
.onTapGesture(perform: viewModel.logoutButtonDidTap)
.cornerRadius(10)
}
Expand All @@ -113,10 +113,10 @@ struct MyPageView: View {
.onAppear(perform: viewModel.onAppear)
.alert("", isPresented: $viewModel.isPresentedLogoutAlert) {
Button("취소", role: .cancel) {}
Button("로그아웃", role: .destructive, action: viewModel.confirmLogoutButtonDidTap)
Button("확인", role: .destructive, action: viewModel.confirmLogoutButtonDidTap)
} message: {
Text("정말 로그아웃 하시겠습니까?")
.dmsFont(.text(.medium), color: .GrayScale.gray6)
.dmsFont(.body(.body2), color: .GrayScale.gray6)
}
.navigate(
to: changeProfileComponent.makeView(),
Expand Down Expand Up @@ -146,7 +146,7 @@ struct MyPageView: View {
VStack {
HStack {
Text(title)
.dmsFont(.text(.small), color: .GrayScale.gray6)
.dmsFont(.body(.body3), color: .GrayScale.gray6)

Spacer()
}
Expand All @@ -156,7 +156,7 @@ struct MyPageView: View {
Spacer()

Text("\(point)")
.dmsFont(.title(.large), color: .GrayScale.gray6)
.dmsFont(.headline(.headline2), color: .GrayScale.gray6)
}
.padding(.bottom, 16)
}
Expand Down
8 changes: 4 additions & 4 deletions Projects/Features/MyPageFeature/Sources/RewardPointDetail/RewardPointDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct RewardPointDetailView: View {
.padding(.top, 16)

Text("\(viewModel.point?.totalPoint ?? 0)" + " 점")
.dmsFont(.title(.large), color: .GrayScale.gray6)
.dmsFont(.headline(.headline2), color: .GrayScale.gray6)
.padding(.top, 44)
.padding(.horizontal, 24)
.padding(.bottom, 44)
Expand Down Expand Up @@ -65,16 +65,16 @@ struct RewardPointDetailView: View {
HStack {
VStack(alignment: .leading, spacing: 8) {
Text(date)
.dmsFont(.text(.extraSmall), color: .System.title)
.dmsFont(.etc(.caption), color: .System.title)

Text(name)
.dmsFont(.text(.medium), color: .System.text)
.dmsFont(.body(.body2), color: .System.text)
}
HStack {
Spacer()

Text(score)
.dmsFont(.text(.medium), color: score.contains("-") ? .System.error : .PrimaryVariant.darken2)
.dmsFont(.body(.body2), color: score.contains("-") ? .System.error : .PrimaryVariant.darken2)
}

Spacer()
Expand Down
28 changes: 14 additions & 14 deletions Projects/Features/NoticeFeature/Sources/Detail/NoticeDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ struct NoticeDetailView: View {

var body: some View {
VStack {
VStack(alignment: .leading, spacing: 24) {
VStack(alignment: .leading, spacing: 0) {
Text(viewModel.title)
.dmsFont(.title(.small), color: .GrayScale.gray7)
.dmsFont(.title(.title1), color: .GrayScale.gray7)
.padding(.top, 40)

Text(viewModel.date.toDMSDateString())
.dmsFont(.etc(.caption), color: .GrayScale.gray5)
.padding(.top, 10)

Divider()
.padding(.top, 20)
}
VStack(alignment: .leading, spacing: 24) {
Text(viewModel.content)
.padding(.top, 24)
.padding(.bottom, 40)

HStack {
Spacer()
.frame(maxWidth: .infinity)
.padding(.top, 40)

Text(viewModel.date.toDMSDateString())
.dmsFont(.text(.extraSmall), color: .GrayScale.gray5)
.frame(alignment: .trailing)
}
}
Text(viewModel.content)
.dmsFont(.body(.body2), color: .GrayScale.gray6)
.padding(.top, 24)
.padding(.bottom, 40)

Spacer()
}
.navigationTitle("공지")
.navigationBarTitleDisplayMode(.inline)
.padding(.horizontal, 24)
.dmsBackground()
}
}
11 changes: 5 additions & 6 deletions Projects/Features/NoticeFeature/Sources/NoticeList/NoticeListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@ struct NoticeListView: View {
NavigationLink(destination: noticeDetailComponent.makeView(id: noticeList.id)) {
noticeListCellView(
title: noticeList.title,
content: noticeList.createdAt.toSmallDMSDateString()
date: noticeList.createdAt
)
.padding(.top, 5)
.listRowInsets(EdgeInsets())
}
}
}
.padding(.horizontal, 24)

}
}
.navigationTitle("공지")
Expand All @@ -54,18 +53,18 @@ struct NoticeListView: View {
}

@ViewBuilder
func noticeListCellView(title: String, content: String) -> some View {
func noticeListCellView(title: String, date: Date) -> some View {
ZStack {
Color.System.surface
.cornerRadius(6)

HStack {
VStack(alignment: .leading) {
Text(title)
.dmsFont(.text(.medium), color: .System.title)
.dmsFont(.body(.body2), color: .System.title)

Text(content)
.dmsFont(.text(.extraSmall), color: .System.text)
Text(date.toSmallDMSDateString())
.dmsFont(.etc(.caption), color: .System.text)
}
Spacer()
}
Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/NoticeFeature/Sources/NoticeList/NoticeOrderButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extension NoticeOrderButtonStyle {
configuration.label
.padding(.vertical, 8.5)
.padding(.horizontal, 16)
.dmsFont(.button(.default))
.dmsFont(.etc(.button))
.background(.clear)
.foregroundColor(color)
.overlay {
Expand Down
6 changes: 3 additions & 3 deletions ...Features/RenewalPasswordFeature/Sources/AuthenticationEmail/AuthenticationEmailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ struct AuthenticationEmailView: View {

var body: some View {
VStack {
AuthHeaderView(subTitle: "이메일 주소 입력")
DMSHeaderTitleView(subTitle: "이메일 주소 입력")
.padding(.top, 24)

VStack(spacing: 40) {
DMSPassCodeView(codeCount: 6, text: $viewModel.authCode)

Text(viewModel.isErrorOcuured ? viewModel.errorMessage : "이메일로 전송된 인증코드 6자리를 입력해주세요.")
.dmsFont(.text(.small), color: viewModel.isErrorOcuured ? .System.error : .GrayScale.gray5)
.dmsFont(.body(.body3), color: viewModel.isErrorOcuured ? .System.error : .GrayScale.gray5)
}
.padding(.top, 56)

Text(viewModel.timeText)
.dmsFont(.text(.small), color: .PrimaryVariant.primary)
.dmsFont(.body(.body3), color: .PrimaryVariant.primary)
.padding(.top, 10)

Spacer()
Expand Down
4 changes: 2 additions & 2 deletions Projects/Features/RenewalPasswordFeature/Sources/ChangePassword/ChangePasswordView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ struct ChangePasswordView: View {

var body: some View {
VStack(spacing: 4) {
AuthHeaderView(subTitle: "비밀번호 설정")
DMSHeaderTitleView(subTitle: "비밀번호 설정")
.padding(.top, 24)

HStack {
Text("비밀번호는 영문, 숫자, 기호를 포함한 8~20자이어야 합니다.")
.dmsFont(.text(.extraSmall), color: .GrayScale.gray5)
.dmsFont(.etc(.caption), color: .GrayScale.gray5)

Spacer()
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/Features/RenewalPasswordFeature/Sources/EnterInformation/Component/BlockEmailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ struct BlockEmailView: View {
HStack {
VStack(alignment: .leading) {
Text("아이디와 일치하는 이메일 입니다")
.dmsFont(.text(.small), color: .GrayScale.gray7)
.dmsFont(.body(.body3), color: .GrayScale.gray7)
.multilineTextAlignment(.leading)

Text(email)
.dmsFont(.text(.small), color: .PrimaryVariant.primary)
.dmsFont(.body(.body3), color: .PrimaryVariant.primary)
.multilineTextAlignment(.leading)
}
Spacer()
Expand Down
2 changes: 1 addition & 1 deletion Projects/Features/RenewalPasswordFeature/Sources/EnterInformation/EnterInformationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct EnterInformationView: View {

var body: some View {
VStack {
AuthHeaderView(subTitle: "계정 본인인증")
DMSHeaderTitleView(subTitle: "계정 본인인증")
.padding(.top, 24)

VStack(spacing: 20) {
Expand Down
Loading