Pin tracker feature added

DemidenGo · DemidenGo · commit 3b06d7abcc0d · 2023-07-04T23:01:03.000+03:00
diff --git a/TrackerApp/CoreData/Model.xcdatamodeld/Model.xcdatamodel/contents b/TrackerApp/CoreData/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -8,11 +8,12 @@
     <entity name="TrackerCoreData" representedClassName="TrackerCoreData" syncable="YES" codeGenerationType="class">
         <attribute name="colorHex" attributeType="String"/>
         <attribute name="emoji" attributeType="String"/>
+        <attribute name="initialCategory" attributeType="String"/>
         <attribute name="name" attributeType="String"/>
         <attribute name="scheduleString" attributeType="String"/>
         <attribute name="trackerID" attributeType="String"/>
         <relationship name="category" maxCount="1" deletionRule="Nullify" destinationEntity="TrackerCategoryCoreData" inverseName="trackers" inverseEntity="TrackerCategoryCoreData"/>
-        <relationship name="records" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TrackerRecordCoreData" inverseName="tracker" inverseEntity="TrackerRecordCoreData"/>
+        <relationship name="records" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="TrackerRecordCoreData" inverseName="tracker" inverseEntity="TrackerRecordCoreData"/>
     </entity>
     <entity name="TrackerRecordCoreData" representedClassName="TrackerRecordCoreData" syncable="YES" codeGenerationType="class">
         <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
