diff --git a/SodaLive/Resources/Debug/SodaLive-dev-Info.plist b/SodaLive/Resources/Debug/SodaLive-dev-Info.plist index b5e0670..bd21034 100644 --- a/SodaLive/Resources/Debug/SodaLive-dev-Info.plist +++ b/SodaLive/Resources/Debug/SodaLive-dev-Info.plist @@ -247,9 +247,6 @@ UIAppFonts - gmarket_sans_bold.otf - gmarket_sans_medium.otf - gmarket_sans_light.otf Pretendard-Bold.otf Pretendard-Medium.otf Pretendard-Light.otf diff --git a/SodaLive/Resources/Font/gmarket_sans_bold.otf b/SodaLive/Resources/Font/gmarket_sans_bold.otf deleted file mode 100644 index 9335b26..0000000 Binary files a/SodaLive/Resources/Font/gmarket_sans_bold.otf and /dev/null differ diff --git a/SodaLive/Resources/Font/gmarket_sans_light.otf b/SodaLive/Resources/Font/gmarket_sans_light.otf deleted file mode 100644 index c588d3e..0000000 Binary files a/SodaLive/Resources/Font/gmarket_sans_light.otf and /dev/null differ diff --git a/SodaLive/Resources/Font/gmarket_sans_medium.otf b/SodaLive/Resources/Font/gmarket_sans_medium.otf deleted file mode 100644 index af2cfc3..0000000 Binary files a/SodaLive/Resources/Font/gmarket_sans_medium.otf and /dev/null differ diff --git a/SodaLive/Resources/Info.plist b/SodaLive/Resources/Info.plist index 312c833..60104c3 100644 --- a/SodaLive/Resources/Info.plist +++ b/SodaLive/Resources/Info.plist @@ -247,9 +247,6 @@ UIAppFonts - gmarket_sans_bold.otf - gmarket_sans_medium.otf - gmarket_sans_light.otf Pretendard-Bold.otf Pretendard-Medium.otf Pretendard-Light.otf diff --git a/SodaLive/Sources/Common/TextViewWrapper.swift b/SodaLive/Sources/Common/TextViewWrapper.swift index 30a18f8..3221534 100644 --- a/SodaLive/Sources/Common/TextViewWrapper.swift +++ b/SodaLive/Sources/Common/TextViewWrapper.swift @@ -28,7 +28,7 @@ struct TextViewWrapper: UIViewRepresentable { view.textColor = text.trimmingCharacters(in: .whitespacesAndNewlines) != "" ? UIColor(hex: textColorHex) : .placeholderText } - view.font = UIFont(name: Font.medium.rawValue, size: 13.3) + view.font = UIFont(name: Font.preMedium.rawValue, size: 13.3) view.backgroundColor = backgroundColorHex.isEmpty ? .clear : UIColor(hex: backgroundColorHex) view.layer.cornerRadius = 6.7 view.textContainerInset = UIEdgeInsets(top: 20, left: 13.3, bottom: 20, right: 13.3) diff --git a/SodaLive/Sources/CustomView/ChatTextFieldView.swift b/SodaLive/Sources/CustomView/ChatTextFieldView.swift index 3f78ecf..6f5b62a 100644 --- a/SodaLive/Sources/CustomView/ChatTextFieldView.swift +++ b/SodaLive/Sources/CustomView/ChatTextFieldView.swift @@ -42,7 +42,7 @@ struct ChatTextFieldView: UIViewRepresentable { textField.backgroundColor = UIColor(hex: "222222") textField.textColor = UIColor(hex: "BBBBBB") textField.tintColor = UIColor(hex: "3BB9F1") - textField.font = UIFont(name: Font.medium.rawValue, size: 13.3) + textField.font = UIFont(name: Font.preMedium.rawValue, size: 13.3) textField.returnKeyType = .send textField.setContentHuggingPriority(.defaultLow, for: .horizontal) // 우선순위 낮추기 textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) // 우선순위 낮추기 diff --git a/SodaLive/Sources/CustomView/FocusedTextField.swift b/SodaLive/Sources/CustomView/FocusedTextField.swift index 01d205b..8c8f2ac 100644 --- a/SodaLive/Sources/CustomView/FocusedTextField.swift +++ b/SodaLive/Sources/CustomView/FocusedTextField.swift @@ -30,7 +30,7 @@ struct FocusedTextField: UIViewRepresentable { func makeUIView(context: Context) -> UITextField { let textField = UITextField() textField.delegate = context.coordinator - textField.font = UIFont(name: Font.medium.rawValue, size: 13.3) + textField.font = UIFont(name: Font.preMedium.rawValue, size: 13.3) textField.textColor = UIColor(hex: "eeeeee", alpha: 1.0) textField.tintColor = UIColor(hex: "3bb9f1", alpha: 1.0) textField.keyboardType = .default diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift index 6a9d534..89744f5 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift @@ -73,7 +73,7 @@ struct CreatorCommunityAllItemView: View { } } - DetectableTextView(text: item.content, textSize: 13.3, font: Font.medium.rawValue) + DetectableTextView(text: item.content, textSize: 13.3, font: Font.preMedium.rawValue) .frame( width: screenSize().width - 42, height: textHeight diff --git a/SodaLive/Sources/Font/Font.swift b/SodaLive/Sources/Font/Font.swift index d32d0d1..89d4fce 100644 --- a/SodaLive/Sources/Font/Font.swift +++ b/SodaLive/Sources/Font/Font.swift @@ -5,13 +5,7 @@ // Created by klaus on 2023/08/09. // -enum Font: String { - case bold = "GmarketSansBold" - - case medium = "GmarketSansMedium" - - case light = "GmarketSansLight" - +enum Font: String { case preBold = "Pretendard-Bold" case preMedium = "Pretendard-Medium" diff --git a/SodaLive/Sources/Live/Room/V2/Component/Text/TextView.swift b/SodaLive/Sources/Live/Room/V2/Component/Text/TextView.swift index 02f48c6..ab43908 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/Text/TextView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/Text/TextView.swift @@ -11,7 +11,7 @@ import UIKit struct DetectableTextView: UIViewRepresentable { var text: String var textSize: CGFloat = 11.3 - var font: String = Font.light.rawValue + var font: String = Font.preLight.rawValue func makeUIView(context: Context) -> UITextView { let textView = UITextView()