fff

Schedule-ICTIS/Main/Views/SearchBarView.swift

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

Schedule-ICTIS/Settings/GeneralGroupSettings.swift

@@ -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)

Schedule-ICTIS/Settings/ScheduleGroupSettings.swift

@@ -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()

Schedule-ICTIS/Settings/SelectingGroupView.swift

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

Schedule-ICTIS/ViewModel/ScheduleViewModel.swift

@@ -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() {