olinpin/WordAX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
oliverhnat
2024-04-13 11:51:16 +02:00
parent 91c92f4a52
commit d5b7ca74e3
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
WordAX/Model/Flashcard+CoreDataClass.swift
View File

@@ -11,25 +11,6 @@ import CoreData
@objc(Flashcard) @objc(Flashcard)
public class Flashcard: NSManagedObject { public class Flashcard: NSManagedObject {
@objc dynamic var calculatedNextRepetition: Date {
if lastSeenOn != nil {
return lastSeenOn!.addSpacedRepetitionMilestone(milestone: self.getSpacedRepetitionMilestone())
} else {
return Date()
}
}
override public class func keyPathsForValuesAffectingValue(forKey key: String) -> Set<String> {
// public override func value(forKey key: String) -> Any? {
let keyPaths = super.keyPathsForValuesAffectingValue(forKey: key)
if key == "calculatedNextRepetition" {
return keyPaths.union(Set(["lastSeenOn", "nextSpacedRepetitionMilestone"]))
} else {
return keyPaths
}
}
enum SpacedRepetitionMilestoneEnum: Int64, CaseIterable { enum SpacedRepetitionMilestoneEnum: Int64, CaseIterable {
case Now = 0 // starting value case Now = 0 // starting value
case OneMinute = 60 // 60 * 1 case OneMinute = 60 // 60 * 1
@@ -65,21 +46,6 @@ public class Flashcard: NSManagedObject {
} }
// public override func didChangeValue(forKey key: String) {
// super.didChangeValue(forKey: key)
// if key == "lastSeenOn" || key == "nextSpacedRepetitionMilestone" {
// // updateCalculatedNextRepetition()
// calculatedNextRepetition = lastSeenOn ?? Date() + TimeInterval(nextSpacedRepetitionMilestone)
// }
// }
// func updateCalculatedNextRepetition() {
// if let lastSeen = lastSeenOn {
// calculatedNextRepetition = Calendar.current.date(byAdding: .day, value: Int(nextSpacedRepetitionMilestone), to: lastSeen)
// }
// }
func getSpacedRepetitionMilestone() -> SpacedRepetitionMilestoneEnum { func getSpacedRepetitionMilestone() -> SpacedRepetitionMilestoneEnum {
return SpacedRepetitionMilestoneEnum.getMilestoneFromInt(value: self.nextSpacedRepetitionMilestone) return SpacedRepetitionMilestoneEnum.getMilestoneFromInt(value: self.nextSpacedRepetitionMilestone)
} }

1
WordAX/Views/NextRepetitionButtonView.swift
View File

@@ -18,7 +18,6 @@ struct NextRepetitionButtonView: View {
@Environment(\.managedObjectContext) var moc @Environment(\.managedObjectContext) var moc
// { colorScheme == .light ? .cyan : .darkCyan } // { colorScheme == .light ? .cyan : .darkCyan }
@Binding var showDescription: Bool @Binding var showDescription: Bool
@EnvironmentObject var model: WordAXModelView
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
var body: some View { var body: some View {
Button(action: { Button(action: {

4
WordAX/WordAXModelView.swift
View File

@@ -60,10 +60,6 @@ extension Date {
return selfDate.year! < paramDate.year! || selfDate.month! < paramDate.month! || selfDate.day! < paramDate.day! return selfDate.year! < paramDate.year! || selfDate.month! < paramDate.month! || selfDate.day! < paramDate.day!
} }
// func addFrequency(frequency: WordAX.FrequencyEnum) -> Date {
// self.addingTimeInterval(TimeInterval(frequency.rawValue * 24 * 60 * 60))
// }
func addSpacedRepetitionMilestone(milestone: Flashcard.SpacedRepetitionMilestoneEnum?) -> Date { func addSpacedRepetitionMilestone(milestone: Flashcard.SpacedRepetitionMilestoneEnum?) -> Date {
if milestone == nil { if milestone == nil {
return self return self