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

fff

Browse Source
This commit is contained in:
Vladimir Dubovik
2025-06-23 13:11:35 +03:00
parent c1cdb5d0db
commit 8d8860ff22
6 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Schedule-ICTIS.xcodeproj/project.xcworkspace/xcuserdata/g412.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

7
Schedule-ICTIS/Main/Views/SearchBarView.swift
View File

@ -37,11 +37,10 @@ struct SearchBarView: View {
return
}
vm.removeFromSchedule(group: vm.searchingGroup)
text = transformStringToFormat(text)
vm.searchingGroup = text
vm.nameToHtml[text] = ""
vm.searchingGroup = vm.nameOfGroupForSingle
vm.nameToHtml[vm.nameOfGroupForSingle] = ""
print("Ключи: \(vm.nameToHtml.keys)")
vm.addGroupToFilteringArray(group: text)
vm.addGroupToFilteringArray(group: vm.searchingGroup)
vm.fetchWeekSchedule()
self.text = ""
}

32
Schedule-ICTIS/Settings/GeneralGroupSettings.swift
View File

@ -48,38 +48,6 @@ struct GeneralGroupSettings: View {
.foregroundColor(Color("customGray1"))
.frame(height: 1)
.padding(.horizontal)
HStack {
Text("Язык")
.font(.custom("Montserrat-Medium", fixedSize: 17))
.foregroundColor(.black)
Spacer()
HStack {
Text(selectedLanguage)
.font(.custom("Montserrat-Medium", fixedSize: 17))
.foregroundColor(Color("customGray3"))
Image("upDownArrows")
.resizable()
.scaledToFit()
.frame(width: 15, height: 15)
}
.padding(.horizontal)
}
.padding(.horizontal)
.padding(.top, 7)
.padding(.bottom, 17)
.overlay {
HStack {
Spacer()
Picker("", selection: $selectedLanguage, content: {
ForEach(MockData.languages, id: \.self) {
Text($0)
}
})
.padding(.trailing, 35)
.blendMode(.destinationOver)
}
.frame(width: UIScreen.main.bounds.width)
}
}
.background(Color.white)
.cornerRadius(20)

2
Schedule-ICTIS/Settings/ScheduleGroupSettings.swift
View File

@ -30,7 +30,7 @@ struct ScheduleGroupSettings: View {
.padding(.horizontal)
NavigationLink(destination: FavVPKView(vm: vm, networkMonitor: networkMonitor)) {
HStack {
Text("ВПК")
Text("Избранное ВПК")
.font(.custom("Montserrat-Medium", fixedSize: 17))
.foregroundColor(.black)
Spacer()

2
Schedule-ICTIS/Settings/SelectingGroupView.swift
View File

@ -54,7 +54,7 @@ struct SelectingGroupView: View {
}
vm.errorInNetworkForSingleGroup = nil
let formattedText = transformStringToFormat(text)
let formattedText = vm.nameOfGroupForSingle
do {
try saveGroup(name: formattedText)

3
Schedule-ICTIS/ViewModel/ScheduleViewModel.swift
View File

@ -37,6 +37,7 @@ final class ScheduleViewModel: ObservableObject {
@Published var isShowingAlertForIncorrectSingleGroup: Bool = false
@Published var errorInNetwork: NetworkError?
@Published var errorInNetworkForSingleGroup: NetworkError?
@Published var nameOfGroupForSingle = ""
@Published var isLoading: Bool = false
@Published var isNewGroup: Bool = false
@ -128,6 +129,7 @@ final class ScheduleViewModel: ObservableObject {
let schedule = try await NetworkManager.shared.getSchedule(name)
let table = schedule.table.table
let groupName = schedule.table.name
self.nameOfGroupForSingle = groupName
self.weekForSingleGroup = schedule.table.week
// Преобразуем данные в формат ClassInfo
@ -252,6 +254,7 @@ final class ScheduleViewModel: ObservableObject {
func addGroupToFilteringArray(group: String) {
self.filteringGroups.append(group)
selectShowingGroup()
}
func fillFilteringGroups() {