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

Done with createClassView

Browse Source
This commit is contained in:
Vladimir Dubovik
2025-01-28 12:54:52 +03:00
parent 4a295b9b88
commit 4ee81cf2ea
35 changed files with 141 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,11 @@ import SwiftUI
struct AuditoryFieldView: View {
@Binding var text: String
var nameOfImage: String
var labelForField: String
@FocusState var isFocused: Bool
var body: some View {
HStack(spacing: 0) {
Image(systemName: nameOfImage)
Image(systemName: "mappin.and.ellipse")
.foregroundColor(Color.gray)
.padding(.leading, 12)
.padding(.trailing, 7)
@ -44,5 +43,5 @@ struct AuditoryFieldView: View {
}
#Preview {
ContentView()
AuditoryFieldView(text: .constant(""), labelForField: "Корпус-аудитория")
}

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

@ -9,12 +9,11 @@ import SwiftUI
struct ProfessorFieldView: View {
@Binding var text: String
var nameOfImage: String
var labelForField: String
@FocusState var isFocused: Bool
var body: some View {
HStack(spacing: 0) {
Image(systemName: nameOfImage)
Image(systemName: "graduationcap")
.foregroundColor(Color.gray)
.padding(.leading, 12)
.padding(.trailing, 7)
@ -44,5 +43,5 @@ struct ProfessorFieldView: View {
}
#Preview {
ContentView()
ProfessorFieldView(text: .constant(""), labelForField: "Преподаватель")
}

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

@ -10,12 +10,11 @@ import SwiftUI
struct SubjectFieldView: View {
@Binding var text: String
@Binding var isShowingSubjectFieldRed: Bool
var nameOfImage: String
@Binding var labelForField: String
@FocusState var isFocused: Bool
var body: some View {
HStack(spacing: 0) {
Image(systemName: nameOfImage)
Image(systemName: "book")
.foregroundColor(Color.gray)
.padding(.leading, 12)
.padding(.trailing, 7)
@ -62,5 +61,5 @@ struct SubjectFieldView: View {
}
#Preview {
ContentView()
SubjectFieldView(text: .constant(""), isShowingSubjectFieldRed: .constant(false), labelForField: .constant("Предмет"))
}

6
Schedule ICTIS/Main/Views/MainView.swift
View File

@ -11,10 +11,11 @@ struct MainView: View {
@State private var searchText: String = ""
@State private var isShowingMonthSlider: Bool = false
@ObservedObject var vm: ScheduleViewModel
@FocusState private var isFocusedSearchBar: Bool
var body: some View {
VStack {
SearchBarView(text: $searchText, vm: vm)
SearchBarView(text: $searchText, isFocused: _isFocusedSearchBar, vm: vm)
if (vm.isFirstStartOffApp && vm.isLoading) {
LoadingView(isLoading: $vm.isLoading)
@ -33,6 +34,9 @@ struct MainView: View {
Text(error.failureReason)
}
.background(Color("background"))
.onTapGesture {
isFocusedSearchBar = false
}
}
@ViewBuilder

2
Schedule ICTIS/Main/Views/SearchBarView.swift
View File

@ -9,7 +9,7 @@ import SwiftUI
struct SearchBarView: View {
@Binding var text: String
@FocusState private var isFocused: Bool
@FocusState var isFocused: Bool
@State private var isShowingSheet: Bool = false
@ObservedObject var vm: ScheduleViewModel

36
Schedule ICTIS/Main/Views/Sheets/CreateEditClassView.swift
View File

@ -27,7 +27,7 @@ struct CreateEditClassView: View {
NavigationView {
ScrollView(.vertical, showsIndicators: false) {
VStack {
SubjectFieldView(text: $vm._class.subject, isShowingSubjectFieldRed: $isShowingSubjectFieldRed, nameOfImage: "book", labelForField: $textForLabelInSubjectField, isFocused: _isFocusedSubject)
SubjectFieldView(text: $vm._class.subject, isShowingSubjectFieldRed: $isShowingSubjectFieldRed, labelForField: $textForLabelInSubjectField, isFocused: _isFocusedSubject)
.padding(.bottom, 10)
HStack {
Text("Тип")
@ -50,7 +50,7 @@ struct CreateEditClassView: View {
ZStack {
if vm._class.online == "Оффлайн" {
AuditoryFieldView(text: $vm._class.auditory, nameOfImage: "mappin.and.ellipse", labelForField: "Корпус-аудитория", isFocused: _isFocusedAuditory)
AuditoryFieldView(text: $vm._class.auditory, labelForField: "Корпус-аудитория", isFocused: _isFocusedAuditory)
.padding(.bottom, 10)
.transition(.asymmetric(
insertion: .offset(y: -50).combined(with: .identity),
@ -65,7 +65,7 @@ struct CreateEditClassView: View {
value: vm._class.online
)
ProfessorFieldView(text: $vm._class.professor, nameOfImage: "book", labelForField: "Преподаватель", isFocused: _isFocusedProfessor)
ProfessorFieldView(text: $vm._class.professor, labelForField: "Преподаватель", isFocused: _isFocusedProfessor)
.padding(.bottom, 10)
HStack {
@ -108,14 +108,6 @@ struct CreateEditClassView: View {
self.isIncorrectDate2 = false
}
}
// .overlay {
// if isIncorrectDate1 {
// Rectangle()
// .frame(maxWidth: 300, maxHeight: 1)
// .foregroundColor(.red)
// .padding(.horizontal)
// }
// }
Spacer()
StartEndTimeFieldView(isIncorrectDate: $isIncorrectDate2, selectedDay: $vm._class.day, selectedTime: $vm._class.endtime, imageName: "clock.badge.xmark", text: "Конец", isTimeSelected: $isSelectedTime2)
.onChange(of: vm._class.endtime) { oldValue, newValue in
@ -131,14 +123,6 @@ struct CreateEditClassView: View {
self.isIncorrectDate2 = false
}
}
// .overlay {
// if isIncorrectDate2 {
// Rectangle()
// .frame(maxWidth: 300, maxHeight: 1)
// .foregroundColor(.red)
// .padding(.horizontal)
// }
// }
}
.frame(height: 40)
.padding(.bottom, 10)
@ -238,8 +222,20 @@ struct CreateEditClassView: View {
.navigationTitle(vm.isNew ? "Новая пара" : "Изменить данные")
.background(Color("background"))
.onAppear {
if day >= Calendar.current.startOfDay(for: Date()) {
let temp = Calendar.current.date(byAdding: .hour, value: 1, to: Date.init())
if let endTime = temp {
if (!hoursMinutesAreEqual(date1: vm._class.starttime, isEqualTo: Date()) && !hoursMinutesAreEqual(date1: vm._class.endtime, isEqualTo: endTime)) {
self.isSelectedTime1 = true
self.isSelectedTime2 = true
print(vm._class.starttime)
print(vm._class.endtime)
print(endTime)
print(Date())
}
}
if day > Calendar.current.startOfDay(for: Date()) {
vm._class.day = day
print(34)
}
}
.onTapGesture {

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

@ -2,7 +2,7 @@
// WeekTabView.swift
// Schedule ICTIS
//
// Created by G412 on 10.12.2024.
// Created by Mironov Egor on 10.12.2024.
//
import SwiftUI

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

@ -2,7 +2,7 @@
// WeekViewForMonth.swift
// Schedule ICTIS
//
// Created by G412 on 20.12.2024.
// Created by Mironov Egor on 20.12.2024.
//
import SwiftUI

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

@ -2,7 +2,7 @@
// WeekView.swift
// Schedule ICTIS
//
// Created by G412 on 20.12.2024.
// Created by Mironov Egor on 20.12.2024.
//
import SwiftUI