커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -19,14 +19,14 @@ struct RouletteSettingsOptionView: View {
|
||||
VStack(spacing: 6.7) {
|
||||
HStack(spacing: 0) {
|
||||
Text("옵션 \(index + 1)")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
|
||||
if index > 1 {
|
||||
Text("삭제")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "ff5c49"))
|
||||
.onTapGesture { onClickDelete() }
|
||||
}
|
||||
@@ -36,7 +36,7 @@ struct RouletteSettingsOptionView: View {
|
||||
TextField("옵션을 입력하세요", text: $option.title)
|
||||
.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)
|
||||
@@ -49,7 +49,7 @@ struct RouletteSettingsOptionView: View {
|
||||
TextField("0.00", text: $option.percentage)
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.keyboardType(.decimalPad)
|
||||
.onChange(of: option.percentage) { newValue in
|
||||
@@ -61,7 +61,7 @@ struct RouletteSettingsOptionView: View {
|
||||
}
|
||||
|
||||
Text("%")
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
.padding(.horizontal, 13.3)
|
||||
|
||||
@@ -97,7 +97,7 @@ struct RouletteSettingsView: View {
|
||||
))
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
.keyboardType(.numberPad)
|
||||
.padding(.horizontal, 13.3)
|
||||
@@ -122,7 +122,7 @@ struct RouletteSettingsView: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("※ 룰렛 옵션은 최소 2개,\n최대 10개까지 설정할 수 있습니다.")
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color.mainRed)
|
||||
|
||||
Spacer()
|
||||
@@ -135,13 +135,13 @@ struct RouletteSettingsView: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("옵션 확률 합계")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("( \(String(format: "%.2f", viewModel.totalPercentage))% )")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
.padding(.top, 21.3)
|
||||
@@ -224,7 +224,7 @@ struct RouletteSettingsView: View {
|
||||
Text(viewModel.errorMessage)
|
||||
.padding(.vertical, 13.3)
|
||||
.frame(width: geo.size.width - 66.7, alignment: .center)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.background(Color.button)
|
||||
.foregroundColor(Color.white)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
@@ -101,7 +101,7 @@ struct RoulettePreviewDialog: View {
|
||||
.foregroundColor(Color(hex: "e2e2e2"))
|
||||
|
||||
Text("\(previewList[selectedRoulette.rawValue].items[index].title) (\(previewList[selectedRoulette.rawValue].items[index].percent))")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "e2e2e2"))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user