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

3
Schedule ICTIS/Main/Views/TabViews/MonthTabView.swift
View File

@ -18,7 +18,7 @@ struct MonthTabView: View {
HStack (spacing: 34) {
ForEach(MockData.daysOfWeek.indices, id: \.self) { index in
Text(MockData.daysOfWeek[index])
.font(.system(size: 15, weight: .semibold))
.font(.custom("Montserrat-SemiBold", size: 15))
.foregroundColor(MockData.daysOfWeek[index] == "Вс" ? Color(.red) : Color("customGray2"))
.padding(.top, 13)
.foregroundColor(.gray)
@ -50,7 +50,6 @@ struct MonthTabView: View {
monthSlider.removeAll()
currentMonthIndex = 1
updateMonthScreenViewForNewGroup()
print(52)
vm.isNewGroup = false
}
}

1
Schedule ICTIS/Main/Views/TabViews/WeekTabView.swift
View File

@ -39,7 +39,6 @@ struct WeekTabView: View {
weekSlider.removeAll()
currentWeekIndex = 1
updateWeekScreenViewForNewGroup()
print(52)
vm.isNewGroup = false
}
}

2
Schedule ICTIS/Main/Views/TabViews/WeekViewForMonth.swift
View File

@ -16,7 +16,7 @@ struct WeekViewForMonth: View {
ForEach(week) { day in
VStack {
Text(day.date.format("dd"))
.font(.system(size: 15, weight: .bold))
.font(.custom("Montserrat-Medium", size: 15))
.foregroundStyle(getForegroundColor(day: day))
}
.frame(width: 30, height: 30, alignment: .center)

4
Schedule ICTIS/Main/Views/TabViews/WeekViewForWeek.swift
View File

@ -18,12 +18,12 @@ struct WeekViewForWeek: View {
ForEach(week) { day in
VStack (spacing: 1) {
Text(day.date.format("E"))
.font(.system(size: 15, weight: .semibold))
.font(.custom("Montserrat-Medium", size: 16))
.foregroundColor(day.date.format("E") == "Вс" ? Color(.red) : isSameDate(day.date, vm.selectedDay) ? Color("customGray1") : Color("customGray3"))
.padding(.top, 13)
.foregroundColor(.gray)
Text(day.date.format("dd"))
.font(.system(size: 15, weight: .bold))
.font(.custom("Montserrat-Medium", size: 15))
.foregroundStyle(isSameDate(day.date, vm.selectedDay) ? .white : .black)
.padding(.bottom, 13)
}