From 55d35222a93a0d32082e0e608240879cb6cff077 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Tue, 26 Dec 2023 22:22:06 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=B1=84?= =?UTF-8?q?=ED=8C=85=20=ED=8F=B0=ED=8A=B8=20AS-IS=20:=20Gmarket=20Sans=20T?= =?UTF-8?q?O-BE=20:=20System=20Font?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Live/Room/Chat/LiveRoomChatItemView.swift | 6 +++--- .../Live/Room/Chat/LiveRoomDonationChatItemView.swift | 10 +++++----- .../Live/Room/Chat/LiveRoomJoinChatItemView.swift | 6 +++--- .../Chat/LiveRoomRouletteDonationChatItemView.swift | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/SodaLive/Sources/Live/Room/Chat/LiveRoomChatItemView.swift b/SodaLive/Sources/Live/Room/Chat/LiveRoomChatItemView.swift index 90d89fb..35f63a7 100644 --- a/SodaLive/Sources/Live/Room/Chat/LiveRoomChatItemView.swift +++ b/SodaLive/Sources/Live/Room/Chat/LiveRoomChatItemView.swift @@ -95,7 +95,7 @@ struct LiveRoomChatItemView: View { HStack(spacing: 5) { if chatMessage.rank == -3 { Text("스탭") - .font(.custom(Font.medium.rawValue, size: 10)) + .font(.system(size: 10)) .foregroundColor(.white) .padding(2) .background(Color(hex: "4999e3")) @@ -103,12 +103,12 @@ struct LiveRoomChatItemView: View { } Text(chatMessage.nickname) - .font(.custom(Font.light.rawValue, size: 12)) + .font(.system(size: 12, weight: .light)) .foregroundColor(.white) } Text(chatMessage.chat) - .font(.custom(Font.medium.rawValue, size: 14)) + .font(.system(size: 14)) .foregroundColor(.white) .multilineTextAlignment(.leading) .lineLimit(nil) diff --git a/SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift b/SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift index dd09f14..e6afa46 100644 --- a/SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift +++ b/SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift @@ -30,27 +30,27 @@ struct LiveRoomDonationChatItemView: View { VStack(alignment: .leading, spacing: 6.7) { HStack(spacing: 0) { Text(chatMessage.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .font(.system(size: 12)) .foregroundColor(.white) Text("님이") - .font(.custom(Font.light.rawValue, size: 12)) + .font(.system(size: 12, weight: .light)) .foregroundColor(.white) } HStack(spacing: 0) { Text("\(chatMessage.can)캔") - .font(.custom(Font.medium.rawValue, size: 13)) + .font(.system(size: 13)) .foregroundColor(Color(hex: "fdca2f")) Text("을 후원하셨습니다.") - .font(.custom(Font.medium.rawValue, size: 13)) + .font(.system(size: 13)) .foregroundColor(.white) } if !chatMessage.donationMessage.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { Text("\"\(chatMessage.donationMessage)\"") - .font(.custom(Font.medium.rawValue, size: 13)) + .font(.system(size: 13)) .foregroundColor(.white) } } diff --git a/SodaLive/Sources/Live/Room/Chat/LiveRoomJoinChatItemView.swift b/SodaLive/Sources/Live/Room/Chat/LiveRoomJoinChatItemView.swift index 8d40107..4301635 100644 --- a/SodaLive/Sources/Live/Room/Chat/LiveRoomJoinChatItemView.swift +++ b/SodaLive/Sources/Live/Room/Chat/LiveRoomJoinChatItemView.swift @@ -14,15 +14,15 @@ struct LiveRoomJoinChatItemView: View { var body: some View { HStack(spacing: 0) { Text("'") - .font(.custom(Font.medium.rawValue, size: 12)) + .font(.system(size: 12)) .foregroundColor(Color(hex: "eeeeee")) Text(chatMessage.nickname) - .font(.custom(Font.bold.rawValue, size: 12)) + .font(.system(size: 12, weight: .bold)) .foregroundColor(Color(hex: "ffdc00")) Text("'님이 입장하셨습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .font(.system(size: 12)) .foregroundColor(Color(hex: "eeeeee")) } .padding(.vertical, 6.7) diff --git a/SodaLive/Sources/Live/Room/Chat/LiveRoomRouletteDonationChatItemView.swift b/SodaLive/Sources/Live/Room/Chat/LiveRoomRouletteDonationChatItemView.swift index b8fe509..69bc817 100644 --- a/SodaLive/Sources/Live/Room/Chat/LiveRoomRouletteDonationChatItemView.swift +++ b/SodaLive/Sources/Live/Room/Chat/LiveRoomRouletteDonationChatItemView.swift @@ -30,21 +30,21 @@ struct LiveRoomRouletteDonationChatItemView: View { VStack(alignment: .leading, spacing: 6.7) { HStack(spacing: 0) { Text(chatMessage.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .font(.system(size: 12)) .foregroundColor(.white) Text("님의 룰렛 결과?") - .font(.custom(Font.light.rawValue, size: 12)) + .font(.system(size: 12, weight: .light)) .foregroundColor(.white) } HStack(spacing: 0) { Text("[\(chatMessage.rouletteResult)]") - .font(.custom(Font.medium.rawValue, size: 13)) + .font(.system(size: 13)) .foregroundColor(Color(hex: "ffe500")) Text(" 당첨!") - .font(.custom(Font.medium.rawValue, size: 13)) + .font(.system(size: 13)) .foregroundColor(.white) } }