커스텀 폰트 pretendard-regular, gmarket-regular를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -7,29 +7,36 @@
|
||||
|
||||
import SwiftUI
|
||||
|
||||
private func resolvedLanguageCode(currentLocale: Locale) -> String? {
|
||||
if let raw = UserDefaults.standard.string(forKey: "app.language"),
|
||||
let option = LanguageOption(rawValue: raw),
|
||||
option != .system {
|
||||
return option.rawValue
|
||||
}
|
||||
return currentLocale.language.languageCode?.identifier
|
||||
}
|
||||
|
||||
private func appFontName(for weight: SwiftUI.Font.Weight) -> String {
|
||||
switch weight {
|
||||
case .bold:
|
||||
return "Pretendard-Bold"
|
||||
case .medium:
|
||||
return "Pretendard-Medium"
|
||||
case .light:
|
||||
return "Pretendard-Light"
|
||||
default:
|
||||
return "Pretendard-Regular"
|
||||
}
|
||||
}
|
||||
|
||||
struct KoreanFontModifier: ViewModifier {
|
||||
@Environment(\.locale) private var locale
|
||||
let size: CGFloat
|
||||
let weight: SwiftUI.Font.Weight
|
||||
|
||||
private func resolvedLanguageCode() -> String? {
|
||||
if let raw = UserDefaults.standard.string(forKey: "app.language"),
|
||||
let option = LanguageOption(rawValue: raw),
|
||||
option != .system {
|
||||
return option.rawValue
|
||||
}
|
||||
return locale.language.languageCode?.identifier
|
||||
}
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
if resolvedLanguageCode() == "ko" {
|
||||
let name: String = switch weight {
|
||||
case .bold: "Pretendard-Bold"
|
||||
case .medium: "Pretendard-Medium"
|
||||
case .light: "Pretendard-Light"
|
||||
default: "Pretendard-Regular"
|
||||
}
|
||||
content.font(.custom(name, size: size))
|
||||
if resolvedLanguageCode(currentLocale: locale) == "ko" {
|
||||
content.font(.custom(appFontName(for: weight), size: size))
|
||||
} else {
|
||||
content.font(.system(size: size, weight: weight))
|
||||
}
|
||||
@@ -41,3 +48,12 @@ extension View {
|
||||
self.modifier(KoreanFontModifier(size: size, weight: weight))
|
||||
}
|
||||
}
|
||||
|
||||
extension Text {
|
||||
func appFont(size: CGFloat, weight: SwiftUI.Font.Weight = .regular) -> Text {
|
||||
if resolvedLanguageCode(currentLocale: .autoupdatingCurrent) == "ko" {
|
||||
return self.font(.custom(appFontName(for: weight), size: size))
|
||||
}
|
||||
return self.font(.system(size: size, weight: weight))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user