admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closed #78

Browse Source
This commit is contained in:
Trey t
2022-02-10 11:54:32 -06:00
parent 4b4e69d752
commit f66caf93dd
8 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Feels.xcodeproj/project.pbxproj
View File

@@ -142,6 +142,7 @@
1CAD603227A5C1C800C520BD /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; 1CAD603227A5C1C800C520BD /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderStatsView.swift; sourceTree = "<group>"; }; 1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderStatsView.swift; sourceTree = "<group>"; };
1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchableView.swift; sourceTree = "<group>"; }; 1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchableView.swift; sourceTree = "<group>"; };
1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Shared 2.xcdatamodel"; sourceTree = "<group>"; };
1CC469A9278F30A0003E0C6E /* BGTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGTask.swift; sourceTree = "<group>"; }; 1CC469A9278F30A0003E0C6E /* BGTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGTask.swift; sourceTree = "<group>"; };
1CC469AB27907D48003E0C6E /* DayChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayChartView.swift; sourceTree = "<group>"; }; 1CC469AB27907D48003E0C6E /* DayChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayChartView.swift; sourceTree = "<group>"; };
1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = "<group>"; }; 1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = "<group>"; };
@@ -1183,9 +1184,10 @@
1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */ = { 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */ = {
isa = XCVersionGroup; isa = XCVersionGroup;
children = ( children = (
1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */,
1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */, 1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */,
); );
currentVersion = 1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */; currentVersion = 1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */;
path = Feels.xcdatamodeld; path = Feels.xcdatamodeld;
sourceTree = "<group>"; sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel; versionGroupType = wrapper.xcdatamodel;

10
Shared/AppDelegate.swift
View File

@@ -47,15 +47,15 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
switch action { switch action {
case .horrible: case .horrible:
PersistenceController.shared.add(mood: .horrible, forDate: date) PersistenceController.shared.add(mood: .horrible, forDate: date, entryType: .notification)
case .bad: case .bad:
PersistenceController.shared.add(mood: .bad, forDate: date) PersistenceController.shared.add(mood: .bad, forDate: date, entryType: .notification)
case .average: case .average:
PersistenceController.shared.add(mood: .average, forDate: date) PersistenceController.shared.add(mood: .average, forDate: date, entryType: .notification)
case .good: case .good:
PersistenceController.shared.add(mood: .good, forDate: date) PersistenceController.shared.add(mood: .good, forDate: date, entryType: .notification)
case .great: case .great:
PersistenceController.shared.add(mood: .great, forDate: date) PersistenceController.shared.add(mood: .great, forDate: date, entryType: .notification)
} }
UIApplication.shared.applicationIconBadgeNumber = 0 UIApplication.shared.applicationIconBadgeNumber = 0
} }

2
Shared/Feels.xcdatamodeld/.xccurrentversion
View File

@@ -3,6 +3,6 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>_XCCurrentVersionName</key> <key>_XCCurrentVersionName</key>
<string>Shared.xcdatamodel</string> <string>Shared 2.xcdatamodel</string>
</dict> </dict>
</plist> </plist>

15
Shared/Feels.xcdatamodeld/Shared 2.xcdatamodel/contents Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21D49" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<entity name="MoodEntry" representedClassName="MoodEntry" syncable="YES" codeGenerationType="class">
<attribute name="canDelete" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="canEdit" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="entryType" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="forDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="moodValue" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="weekDay" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
</entity>
<elements>
<element name="MoodEntry" positionX="-63" positionY="-18" width="128" height="134"/>
</elements>
</model>

8
Shared/Models/ContentModeViewModel.swift
View File

