커스텀 폰트 pretendard-light, gmarket-light를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -24,7 +24,7 @@ struct ContentRankingAllView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -27,7 +27,7 @@ struct ContentDetailPurchaseButton: View {
|
||||
.padding(.leading, 5.3)
|
||||
|
||||
Text(UserDefaults.int(forKey: .userId) == 17958 ? "원으로": "캔으로")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text(title)
|
||||
|
||||
@@ -32,7 +32,7 @@ struct ContentOrderDialogView: View {
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text("(이용기간 5일)")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ struct ContentOrderDialogView: View {
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text("(서비스 종료시까지)")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ struct ContentMainMyStashView: View {
|
||||
Spacer()
|
||||
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.light.rawValue, size: 11.3))
|
||||
.appFont(size: 11.3, weight: .light)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(step: .orderListAll)
|
||||
|
||||
@@ -55,7 +55,7 @@ struct ContentMainCreatorRankingView: View {
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color.graybb)
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -39,7 +39,7 @@ struct ContentMainRankingView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -31,7 +31,7 @@ struct ContentMainTabHomeRankCreatorView: View {
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text("※ 인기 순위는 매주 업데이트됩니다.")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color.graybb)
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -22,7 +22,7 @@ struct SeriesDetailHomeView: View {
|
||||
.foregroundColor(Color.button)
|
||||
|
||||
Text(" (\(contentCount))")
|
||||
.font(.custom(Font.light.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .light)
|
||||
.foregroundColor(Color.button)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -52,7 +52,7 @@ struct ExplorerSectionView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
@@ -59,7 +59,7 @@ struct CreatorCommunityAllItemView: View {
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text(item.relativeTimeText())
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color.gray77)
|
||||
}
|
||||
.padding(.leading, 11)
|
||||
|
||||
@@ -18,7 +18,7 @@ struct CreatorCommunityMoreItemView: View {
|
||||
.frame(width: 40, height: 40)
|
||||
|
||||
Text("더보기")
|
||||
.font(.custom(Font.light.rawValue, size: 11))
|
||||
.appFont(size: 11, weight: .light)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.onTapGesture { onClick() }
|
||||
|
||||
@@ -116,7 +116,7 @@ struct UserProfileFanTalkAllView: View {
|
||||
}
|
||||
} else {
|
||||
Text("응원이 없습니다.\n\n처음으로 응원을 해보세요!")
|
||||
.font(.custom(Font.light.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color.graybb)
|
||||
.multilineTextAlignment(.center)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
||||
@@ -32,7 +32,7 @@ struct UserProfileFanTalkView: View {
|
||||
Spacer()
|
||||
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preLight.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .light)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(step: .userProfileFanTalkAll(userId: userId))
|
||||
@@ -110,7 +110,7 @@ struct UserProfileFanTalkView: View {
|
||||
}
|
||||
} else {
|
||||
Text("응원이 없습니다.\n\n처음으로 응원을 해보세요!")
|
||||
.font(.custom(Font.preLight.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .light)
|
||||
.foregroundColor(Color.graybb)
|
||||
.multilineTextAlignment(.center)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
|
||||
@@ -22,7 +22,7 @@ struct UserProfileSeriesView: View {
|
||||
Spacer()
|
||||
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preLight.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .light)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
AppState.shared
|
||||
|
||||
@@ -31,7 +31,7 @@ struct UserProfileContentView: View {
|
||||
Spacer()
|
||||
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preLight.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .light)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(step: .contentListAll(userId: userId))
|
||||
|
||||
@@ -60,7 +60,7 @@ struct UserProfileDonationAllView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ struct UserProfileDonationAllView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ struct UserProfileDonationAllView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ struct UserProfileDonationView: View {
|
||||
Spacer()
|
||||
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preLight.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .light)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(step: .userProfileDonationAll(userId: userId))
|
||||
|
||||
@@ -36,7 +36,7 @@ struct LiveRoomDonationMessageDialog: View {
|
||||
Spacer()
|
||||
|
||||
Text("닫기")
|
||||
.font(.custom(Font.light.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .light)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.onTapGesture { isShowing = false }
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ struct LiveRoomTopCreatorView: View {
|
||||
Image("ic_crown")
|
||||
|
||||
Text(nickname)
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
if creatorId != UserDefaults.int(forKey: .userId) {
|
||||
|
||||
@@ -417,7 +417,7 @@ struct LiveRoomViewV2: View {
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text(liveRoomInfo.menuPan)
|
||||
.font(.custom(Font.light.rawValue, size: 11.3))
|
||||
.appFont(size: 11.3, weight: .light)
|
||||
.foregroundColor(.white)
|
||||
.lineSpacing(4)
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ struct TextMessageItemView: View {
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(item.textMessage)
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
.multilineTextAlignment(.leading)
|
||||
.lineLimit(2)
|
||||
@@ -48,7 +48,7 @@ struct TextMessageItemView: View {
|
||||
Spacer()
|
||||
|
||||
Text(item.date)
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "525252"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ struct VoiceMessageItemView: View {
|
||||
Spacer()
|
||||
|
||||
Text(item.date)
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "525252"))
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
|
||||
@@ -106,7 +106,7 @@ struct VoiceMessageWriteView: View {
|
||||
}
|
||||
|
||||
Text(secondsToHoursMinutesSeconds(seconds:Int(progress)))
|
||||
.font(.custom(Font.light.rawValue, size: 33.3))
|
||||
.appFont(size: 33.3, weight: .light)
|
||||
.foregroundColor(.white)
|
||||
.padding(.top, 81)
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ struct CanStatusView: View {
|
||||
HStack(spacing: 26.7) {
|
||||
VStack(spacing: 10) {
|
||||
Text("결제 캔")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
|
||||
HStack(alignment: .bottom, spacing: 3.3) {
|
||||
@@ -57,7 +57,7 @@ struct CanStatusView: View {
|
||||
|
||||
VStack(spacing: 10) {
|
||||
Text("리워드 캔")
|
||||
.font(.custom(Font.light.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .light)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
|
||||
HStack(alignment: .bottom, spacing: 3.3) {
|
||||
|
||||
@@ -60,7 +60,7 @@ struct LiveReservationStatusItemView: View {
|
||||
|
||||
if !item.cancelable {
|
||||
Text("예약 취소 불가")
|
||||
.font(.custom(Font.light.rawValue, size: 10.7))
|
||||
.appFont(size: 10.7, weight: .light)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user