diff --git a/TrackerApp/Resources/Localization.swift b/TrackerApp/Resources/Localization.swift
@@ -42,8 +42,12 @@ enum L10n {
         static let categoryNamePlaceholder = NSLocalizedString("categoryNamePlaceholder", comment: "Category name placeholder")
         static let doneTitle = NSLocalizedString("doneTitle", comment: "Done button title")
         static let pinTitle = NSLocalizedString("pinTitle", comment: "Pin tracker title")
+        static let unpinTitle = NSLocalizedString("unpinTitle", comment: "Unpin tracker title")
         static let editTitle = NSLocalizedString("editTitle", comment: "Edit tracker title")
         static let deleteTitle = NSLocalizedString("deleteTitle", comment: "Delete tracker title")
+        static let saveTitle = NSLocalizedString("saveTitle", comment: "Save button title")
+        static let deleteConfirmationTitle = NSLocalizedString("deleteConfirmationTitle", comment: "Delete confirm title")
+        static let pinnedTitle = NSLocalizedString("pinnedTitle", comment: "Pinned trackers category title")
     }
     enum Weekdays {
         // Full style
diff --git a/TrackerApp/Resources/en.lproj/Localizable.strings b/TrackerApp/Resources/en.lproj/Localizable.strings
@@ -49,5 +49,9 @@ saturdayShortTitle = "Sa";
 sundayShortTitle = "Su";
 everyDayTitle = "Every day";
 pinTitle = "Pin";
+unpinTitle = "Unpin";
 editTitle = "Edit";
 deleteTitle = "Delete";
+saveTitle = "Save";
+deleteConfirmationTitle = "Are you sure you want to delete tracker?";
+pinnedTitle = "\U2009Pinned";
diff --git a/TrackerApp/Resources/ru.lproj/Localizable.strings b/TrackerApp/Resources/ru.lproj/Localizable.strings
@@ -49,5 +49,9 @@ saturdayShortTitle = "Сб";
 sundayShortTitle = "Вс";
 everyDayTitle = "Каждый день";
 pinTitle = "Закрепить";
+unpinTitle = "Открепить";
 editTitle = "Редактировать";
 deleteTitle = "Удалить";
+saveTitle = "Сохранить";
+deleteConfirmationTitle = "Уверены что хотите удалить трекер?";
+pinnedTitle = "\U2009Закрепленные";
diff --git a/TrackerApp/Services/TrackerStore/TrackerStore.swift b/TrackerApp/Services/TrackerStore/TrackerStore.swift
@@ -21,8 +21,12 @@ final class TrackerStore: NSObject {
 
     private lazy var fetchedResultsController: NSFetchedResultsController<TrackerCoreData> = {
         let fetchRequest = TrackerCoreData.fetchRequest()
-        fetchRequest.sortDescriptors = [NSSortDescriptor(key: Constants.sortTrackersByCategoryKey, ascending: true),
-                                        NSSortDescriptor(key: Constants.sortTrackersByNameKey, ascending: true)]
+        fetchRequest.sortDescriptors = [NSSortDescriptor(key: Constants.sortTrackersByCategoryKey,
+                                                         ascending: true,
+                                                         selector: #selector(NSString.localizedStandardCompare(_:))),
+                                        NSSortDescriptor(key: Constants.sortTrackersByNameKey,
+                                                         ascending: true,
+                                                         selector: #selector(NSString.localizedStandardCompare(_:)))]
         fetchRequest.predicate = NSPredicate(format: "%K CONTAINS[n] %@", #keyPath(TrackerCoreData.scheduleString), "\(Date().startOfDay.weekDayString)")
         let controller = NSFetchedResultsController(fetchRequest: fetchRequest,
                                                     managedObjectContext: context,
@@ -182,14 +186,20 @@ extension TrackerStore: TrackerStoreProtocol {
         fetchedResultsController.sections?[section].name
     }
 
-    func save(_ tracker: Tracker, in category: String) throws {
+    func categoryStringForTracker(at indexPath: IndexPath) -> String? {
+        let trackerCoreData = fetchedResultsController.object(at: indexPath)
+        return trackerCoreData.initialCategory
+    }
+
+    func save(_ tracker: Tracker, in category: String, isPinned: Bool) throws {
         let trackerCoreData = retrieveTrackerCoreDataEntity(for: tracker)
-        let categoryCoreData = retrieveCategoryCoreDataEntity(for: category)
+        let categoryCoreData = retrieveCategoryCoreDataEntity(for: isPinned ? L10n.Trackers.pinnedTitle : category)
         trackerCoreData.trackerID = tracker.id
         trackerCoreData.name = tracker.name
         trackerCoreData.colorHex = UIColorMarshalling.serialize(color: tracker.color)
         trackerCoreData.emoji = tracker.emoji
         trackerCoreData.scheduleString = tracker.schedule.map({ $0.rawValue }).joined(separator: ",")
+        trackerCoreData.initialCategory = category
         trackerCoreData.category = categoryCoreData
         try context.save()
     }
@@ -221,4 +231,31 @@ extension TrackerStore: TrackerStoreProtocol {
             return Set<TrackerRecord>()
         }
     }
+
+    func pinTracker(at indexPath: IndexPath) throws {
+        let pinnedTrackerCoreData = fetchedResultsController.object(at: indexPath)
+        let pinnedCategoryCoreData: TrackerCategoryCoreData
+        if let existingCategoryCoreData = retrieveCategoryCoreDataEntity(for: L10n.Trackers.pinnedTitle) {
+            pinnedCategoryCoreData = existingCategoryCoreData
+        } else {
+            pinnedCategoryCoreData = TrackerCategoryCoreData(context: context)
+            pinnedCategoryCoreData.title = L10n.Trackers.pinnedTitle
+            pinnedCategoryCoreData.isCategorySelect = false
+        }
+        pinnedTrackerCoreData.category = pinnedCategoryCoreData
+        try context.save()
+    }
+
+    func unpinTracker(at indexPath: IndexPath) throws {
+        let unpinnedTrackerCoreData = fetchedResultsController.object(at: indexPath)
+        guard let initialCategoryString = unpinnedTrackerCoreData.initialCategory else { return }
+        let initialCategoryCoreData = retrieveCategoryCoreDataEntity(for: initialCategoryString)
+        unpinnedTrackerCoreData.category = initialCategoryCoreData
+        try context.save()
+    }
+
+    func checkTrackerIsPinned(at indexPath: IndexPath) -> Bool {
+        let trackerCoreData = fetchedResultsController.object(at: indexPath)
+        return trackerCoreData.category?.title == L10n.Trackers.pinnedTitle ? true : false
+    }
 }
diff --git a/TrackerApp/Services/TrackerStore/TrackerStoreProtocol.swift b/TrackerApp/Services/TrackerStore/TrackerStoreProtocol.swift
@@ -11,9 +11,13 @@ protocol TrackerStoreProtocol {
     var numberOfSections: Int { get }
     func numberOfItemsInSection(_ section: Int) -> Int
     func name(of section: Int) -> String?
+    func categoryStringForTracker(at indexPath: IndexPath) -> String?
     func object(at indexPath: IndexPath) -> Tracker?
-    func save(_ tracker: Tracker, in category: String) throws
+    func save(_ tracker: Tracker, in category: String, isPinned: Bool) throws
     func deleteTracker(at indexPath: IndexPath) throws
     func trackersFor(_ currentDate: String, searchRequest: String?)
     func records(for trackerIndexPath: IndexPath) -> Set<TrackerRecord>
+    func pinTracker(at indexPath: IndexPath) throws
+    func unpinTracker(at indexPath: IndexPath) throws
+    func checkTrackerIsPinned(at indexPath: IndexPath) -> Bool
 }
diff --git a/TrackerApp/Trackers/Categories-MVVM/Model/CategoryStore.swift b/TrackerApp/Trackers/Categories-MVVM/Model/CategoryStore.swift
@@ -16,6 +16,8 @@ final class CategoryStore: NSObject {
     private lazy var fetchedResultsController: NSFetchedResultsController<TrackerCategoryCoreData> = {
         let fetchRequest = TrackerCategoryCoreData.fetchRequest()
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: Constants.sortCategoriesKey, ascending: true)]
+        fetchRequest.predicate = NSPredicate(format: "%K != %@",
+                                             #keyPath(TrackerCategoryCoreData.title), L10n.Trackers.pinnedTitle)
         let controller = NSFetchedResultsController(fetchRequest: fetchRequest,
                                                     managedObjectContext: context,
                                                     sectionNameKeyPath: nil,
diff --git a/TrackerApp/Trackers/NewCategoryViewController.swift b/TrackerApp/Trackers/NewCategoryViewController.swift
@@ -112,7 +112,7 @@ extension NewCategoryViewController: UITextFieldDelegate {
     }
 
     func textFieldDidEndEditing(_ textField: UITextField) {
-        guard textField.text != "" else {
+        guard let text = textField.text, text != "", text != L10n.Trackers.pinnedTitle.dropFirst() else {
             disableDoneButton()
             return
         }
diff --git a/TrackerApp/Trackers/TrackerCreationViewController.swift b/TrackerApp/Trackers/TrackerCreationViewController.swift
@@ -19,6 +19,7 @@ final class TrackerCreationViewController: UIViewController {
     private var selectedEmoji: String?
     private var selectedColor: UIColor?
     private var trackerID: String?
+    private var isPinned = false
     private var trackerNameTextFieldConstraint = NSLayoutConstraint()
 
     private var isTrackerDataComplete: Bool {
@@ -190,13 +191,14 @@ final class TrackerCreationViewController: UIViewController {
         selectColorIfNeeded()
     }
 
-    func edit(existing tracker: Tracker, in category: String, with dayCounter: Int) {
+    func edit(existing tracker: Tracker, in category: String, with dayCounter: Int, isPinned: Bool) {
         selectedCategory = category
         selectedTrackerName = tracker.name
         selectedSchedule = tracker.schedule
         selectedEmoji = tracker.emoji
         selectedColor = tracker.color
         trackerID = tracker.id
+        self.isPinned = isPinned
         let daysTitle = String.localizedStringWithFormat(L10n.Trackers.trackedDaysTitle, dayCounter)
         daysCounterLabel.text = "\(dayCounter) " + daysTitle
     }
@@ -241,7 +243,7 @@ final class TrackerCreationViewController: UIViewController {
                                  color: selectedColor,
                                  emoji: selectedEmoji,
                                  schedule: selectedSchedule)
-        try? trackerStore?.save(newTracker, in: selectedCategory)
+        try? trackerStore?.save(newTracker, in: selectedCategory, isPinned: isPinned)
         closeControllerAction()
     }
 
@@ -308,6 +310,7 @@ final class TrackerCreationViewController: UIViewController {
             mainTitleLabel.text = L10n.Trackers.editTrackerTitle
             trackerNameTextFieldConstraint.constant = 116
             setupDaysCounterLabelConstraints()
+            createButton.setTitle(L10n.Trackers.saveTitle, for: .normal)
         }
     }
 
diff --git a/TrackerApp/Trackers/TrackersViewController.swift b/TrackerApp/Trackers/TrackersViewController.swift
@@ -201,12 +201,39 @@ final class TrackersViewController: UIViewController {
 
     private func editTracker(at indexPath: IndexPath) {
         guard let tracker = trackerStore.object(at: indexPath),
-              let category = trackerStore.name(of: indexPath.section) else { return }
+              let category = trackerStore.categoryStringForTracker(at: indexPath) else { return }
         let dayCounter = trackerStore.records(for: indexPath).count
-        let viewController = TrackerCreationViewController(trackerType: .existing)
-        viewController.trackerStore = trackerStore
-        viewController.edit(existing: tracker, in: category, with: dayCounter)
-        present(viewController, animated: true)
+        let editViewController = TrackerCreationViewController(trackerType: .existing)
+        editViewController.trackerStore = trackerStore
+        editViewController.edit(existing: tracker,
+                                in: category,
+                                with: dayCounter,
+                                isPinned: trackerStore.checkTrackerIsPinned(at: indexPath))
+        present(editViewController, animated: true)
+    }
+
+    private func deleteTracker(at indexPath: IndexPath) {
+        let alert = UIAlertController(title: nil,
+                                      message: L10n.Trackers.deleteConfirmationTitle,
+                                      preferredStyle: .actionSheet)
+        let deleteAction = UIAlertAction(title: L10n.Trackers.deleteTitle, style: .destructive) { [weak self] _ in
+            try? self?.trackerStore.deleteTracker(at: indexPath)
+        }
+        let cancelAction = UIAlertAction(title: L10n.Trackers.cancelTitle, style: .cancel)
+        [deleteAction, cancelAction].forEach { alert.addAction($0) }
+        present(alert, animated: true)
+    }
+
+    private func pinUnpinActionForTracker(at indexPath: IndexPath) {
+        if trackerStore.checkTrackerIsPinned(at: indexPath) {
+            try? trackerStore.unpinTracker(at: indexPath)
+        } else {
+            try? trackerStore.pinTracker(at: indexPath)
+        }
+    }
+
+    private func pinUnpinTitleForTracker(at indexPath: IndexPath) -> String {
+        trackerStore.checkTrackerIsPinned(at: indexPath) ? L10n.Trackers.unpinTitle : L10n.Trackers.pinTitle
     }
 }
 
@@ -264,16 +291,18 @@ extension TrackersViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? {
         guard indexPaths.count > 0 else { return nil }
         let indexPath = indexPaths[0]
-        return UIContextMenuConfiguration(actionProvider: { actions in
-            return UIMenu(children: [UIAction(title: L10n.Trackers.pinTitle) { _ in
-
-            },
-                                     UIAction(title: L10n.Trackers.editTitle) { [weak self] _ in
-                self?.editTracker(at: indexPath)
-            },
-                                     UIAction(title: L10n.Trackers.deleteTitle, attributes: .destructive) { _ in
-
-            }])
+        return UIContextMenuConfiguration(actionProvider: { [weak self] actions in
+            return UIMenu(children: [
+                UIAction(title: self?.pinUnpinTitleForTracker(at: indexPath) ?? "") { _ in
+                    self?.pinUnpinActionForTracker(at: indexPath)
+                },
+                UIAction(title: L10n.Trackers.editTitle) { _ in
+                    self?.editTracker(at: indexPath)
+                },
+                UIAction(title: L10n.Trackers.deleteTitle, attributes: .destructive) { _ in
+                    self?.deleteTracker(at: indexPath)
+                }
+            ])
         })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ extension NewCategoryViewController: UITextFieldDelegate {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func textFieldDidEndEditing(_ textField: UITextField) {`
`115`		`- guard textField.text != "" else {`
	`115`	`+ guard let text = textField.text, text != "", text != L10n.Trackers.pinnedTitle.dropFirst() else {`
`116`	`116`	`disableDoneButton()`
`117`	`117`	`return`
`118`	`118`	`}`