@@ -86,8 +86,8 @@ class ContentModeViewModel: ObservableObject {
getGroupedData() getGroupedData()
} }
public func add(mood: Mood, forDate date: Date) { public func add(mood: Mood, forDate date: Date, entryType: EntryType) {
PersistenceController.shared.add(mood: mood, forDate: date) PersistenceController.shared.add(mood: mood, forDate: date, entryType: entryType)
getGroupedData() getGroupedData()
} }
@@ -108,7 +108,7 @@ class ContentModeViewModel: ObservableObject {
fatalError("Unresolved error \(nsError), \(nsError.userInfo)") fatalError("Unresolved error \(nsError), \(nsError.userInfo)")
} }
PersistenceController.shared.add(mood: mood, forDate: forDate) PersistenceController.shared.add(mood: mood, forDate: forDate, entryType: .listView)
do { do {
try PersistenceController.shared.viewContext.save() try PersistenceController.shared.viewContext.save()
@@ -135,7 +135,7 @@ class ContentModeViewModel: ObservableObject {
entriesToDelete.forEach({ entry in entriesToDelete.forEach({ entry in
let entryDate = entry.forDate! let entryDate = entry.forDate!
PersistenceController.shared.viewContext.delete(entry) PersistenceController.shared.viewContext.delete(entry)
self.add(mood: .missing, forDate: entryDate) self.add(mood: .missing, forDate: entryDate, entryType: .listView)
}) })
} }

5
Shared/Models/MoodEntryExtension.swift
View File

@@ -7,6 +7,11 @@
import Foundation import Foundation
enum EntryType: Int {
case notification
case header
case listView
}
extension MoodEntry { extension MoodEntry {
var moodString: String { var moodString: String {

7
Shared/Persistence.swift
View File

@@ -34,7 +34,7 @@ class PersistenceController {
return data.first return data.first
} }
public func add(mood: Mood, forDate date: Date) { public func add(mood: Mood, forDate date: Date, entryType: EntryType) {
if let existingEntry = getEntry(byDate: date) { if let existingEntry = getEntry(byDate: date) {
viewContext.delete(existingEntry) viewContext.delete(existingEntry)
try? viewContext.save() try? viewContext.save()
@@ -47,6 +47,7 @@ class PersistenceController {
newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date)) newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date))
newItem.canEdit = true newItem.canEdit = true
newItem.canDelete = true newItem.canDelete = true
newItem.entryType = Int16(entryType.rawValue)
do { do {
try viewContext.save() try viewContext.save()
@@ -163,7 +164,7 @@ class PersistenceController {
let existingEntriesSet = Set(existingEntries) let existingEntriesSet = Set(existingEntries)
let missing = Array(allDatesSet.subtracting(existingEntriesSet)).sorted(by: >) let missing = Array(allDatesSet.subtracting(existingEntriesSet)).sorted(by: >)
for date in missing { for date in missing {
add(mood: .missing, forDate: date) add(mood: .missing, forDate: date, entryType: .listView)
} }
} }
} }
@@ -219,6 +220,8 @@ class PersistenceController {
for description in container.persistentStoreDescriptions { for description in container.persistentStoreDescriptions {
description.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey) description.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey)
description.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey) description.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey)
description.setOption(true as NSNumber, forKey: NSMigratePersistentStoresAutomaticallyOption)
description.setOption(true as NSNumber, forKey: NSInferMappingModelAutomaticallyOption)
} }
container.loadPersistentStores(completionHandler: { (storeDescription, error) in container.loadPersistentStores(completionHandler: { (storeDescription, error) in

5
Shared/views/ContentView.swift
View File

@@ -71,6 +71,7 @@ struct ContentView: View {
viewModel.update(entry: selectedEntry, toMood: mood) viewModel.update(entry: selectedEntry, toMood: mood)
} }
showUpdateEntryAlert = false showUpdateEntryAlert = false
selectedEntry = nil
}) })
} }
@@ -279,7 +280,7 @@ struct ContentView: View {
if viewModel.shouldShowVotingHeader() { if viewModel.shouldShowVotingHeader() {
AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in
withAnimation { withAnimation {
viewModel.add(mood: mood, forDate: date) viewModel.add(mood: mood, forDate: date, entryType: .header)
} }
}) })
.frame(height: headerHeight) .frame(height: headerHeight)
@@ -319,7 +320,7 @@ struct ContentView: View {
.padding() .padding()
AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in
withAnimation { withAnimation {
viewModel.add(mood: mood, forDate: date) viewModel.add(mood: mood, forDate: date, entryType: .header)
} }
}, overrideDay: viewModel.shouldShowVotingHeader() ? .Today : .Previous) }, overrideDay: viewModel.shouldShowVotingHeader() ? .Today : .Previous)
} }