커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -14,7 +14,7 @@ struct MessageFilterTabView: View {
|
||||
var body: some View {
|
||||
HStack(spacing: 6.7) {
|
||||
Text("받은 메시지")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: currentFilterTab == .receive ? "3bb9f1" : "777777"))
|
||||
.padding(.horizontal, 25)
|
||||
.padding(.vertical, 10.7)
|
||||
@@ -32,7 +32,7 @@ struct MessageFilterTabView: View {
|
||||
}
|
||||
|
||||
Text("보낸 메시지")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: currentFilterTab == .sent ? "3bb9f1" : "777777"))
|
||||
.padding(.horizontal, 25)
|
||||
.padding(.vertical, 10.7)
|
||||
@@ -50,7 +50,7 @@ struct MessageFilterTabView: View {
|
||||
}
|
||||
|
||||
Text("보관함")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: currentFilterTab == .keep ? "3bb9f1" : "777777"))
|
||||
.padding(.horizontal, 25)
|
||||
.padding(.vertical, 10.7)
|
||||
|
||||
@@ -22,7 +22,7 @@ struct MessageView: View {
|
||||
Tab()
|
||||
|
||||
Text("※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다.")
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.padding(.top, 20)
|
||||
|
||||
switch viewModel.currentTab {
|
||||
@@ -51,7 +51,7 @@ struct MessageView: View {
|
||||
}) {
|
||||
VStack(spacing: 0) {
|
||||
Text("문자")
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: viewModel.currentTab == .text ? "eeeeee" : "777777"))
|
||||
.frame(width: tabWidth, height: 50)
|
||||
|
||||
@@ -70,7 +70,7 @@ struct MessageView: View {
|
||||
}) {
|
||||
VStack(spacing: 0) {
|
||||
Text("음성")
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: viewModel.currentTab == .voice ? "eeeeee" : "777777"))
|
||||
.frame(width: tabWidth, height: 50)
|
||||
|
||||
|
||||
@@ -72,13 +72,13 @@ struct TextMessageDetailView: View {
|
||||
from: "yyyy-MM-dd hh:mm:ss",
|
||||
to: "yyyy년 MM월 dd일 E요일 HH:mm"
|
||||
))
|
||||
.font(.custom(Font.medium.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
.padding(.top, 16.7)
|
||||
|
||||
ScrollView(.vertical, showsIndicators: false) {
|
||||
Text(messageItem.textMessage)
|
||||
.font(.custom(Font.medium.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.multilineTextAlignment(.leading)
|
||||
.padding(26.7)
|
||||
@@ -165,7 +165,7 @@ struct TextMessageDetailView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.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)
|
||||
|
||||
@@ -25,7 +25,7 @@ struct SelectRecipientView: View {
|
||||
TextField("닉네임을 입력해주세요", text: $viewModel.searchNickname)
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.keyboardType(.default)
|
||||
.padding(.horizontal, 13.3)
|
||||
@@ -52,7 +52,7 @@ struct SelectRecipientView: View {
|
||||
.cornerRadius(23.3)
|
||||
|
||||
Text(user.nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -35,7 +35,7 @@ struct TextMessageItemView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 4.7) {
|
||||
Text(nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(item.textMessage)
|
||||
|
||||
@@ -70,7 +70,7 @@ struct TextMessageView: View {
|
||||
|
||||
Text("메시지가 없습니다.\n친구들과 소통해보세요!")
|
||||
.multilineTextAlignment(.center)
|
||||
.font(.custom(Font.medium.rawValue, size: 10.7))
|
||||
.appFont(size: 10.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.frame(width: screenSize().width - 26.7, height: screenSize().height / 2)
|
||||
|
||||
@@ -22,7 +22,7 @@ struct TextMessageWriteView: View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "3bb9f1").opacity(0))
|
||||
|
||||
Spacer()
|
||||
@@ -34,7 +34,7 @@ struct TextMessageWriteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("취소")
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "3bb9f1"))
|
||||
.onTapGesture {
|
||||
AppState.shared.back()
|
||||
@@ -52,11 +52,11 @@ struct TextMessageWriteView: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("받는 사람")
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
|
||||
Text(viewModel.recipientNickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
@@ -124,7 +124,7 @@ struct TextMessageWriteView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.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)
|
||||
|
||||
@@ -47,7 +47,7 @@ struct VoiceMessageItemView: View {
|
||||
.cornerRadius(23.4)
|
||||
|
||||
Text(nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.leading, 13.3)
|
||||
|
||||
@@ -70,13 +70,13 @@ struct VoiceMessageItemView: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("00:00")
|
||||
.font(.custom(Font.medium.rawValue, size: 10.7))
|
||||
.appFont(size: 10.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("\(secondsToMinutesSeconds(seconds: Int(soundManager.duration)))")
|
||||
.font(.custom(Font.medium.rawValue, size: 10.7))
|
||||
.appFont(size: 10.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.padding(.horizontal, 13.3)
|
||||
|
||||
@@ -78,7 +78,7 @@ struct VoiceMessageView: View {
|
||||
|
||||
Text("메시지가 없습니다.\n친구들과 소통해보세요!")
|
||||
.multilineTextAlignment(.center)
|
||||
.font(.custom(Font.medium.rawValue, size: 10.7))
|
||||
.appFont(size: 10.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
}
|
||||
.frame(width: screenSize().width - 26.7, height: screenSize().height / 2)
|
||||
@@ -120,13 +120,13 @@ struct VoiceMessageView: View {
|
||||
.padding(.top, 40)
|
||||
|
||||
Text("메시지를 보관하는데\n\(viewModel.saveMessagePrice)캔이 필요합니다.\n메시지를 보관하시겠습니까?")
|
||||
.font(.custom(Font.medium.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
.padding(.top, 13.3)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
Text("※ 메시지 보관시, 본인이 삭제하기 전까지 영구보관됩니다.")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
.padding(.top, 13.3)
|
||||
.padding(.horizontal, 13.3)
|
||||
@@ -184,7 +184,7 @@ struct VoiceMessageView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.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)
|
||||
|
||||
@@ -58,7 +58,7 @@ struct VoiceMessageWriteView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 10) {
|
||||
Text("TO.")
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(
|
||||
@@ -137,7 +137,7 @@ struct VoiceMessageWriteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("삭제")
|
||||
.font(.custom(Font.medium.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb").opacity(0))
|
||||
|
||||
Spacer()
|
||||
@@ -159,7 +159,7 @@ struct VoiceMessageWriteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("삭제")
|
||||
.font(.custom(Font.medium.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
.onTapGesture {
|
||||
soundManager.stopAudio()
|
||||
@@ -244,7 +244,7 @@ struct VoiceMessageWriteView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.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)
|
||||
@@ -263,7 +263,7 @@ struct VoiceMessageWriteView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.padding(.horizontal, 6.7)
|
||||
.frame(width: geo.size.width - 66.7, alignment: .center)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.background(Color(hex: "9970ff"))
|
||||
.foregroundColor(Color.white)
|
||||
.multilineTextAlignment(.leading)
|
||||
|
||||
Reference in New Issue
Block a user