Добавил создание нерегулярных событий

Tracker/Models/Tracker.swift

@@ -15,6 +15,23 @@ enum Weekday: String, CaseIterable, Codable {
     case friday = "Пятница"
     case saturday = "Суббота"
     case sunday = "Воскресенье"
+
+    static func fromDate(_ date: Date) -> Weekday? {
+        let calendar = Calendar.current
+        let weekdayIndex = calendar.component(.weekday, from: date)
+
+        let weekdays = [
+            Weekday.sunday,
+            Weekday.monday,
+            Weekday.tuesday,
+            Weekday.wednesday,
+            Weekday.thursday,
+            Weekday.friday,
+            Weekday.saturday
+        ]
+
+        return weekdays[weekdayIndex - 1]
+    }
 }
 
 struct Tracker: Identifiable, Codable, Equatable {

Tracker/TrackersScreen/AddNewTrackerScreens/CreateNewHabitViewController.swift

@@ -14,6 +14,8 @@ final class CreateNewHabitViewController: UIViewController {
     private let scheduleScreenVC = ScheduleScreenViewController()
     weak var delegate: CreateNewTrackerViewController?
 
+    private var isRegularEvent = true
+
     let notificationName = Notification.Name("MyCustomNotification")
 
     private var selectedCategory: TrackerCategory?
@@ -62,6 +64,11 @@ final class CreateNewHabitViewController: UIViewController {
         setupParametresStackView()
         setupScreenControlsStackView()
         updateCreateButtonState()
+
+        if !isRegularEvent {
+            guard let weekday = Weekday.fromDate(Date()) else { return }
+            selectedWeekdays.insert(weekday)
+        }
     }
 
     private func setupScreenTitle() {
@@ -116,7 +123,6 @@ final class CreateNewHabitViewController: UIViewController {
         button.titleLabel?.font = UIFont.systemFont(ofSize: 17)
         button.contentHorizontalAlignment = .left
         button.backgroundColor = UIColor(named: "background")
-        button.layer.cornerRadius = 16
         button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 40)
 
         button.titleLabel?.numberOfLines = 0
@@ -201,11 +207,19 @@ final class CreateNewHabitViewController: UIViewController {
         setupCategoryButton()
         setupScheduleButton()
 
-        let stackView = UIStackView(arrangedSubviews: [categoryButton, separator, scheduleButton])
+        var arrangedSubviews = [categoryButton, separator, scheduleButton]
+
+        if !isRegularEvent {
+            arrangedSubviews = [categoryButton]
+        }
+
+        let stackView = UIStackView(arrangedSubviews: arrangedSubviews)
         stackView.axis = .vertical
         stackView.spacing = 0
         stackView.alignment = .fill
         stackView.distribution = .fill
+        stackView.layer.cornerRadius = 16
+        stackView.layer.masksToBounds = true
 
         stackView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(stackView)
@@ -318,6 +332,10 @@ final class CreateNewHabitViewController: UIViewController {
         trackersVC?.updateCollectionViewWithNewTracker()
     }
 
+    func configureTrackerType(isRegularEvent: Bool) {
+        self.isRegularEvent = isRegularEvent
+    }
+
     @objc private func categoryButtonTapped(_ sender: UIButton) {
         chooseCategoryVC.trackersVC = self.trackersVC
         present(chooseCategoryVC, animated: true)
@@ -329,7 +347,7 @@ final class CreateNewHabitViewController: UIViewController {
 
     @objc private func createButtonTapped(_ sender: UIButton) {
         createNewTracker()
-
+        
         self.dismiss(animated: true) { [weak self] in
             guard let delegate = self?.delegate else { return }
             delegate.dismiss(animated: false, completion: nil)
@@ -345,14 +363,23 @@ final class CreateNewHabitViewController: UIViewController {
     }
 
     private func updateCreateButtonState() {
-        if selectedCategory != nil && !selectedWeekdays.isEmpty && !(trackerNameTextField.text?.isEmpty ?? true) {
-            createButton.isEnabled = true
-            createButton.alpha = 1.0
+        if isRegularEvent {
+            if selectedCategory != nil && !selectedWeekdays.isEmpty && !(trackerNameTextField.text?.isEmpty ?? true) {
+                createButton.isEnabled = true
+                createButton.alpha = 1.0
+            } else {
+                createButton.isEnabled = false
+                createButton.alpha = 0.5
+            }
         } else {
-            createButton.isEnabled = false
-            createButton.alpha = 0.5
+            if selectedCategory != nil && !(trackerNameTextField.text?.isEmpty ?? true) {
+                createButton.isEnabled = true
+                createButton.alpha = 1.0
+            } else {
+                createButton.isEnabled = false
+                createButton.alpha = 0.5
+            }
+
         }
     }
 }
-
-

Tracker/TrackersScreen/AddNewTrackerScreens/CreateNewTrackerViewController.swift

@@ -11,6 +11,7 @@ import UIKit
 final class CreateNewTrackerViewController: UIViewController {
     weak var trackersVC: TrackersViewController?
     private let createNewHabitVC = CreateNewHabitViewController()
+    private let createNewEventVC = CreateNewHabitViewController()
 
     private var screenTitle: UILabel?
     private let screenTitleString = "Создание трекера"
@@ -25,8 +26,6 @@ final class CreateNewTrackerViewController: UIViewController {
         super.viewDidLoad()
         view.backgroundColor = .white
 
-        createNewHabitVC.delegate = self
-
         setupScreenTitle()
         setupHabitButton()
         setupEventButton()
@@ -99,11 +98,16 @@ final class CreateNewTrackerViewController: UIViewController {
     }
 
     @objc private func habitButtonTapped(_ sender: UIButton) {
+        createNewHabitVC.delegate = self
         createNewHabitVC.trackersVC = self.trackersVC
+        createNewHabitVC.configureTrackerType(isRegularEvent: true)
         present(createNewHabitVC, animated: true)
     }
 
     @objc private func eventButtonTapped(_ sender: UIButton) {
-
+        createNewEventVC.delegate = self
+        createNewEventVC.trackersVC = self.trackersVC
+        createNewEventVC.configureTrackerType(isRegularEvent: false)
+        present(createNewEventVC, animated: true)
     }
 }

Tracker/TrackersScreen/TrackersCell.swift

@@ -74,24 +74,21 @@ class TrackerCell: UICollectionViewCell {
 
             titleLabel.leadingAnchor.constraint(equalTo: colorPanelView.leadingAnchor, constant: 12),
             titleLabel.trailingAnchor.constraint(equalTo: colorPanelView.trailingAnchor, constant: -12),
-            titleLabel.topAnchor.constraint(equalTo: emojiLabel.bottomAnchor, constant: 8),
+            titleLabel.topAnchor.constraint(equalTo: colorPanelView.topAnchor, constant: 44),
             titleLabel.bottomAnchor.constraint(equalTo: colorPanelView.bottomAnchor, constant: -12)
         ])
 
         let  bottomBlockView = UIView()
         bottomBlockView.translatesAutoresizingMaskIntoConstraints = false
 
-        // Настраиваем кнопку
         completeButton.translatesAutoresizingMaskIntoConstraints = false
         completeButton.backgroundColor = .systemBlue // Начальный цвет фона
         completeButton.tintColor = .white // Цвет изображения
 
-        // Устанавливаем системное изображение "плюс" из SF Symbols
-        let plusImage = UIImage(systemName: "plus") // Системное изображение "плюс"
+        let plusImage = UIImage(systemName: "plus")
         completeButton.setImage(plusImage, for: .normal)
-        completeButton.tintColor = .white // Цвет изображения "плюс"
+        completeButton.tintColor = .white
 
-        // Настраиваем круглую форму кнопки
         completeButton.layer.cornerRadius = 17
         completeButton.clipsToBounds = true
 
@@ -101,7 +98,7 @@ class TrackerCell: UICollectionViewCell {
         durationLabel.translatesAutoresizingMaskIntoConstraints = false
         durationLabel.font = UIFont.systemFont(ofSize: 12)
         durationLabel.textColor = .black
-        // Убедитесь, что label использует Dynamic Type
+
         durationLabel.adjustsFontForContentSizeCategory = true
         durationLabel.numberOfLines = 0
 

Tracker/TrackersScreen/TrackersViewController.swift

@@ -266,6 +266,7 @@ final class TrackersViewController: UIViewController {
             updatedCategories.append(newCategory)
         }
         categories = updatedCategories
+        print("Новый трекер добавлен \(tracker.schedule)")
     }
 
     private func removeTracker(_ tracker: Tracker, from categoryTitle: String) {