mironisegor/Schedule-ICTIS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now fonts are correct

Browse Source
This commit is contained in:
Vladimir Dubovik
2025-01-29 19:04:37 +03:00
parent 4ee81cf2ea
commit 06416138d9
17 changed files with 92 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Schedule ICTIS/Main/Views/Fields/AuditoryFieldView.swift
View File

@ -16,9 +16,9 @@ struct AuditoryFieldView: View {
Image(systemName: "mappin.and.ellipse")
.foregroundColor(Color.gray)
.padding(.leading, 12)
.padding(.trailing, 7)
.padding(.trailing, 14)
TextField(labelForField, text: $text)
.font(.system(size: 18, weight: .regular))
.font(.custom("Montserrat-Regular", size: 18))
.disableAutocorrection(true)
.submitLabel(.done)
.focused($isFocused)

1
Schedule ICTIS/Main/Views/Fields/CommentFieldView.swift
View File

@ -14,6 +14,7 @@ struct CommentFieldView: View {
var body: some View {
HStack {
TextField("Комментарий", text: $textForComment)
.font(.custom("Montserrat-Regular", size: 18))
.submitLabel(.done)
.multilineTextAlignment(.leading)
.focused($isFocused)

2
Schedule ICTIS/Main/Views/Fields/ProfessorFieldView.swift
View File

@ -18,7 +18,7 @@ struct ProfessorFieldView: View {
.padding(.leading, 12)
.padding(.trailing, 7)
TextField(labelForField, text: $text)
.font(.system(size: 18, weight: .regular))
.font(.custom("Montserrat-Regular", size: 18))
.disableAutocorrection(true)
.submitLabel(.done)
.focused($isFocused)

5
Schedule ICTIS/Main/Views/Fields/StartEndTimeFieldView.swift
View File

@ -19,16 +19,17 @@ struct StartEndTimeFieldView: View {
Image(systemName: imageName)
.foregroundColor(isIncorrectDate ? .red : Color("grayForFields"))
.padding(.leading, 12)
.padding(.trailing, 5)
if !isTimeSelected || isIncorrectDate {
Text(text)
.font(.system(size: 17, weight: .regular))
.font(.custom("Montserrat-Regular", size: 17))
.foregroundColor(.gray.opacity(0.5))
}
else {
Text("\(selectedTime, formatter: timeFormatter)")
.foregroundColor(isIncorrectDate ? .red : .black)
.font(.system(size: 17, weight: .medium))
.font(.custom("Montserrat-Medium", size: 17))
.padding(.trailing, 10)
}
Spacer()

8
Schedule ICTIS/Main/Views/Fields/SubjectFieldView.swift
View File

@ -3,7 +3,7 @@
// Schedule ICTIS
//
// Created by G412 on 16.12.2024.
//
// КТбо2-6
import SwiftUI
@ -17,9 +17,9 @@ struct SubjectFieldView: View {
Image(systemName: "book")
.foregroundColor(Color.gray)
.padding(.leading, 12)
.padding(.trailing, 7)
.padding(.trailing, 9)
TextField(labelForField, text: $text)
.font(.system(size: 18, weight: .regular))
.font(.custom("Montserrat-Regular", size: 18))
.disableAutocorrection(true)
.submitLabel(.done)
.focused($isFocused)
@ -33,7 +33,7 @@ struct SubjectFieldView: View {
Group {
if isShowingSubjectFieldRed {
Text("Поле должно быть заполнено!")
.font(.system(size: 18, weight: .regular))
.font(.custom("Montserrat-Regular", size: 18))
.foregroundColor(.red)
.frame(width: 290)
.padding(.leading, -42)