klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디

Browse Source 
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
Yu Sung
2026-01-23 03:09:20 +09:00
parent d92dcbc696
commit 280e424385
238 changed files with 831 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift
View File

@@ -15,15 +15,15 @@ struct OrderListAllInnerView: View {
VStack(spacing: 0) {
HStack(spacing: 0) {
Text("총")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Text(" \(viewModel.totalCount) ")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "dd4500"))
Text("개")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
@@ -66,7 +66,7 @@ struct OrderListAllInnerView: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

14
SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift
View File

@@ -31,14 +31,14 @@ struct OrderListItemView: View {
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 8) {
Text(item.themeStr)
.font(.custom(Font.medium.rawValue, size: 8))
.appFont(size: 8, weight: .medium)
.foregroundColor(Color(hex: "3bac6a"))
.padding(2.6)
.background(Color(hex: "28312b"))
.cornerRadius(2.6)
Text(item.duration!)
.font(.custom(Font.medium.rawValue, size: 8))
.appFont(size: 8, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.padding(2.6)
.background(Color(hex: "222222"))
@@ -46,12 +46,12 @@ struct OrderListItemView: View {
}
Text(item.creatorNickname)
.font(.custom(Font.medium.rawValue, size: 9))
.appFont(size: 9, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.padding(.top, 2.6)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "d2d2d2"))
.fixedSize(horizontal: false, vertical: true)
.padding(.top, 2.6)
@@ -64,7 +64,7 @@ struct OrderListItemView: View {
.frame(width: 13.3, height: 13.3)
Text("\(item.likeCount)")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
@@ -74,7 +74,7 @@ struct OrderListItemView: View {
.frame(width: 13.3, height: 13.3)
Text("\(item.commentCount)")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
}
@@ -83,7 +83,7 @@ struct OrderListItemView: View {
Spacer()
Text(item.orderType == .RENTAL ? "대여중" : "소장중")
.font(.custom(Font.medium.rawValue, size: 10.3))
.appFont(size: 10.3, weight: .medium)
.foregroundColor(item.orderType == .RENTAL ? .white : .black)
.padding(.horizontal, 5.3)
.padding(.vertical, 2.7)

2
SodaLive/Sources/MyPage/OrderList/OrderListView.swift
View File

@@ -20,7 +20,7 @@ struct OrderListView: View {
Spacer()
Text("전체보기")
.font(.custom(Font.medium.rawValue, size: 11))
.appFont(size: 11, weight: .medium)
.foregroundColor(Color.graybb)
.onTapGesture {
AppState.shared.setAppStep(step: .orderListAll)