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

WIP - a lot of uncommitted work

Browse Source
This commit is contained in:
Trey t
2022-01-15 12:03:31 -06:00
parent 80690e4a8c
commit 64dd1855ac
31 changed files with 1024 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Feels.xcodeproj/project.pbxproj
View File

@@ -7,6 +7,15 @@
objects = {
/* Begin PBXBuildFile section */
1C412080278E23CC00D9153A /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 1C41207F278E23CC00D9153A /* Charts */; };
1C412082278F2B8800D9153A /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C412081278F2B8800D9153A /* FilterView.swift */; };
1C412083278F2B8800D9153A /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C412081278F2B8800D9153A /* FilterView.swift */; };
1C683FCA2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
1C683FCB2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
1C683FCC2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C744F2B278CE15600953A57 /* AppDelegate.swift */; };
1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CC469A9278F30A0003E0C6E /* BGTask.swift */; };
1CC469AC27907D48003E0C6E /* CircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CC469AB27907D48003E0C6E /* CircleView.swift */; };
1CD90B07278C7DE0001C4FEA /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B06278C7DE0001C4FEA /* Tests_iOS.swift */; };
1CD90B09278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B08278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift */; };
1CD90B13278C7DE0001C4FEA /* Tests_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B12278C7DE0001C4FEA /* Tests_macOS.swift */; };
@@ -51,7 +60,6 @@
1CD90B71278C80CA001C4FEA /* Feels.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */; };
1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; };
1CD90B77278C8119001C4FEA /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; };
1CD90B7B278C8146001C4FEA /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 1CD90B7A278C8146001C4FEA /* Charts */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -93,6 +101,11 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
1C412081278F2B8800D9153A /* FilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterView.swift; sourceTree = "<group>"; };
1C683FC92792281400745862 /* Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stats.swift; sourceTree = "<group>"; };
1C744F2B278CE15600953A57 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
1CC469A9278F30A0003E0C6E /* BGTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGTask.swift; sourceTree = "<group>"; };
1CC469AB27907D48003E0C6E /* CircleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleView.swift; sourceTree = "<group>"; };
1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = "<group>"; };
1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsApp.swift; sourceTree = "<group>"; };
1CD90AEF278C7DDF001C4FEA /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
@@ -136,7 +149,7 @@
buildActionMask = 2147483647;
files = (
1CD90B6C278C7F78001C4FEA /* CloudKit.framework in Frameworks */,
1CD90B7B278C8146001C4FEA /* Charts in Frameworks */,
1C412080278E23CC00D9153A /* Charts in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -196,9 +209,12 @@
isa = PBXGroup;
children = (
1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */,
1C744F2B278CE15600953A57 /* AppDelegate.swift */,
1CC469A9278F30A0003E0C6E /* BGTask.swift */,
1CD90B75278C8119001C4FEA /* LocalNotification.swift */,
1CD90AEF278C7DDF001C4FEA /* Persistence.swift */,
1CD90B5C278C7EAD001C4FEA /* Random.swift */,
1C683FC92792281400745862 /* Stats.swift */,
1CD90B31278C7E38001C4FEA /* views */,
1CD90B60278C7EBA001C4FEA /* Models */,
1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */,
@@ -250,9 +266,11 @@
children = (
1CD90B34278C7E38001C4FEA /* AddMoodHeaderView.swift */,
1CD90B35278C7E38001C4FEA /* ContentView.swift */,
1C412081278F2B8800D9153A /* FilterView.swift */,
1CD90B33278C7E38001C4FEA /* GraphView.swift */,
1CD90B36278C7E38001C4FEA /* HeaderStatsView.swift */,
1CD90B32278C7E38001C4FEA /* SettingsView.swift */,
1CC469AB27907D48003E0C6E /* CircleView.swift */,
);
path = views;
sourceTree = "<group>";
@@ -306,7 +324,7 @@
);
name = "Feels (iOS)";
packageProductDependencies = (
1CD90B7A278C8146001C4FEA /* Charts */,
1C41207F278E23CC00D9153A /* Charts */,
);
productName = "Feels (iOS)";
productReference = 1CD90AF5278C7DE0001C4FEA /* Feels.app */;
@@ -421,7 +439,7 @@
);
mainGroup = 1CD90AE5278C7DDF001C4FEA;
packageReferences = (
1CD90B79278C8146001C4FEA /* XCRemoteSwiftPackageReference "Charts" */,
1C41207E278E23CB00D9153A /* XCRemoteSwiftPackageReference "Charts" */,
);
productRefGroup = 1CD90AF6278C7DE0001C4FEA /* Products */;
projectDirPath = "";
@@ -483,17 +501,22 @@
buildActionMask = 2147483647;
files = (
1CD90B39278C7E38001C4FEA /* GraphView.swift in Sources */,
1C683FCA2792281400745862 /* Stats.swift in Sources */,
1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */,
1CD90B16278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */,
1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */,
1CD90B5D278C7EAD001C4FEA /* Random.swift in Sources */,
1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */,
1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */,
1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
1CD90B3D278C7E38001C4FEA /* ContentView.swift in Sources */,
1CD90B3F278C7E38001C4FEA /* HeaderStatsView.swift in Sources */,
1CD90B3B278C7E38001C4FEA /* AddMoodHeaderView.swift in Sources */,
1CC469AC27907D48003E0C6E /* CircleView.swift in Sources */,
1CD90B37278C7E38001C4FEA /* SettingsView.swift in Sources */,
1CD90B66278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */,
1CD90B1C278C7DE0001C4FEA /* Persistence.swift in Sources */,
1C412082278F2B8800D9153A /* FilterView.swift in Sources */,
1CD90B18278C7DE0001C4FEA /* FeelsApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -502,6 +525,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1C412083278F2B8800D9153A /* FilterView.swift in Sources */,
1CD90B64278C7EBA001C4FEA /* Mood.swift in Sources */,
1CD90B3A278C7E38001C4FEA /* GraphView.swift in Sources */,
1CD90B17278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */,
@@ -522,6 +546,7 @@
buildActionMask = 2147483647;
files = (
1CD90B09278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift in Sources */,
1C683FCC2792281400745862 /* Stats.swift in Sources */,
1CD90B07278C7DE0001C4FEA /* Tests_iOS.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -544,6 +569,7 @@
1CD90B5B278C7E91001C4FEA /* Persistence.swift in Sources */,
1CD90B68278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */,
1CD90B71278C80CA001C4FEA /* Feels.xcdatamodeld in Sources */,
1C683FCB2792281400745862 /* Stats.swift in Sources */,
1CD90B52278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
1CD90B4D278C7E7A001C4FEA /* FeelsWidget.swift in Sources */,
);
@@ -1014,20 +1040,20 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
1CD90B79278C8146001C4FEA /* XCRemoteSwiftPackageReference "Charts" */ = {
1C41207E278E23CB00D9153A /* XCRemoteSwiftPackageReference "Charts" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/danielgindi/Charts";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.0.0;
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
1CD90B7A278C8146001C4FEA /* Charts */ = {
1C41207F278E23CC00D9153A /* Charts */ = {
isa = XCSwiftPackageProductDependency;
package = 1CD90B79278C8146001C4FEA /* XCRemoteSwiftPackageReference "Charts" */;
package = 1C41207E278E23CB00D9153A /* XCRemoteSwiftPackageReference "Charts" */;
productName = Charts;
};
/* End XCSwiftPackageProductDependency section */

22
Feels.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -4,10 +4,28 @@
{
"package": "Charts",
"repositoryURL": "https://github.com/danielgindi/Charts",
"state": {
"branch": "master",
"revision": "85cfba96eb3492124d645ac0901b66f0cb266267",
"version": null
}
},
{
"package": "swift-algorithms",
"repositoryURL": "https://github.com/apple/swift-algorithms",
"state": {
"branch": null,
"revision": "66546404a6739173b8e436ab6bc1f2897cd08594",
"version": "3.6.0"
"revision": "2327673b0e9c7e90e6b1826376526ec3627210e4",
"version": "0.2.1"
}
},
{
"package": "swift-numerics",
"repositoryURL": "https://github.com/apple/swift-numerics",
"state": {
"branch": null,
"revision": "6583ac70c326c3ee080c1d42d9ca3361dca816cd",
"version": "0.1.0"
}
}
]

24
FeelsWidget/FeelsWidget.swift
View File

@@ -122,11 +122,11 @@ struct MediumWidgetView: View {
Spacer()
HStack {
Text(firstGroup.first?.date ?? Date(), formatter: formatter)
Text(firstGroup.first?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
Text(" - ")
.font(.system(.footnote))
Text(firstGroup.last?.date ?? Date(), formatter: formatter)
Text(firstGroup.last?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
}
.frame(minWidth: 0, maxWidth: .infinity)
@@ -164,11 +164,11 @@ struct LargeWidgetView: View {
Spacer()
HStack {
Text(firstGroup.first?.date ?? Date(), formatter: formatter)
Text(firstGroup.first?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
Text(" - ")
.font(.system(.footnote))
Text(firstGroup.last?.date ?? Date(), formatter: formatter)
Text(firstGroup.last?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
}
.frame(minWidth: 0, maxWidth: .infinity)
@@ -181,10 +181,10 @@ struct LargeWidgetView: View {
Spacer()
HStack {
Text(lastGroup.first?.date ?? Date(), formatter: formatter)
Text(lastGroup.first?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
Text(" - ")
Text(lastGroup.last?.date ?? Date(), formatter: formatter)
Text(lastGroup.last?.forDate ?? Date(), formatter: formatter)
.font(.system(.footnote))
}
.frame(minWidth: 0, maxWidth: .infinity)
@@ -244,20 +244,20 @@ struct FeelsWidget_Previews: PreviewProvider {
static var previews: some View {
Group {
FeelsWidgetEntryView(entry: SimpleEntry(date: Date(),
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 1)))
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 1)))
.previewContext(WidgetPreviewContext(family: .systemSmall))
.environment(\.sizeCategory, .small)
FeelsWidgetEntryView(entry: SimpleEntry(date: Date(),
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 3)))
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 3)))
.previewContext(WidgetPreviewContext(family: .systemMedium))
.environment(\.sizeCategory, .medium)
FeelsWidgetEntryView(entry: SimpleEntry(date: Date(),
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 10)))
configuration: ConfigurationIntent(),
mood: PersistenceController.shared.randomEntries(count: 10)))
.previewContext(WidgetPreviewContext(family: .systemLarge))
.environment(\.sizeCategory, .large)
}

57
Shared/AppDelegate.swift Normal file
View File

@@ -0,0 +1,57 @@
//
// AppDelegate.swift
// Feels (iOS)
//
// Created by Trey Tartt on 1/10/22.
//
import Foundation
import UserNotifications
import UIKit
import WidgetKit
// AppDelegate.swift
class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
// PersistenceController.shared.clearDB()
NotificationCenter.default.addObserver(self,
selector: #selector(fetchChanges),
name: .NSPersistentStoreRemoteChange,
object: PersistenceController.shared.container.persistentStoreCoordinator)
application.registerForRemoteNotifications()
UNUserNotificationCenter.current().delegate = self
return true
}
@objc func fetchChanges(note: Notification) {
WidgetCenter.shared.reloadAllTimelines()
}
}
extension AppDelegate: UNUserNotificationCenterDelegate {
func requestAuthorization() { }
func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
completionHandler([.badge, .banner, .sound])
}
func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
if let action = LocalNotification.ActionType(rawValue: response.actionIdentifier) {
switch action {
case .horrible:
PersistenceController.shared.add(mood: .horrible, forDate: Date())
case .bad:
PersistenceController.shared.add(mood: .bad, forDate: Date())
case .average:
PersistenceController.shared.add(mood: .average, forDate: Date())
case .good:
PersistenceController.shared.add(mood: .good, forDate: Date())
case .great:
PersistenceController.shared.add(mood: .great, forDate: Date())
}
}
WidgetCenter.shared.reloadAllTimelines()
completionHandler()
}
}

24
Shared/Assets.xcassets/average.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "meh-regular.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
Shared/Assets.xcassets/average.imageset/meh-regular.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="meh" class="svg-inline--fa fa-meh fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm8 144H160c-13.2 0-24 10.8-24 24s10.8 24 24 24h176c13.2 0 24-10.8 24-24s-10.8-24-24-24z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 610 B

24
Shared/Assets.xcassets/bad.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "frown-regular.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
Shared/Assets.xcassets/bad.imageset/frown-regular.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="frown" class="svg-inline--fa fa-frown fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm-80 128c-40.2 0-78 17.7-103.8 48.6-8.5 10.2-7.1 25.3 3.1 33.8 10.2 8.4 25.3 7.1 33.8-3.1 16.6-19.9 41-31.4 66.9-31.4s50.3 11.4 66.9 31.4c8.1 9.7 23.1 11.9 33.8 3.1 10.2-8.5 11.5-23.6 3.1-33.8C326 321.7 288.2 304 248 304z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 748 B

24
Shared/Assets.xcassets/good.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "grin-regular.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
Shared/Assets.xcassets/good.imageset/grin-regular.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="grin" class="svg-inline--fa fa-grin fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm105.6-151.4c-25.9 8.3-64.4 13.1-105.6 13.1s-79.6-4.8-105.6-13.1c-9.9-3.1-19.4 5.4-17.7 15.3 7.9 47.1 71.3 80 123.3 80s115.3-32.9 123.3-80c1.6-9.8-7.7-18.4-17.7-15.3zM168 240c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 690 B

24
Shared/Assets.xcassets/great.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "smile-beam-regular.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
Shared/Assets.xcassets/great.imageset/smile-beam-regular.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="smile-beam" class="svg-inline--fa fa-smile-beam fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm84-143.4c-20.8 25-51.5 39.4-84 39.4s-63.2-14.3-84-39.4c-8.5-10.2-23.6-11.5-33.8-3.1-10.2 8.5-11.5 23.6-3.1 33.8 30 36 74.1 56.6 120.9 56.6s90.9-20.6 120.9-56.6c8.5-10.2 7.1-25.3-3.1-33.8-10.2-8.4-25.3-7.1-33.8 3.1zM136.5 211c7.7-13.7 19.2-21.6 31.5-21.6s23.8 7.9 31.5 21.6l9.5 17c2.1 3.7 6.2 4.7 9.3 3.7 3.6-1.1 6-4.5 5.7-8.3-3.3-42.1-32.2-71.4-56-71.4s-52.7 29.3-56 71.4c-.3 3.7 2.1 7.2 5.7 8.3 3.4 1.1 7.4-.5 9.3-3.7l9.5-17zM328 152c-23.8 0-52.7 29.3-56 71.4-.3 3.7 2.1 7.2 5.7 8.3 3.5 1.1 7.4-.5 9.3-3.7l9.5-17c7.7-13.7 19.2-21.6 31.5-21.6s23.8 7.9 31.5 21.6l9.5 17c2.1 3.7 6.2 4.7 9.3 3.7 3.6-1.1 6-4.5 5.7-8.3-3.3-42.1-32.2-71.4-56-71.4z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

24
Shared/Assets.xcassets/horrible.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,24 @@
{
"images" : [
{
"filename" : "sad-tear-regular.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
Shared/Assets.xcassets/horrible.imageset/sad-tear-regular.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="sad-tear" class="svg-inline--fa fa-sad-tear fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm8-152c-13.2 0-24 10.8-24 24s10.8 24 24 24c23.8 0 46.3 10.5 61.6 28.8 8.1 9.8 23.2 11.9 33.8 3.1 10.2-8.5 11.6-23.6 3.1-33.8C330 320.8 294.1 304 256 304zm-88-64c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm-165.6 98.8C151 290.1 126 325.4 126 342.9c0 22.7 18.8 41.1 42 41.1s42-18.4 42-41.1c0-17.5-25-52.8-36.4-68.1-2.8-3.7-8.4-3.7-11.2 0z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 817 B

21
Shared/Assets.xcassets/missing.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Screen Shot 2022-01-13 at 5.02.34 PM.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Shared/Assets.xcassets/missing.imageset/Screen Shot 2022-01-13 at 5.02.34 PM.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

40
Shared/BGTask.swift Normal file
View File

@@ -0,0 +1,40 @@
//
// BGTask.swift
// Feels (iOS)
//
// Created by Trey Tartt on 1/12/22.
//
import Foundation
import BackgroundTasks
class BGTask {
static let updateDBMissingID = "com.88oak.Feels.dbUpdateMissing"
class func runFillInMissingDatesTask(task: BGProcessingTask) {
BGTask.scheduleBackgroundProcessing()
task.expirationHandler = {
task.setTaskCompleted(success: false)
}
PersistenceController.shared.fillInMissingDates()
task.setTaskCompleted(success: true)
}
class func scheduleBackgroundProcessing() {
let request = BGProcessingTaskRequest(identifier: BGTask.updateDBMissingID)
request.requiresNetworkConnectivity = false
request.requiresExternalPower = false
var runDate = Calendar.current.date(byAdding: .day, value: 1, to: Date())
runDate = Calendar.current.date(bySettingHour: 0, minute: 1, second: 0, of: runDate!)
request.earliestBeginDate = runDate
do {
try BGTaskScheduler.shared.submit(request)
} catch {
print("Could not schedule image fetch: (error)")
}
}
}

5
Shared/Feels.xcdatamodeld/Shared.xcdatamodel/contents
View File

@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21C52" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<entity name="MoodEntry" representedClassName="MoodEntry" syncable="YES" codeGenerationType="class">
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<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="74"/>
<element name="MoodEntry" positionX="-63" positionY="-18" width="128" height="89"/>
</elements>
</model>

36
Shared/FeelsApp.swift
View File

@@ -7,15 +7,17 @@
import SwiftUI
import BackgroundTasks
import WidgetKit
@main
struct FeelsApp: App {
@Environment(\.scenePhase) private var scenePhase
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
let persistenceController = PersistenceController.shared
init() {
// persistenceController.fillInMissingDates()
BGTaskScheduler.shared.cancelAllTaskRequests()
BGTaskScheduler.shared.register(forTaskWithIdentifier: BGTask.updateDBMissingID, using: nil) { (task) in
BGTask.runFillInMissingDatesTask(task: task as! BGProcessingTask)
@@ -30,38 +32,8 @@ struct FeelsApp: App {
if phase == .background {
BGTask.scheduleBackgroundProcessing()
print("background")
WidgetCenter.shared.reloadAllTimelines()
}
}
}
}
class BGTask {
static let updateDBMissingID = "com.88oak.Feels.dbUpdateMissing"
class func runFillInMissingDatesTask(task: BGProcessingTask) {
BGTask.scheduleBackgroundProcessing()
task.expirationHandler = {
task.setTaskCompleted(success: false)
}
PersistenceController.shared.fillInMissingDates()
task.setTaskCompleted(success: true)
}
class func scheduleBackgroundProcessing() {
let request = BGProcessingTaskRequest(identifier: BGTask.updateDBMissingID)
request.requiresNetworkConnectivity = false
request.requiresExternalPower = false
var runDate = Calendar.current.date(byAdding: .day, value: 1, to: Date())
runDate = Calendar.current.date(bySettingHour: 0, minute: 1, second: 0, of: runDate!)
request.earliestBeginDate = runDate
do {
try BGTaskScheduler.shared.submit(request)
} catch {
print("Could not schedule image fetch: (error)")
}
}
}

35
Shared/LocalNotification.swift
View File

@@ -106,38 +106,3 @@ class LocalNotification {
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
}
}
class NotificationDelegate: NSObject, ObservableObject, UNUserNotificationCenterDelegate {
@Published var notificationCounter = 0
override init() {
super.init()
UNUserNotificationCenter.current().delegate = self
}
func requestAuthorization() {
}
func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
completionHandler([.badge, .banner, .sound])
}
func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
if let action = LocalNotification.ActionType(rawValue: response.actionIdentifier) {
switch action {
case .horrible:
PersistenceController.shared.add(mood: .horrible, forDate: Date())
case .bad:
PersistenceController.shared.add(mood: .bad, forDate: Date())
case .average:
PersistenceController.shared.add(mood: .average, forDate: Date())
case .good:
PersistenceController.shared.add(mood: .good, forDate: Date())
case .great:
PersistenceController.shared.add(mood: .great, forDate: Date())
}
}
completionHandler()
}
}

31
Shared/Models/Mood.swift
View File

@@ -33,25 +33,42 @@ enum Mood: Int {
}
}
var color: Color {
switch self {
case .horrible:
return .red
case .bad:
return .orange
case .average:
return .blue
case .good:
return .yellow
case .great:
return .green
case .missing:
return Color(uiColor: UIColor.tertiarySystemBackground)
}
}
static var allValues: [Mood] {
return [Mood.horrible, Mood.bad, Mood.average, Mood.good, Mood.great]
}
var icon: Text {
var icon: Image {
switch self {
case .horrible:
return Text("😫")
return Image("horrible", bundle: .main)
case .bad:
return Text("🙁")
return Image("bad", bundle: .main)
case .average:
return Text("😐")
return Image("average", bundle: .main)
case .good:
return Text("🙂")
return Image("good", bundle: .main)
case .great:
return Text("😆")
return Image("great", bundle: .main)
case .missing:
return Text("🚫")
return Image("missing", bundle: .main)
}
}
}

60
Shared/Persistence.swift
View File

@@ -27,7 +27,8 @@ struct PersistenceController {
let newItem = MoodEntry(context: viewContext)
newItem.timestamp = Date()
newItem.moodValue = Int16(mood.rawValue)
newItem.date = date
newItem.forDate = date
newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date))
do {
try viewContext.save()
@@ -39,9 +40,9 @@ struct PersistenceController {
public func moodEntries(forStartDate date: Date, count: Int) -> [MoodEntry] {
let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
fetchRequest.fetchLimit = count
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)]
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: false)]
// var calendar = Calendar.current
// calendar.timeZone = NSTimeZone.local
@@ -59,12 +60,42 @@ struct PersistenceController {
}
}
public var earliestEntry: MoodEntry? {
let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)]
let first = try! viewContext.fetch(fetchRequest).first
return first ?? nil
}
public var latestEntry: MoodEntry? {
let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)]
let last = try! viewContext.fetch(fetchRequest).last
return last ?? nil
}
public func getData(startDate: Date, endDate: Date) -> [MoodEntry] {
let predicate = NSPredicate(format: "%K >= %@ && %K <= %@",
"forDate",
startDate as NSDate,
"forDate",
endDate as NSDate)
let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
fetchRequest.predicate = predicate
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)]
return try! viewContext.fetch(fetchRequest)
}
func populateTestData() {
for idx in 1..<25 {
let newItem = MoodEntry(context: viewContext)
newItem.timestamp = Date()
newItem.moodValue = Int16(Mood.allValues.randomElement()!.rawValue)
newItem.date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
let date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())!
newItem.forDate = date
newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date))
}
do {
try viewContext.save()
@@ -81,7 +112,10 @@ struct PersistenceController {
let newItem = MoodEntry(context: viewContext)
newItem.timestamp = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
newItem.moodValue = Int16(Mood.allValues.randomElement()!.rawValue)
newItem.date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
let date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())!
newItem.forDate = date
newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date))
}
do {
try viewContext.save()
@@ -95,15 +129,15 @@ struct PersistenceController {
func fillInMissingDates() {
let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "date", ascending: false)]
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: false)]
let entries = try! viewContext.fetch(fetchRequest)
if let earliestDate = entries.last?.date {
if let earliestDate = entries.last?.forDate {
let diffInDays = Calendar.current.dateComponents([.day], from: earliestDate, to: Date()).day
for idx in 1..<diffInDays! {
let searchDay = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
if entries.filter({ Calendar.current.isDate($0.date!, inSameDayAs:searchDay!) }).isEmpty {
if entries.filter({ Calendar.current.isDate($0.forDate!, inSameDayAs:searchDay!) }).isEmpty {
self.add(mood: .missing, forDate: searchDay!)
}
}
@@ -129,7 +163,9 @@ struct PersistenceController {
let newItem = MoodEntry(context: viewContext)
newItem.timestamp = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
newItem.moodValue = Int16(Mood.allValues.randomElement()!.rawValue)
newItem.date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())
let date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())!
newItem.forDate = date
newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date))
entries.append(newItem)
}
return entries
@@ -143,6 +179,12 @@ struct PersistenceController {
container.persistentStoreDescriptions.first!.url = URL(fileURLWithPath: "/dev/null")
}
container.viewContext.automaticallyMergesChangesFromParent = true
for description in container.persistentStoreDescriptions {
description.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey)
description.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey)
}
container.loadPersistentStores(completionHandler: { (storeDescription, error) in
if let error = error as NSError? {
// Replace this implementation with code to handle the error appropriately.

10
Shared/Random.swift
View File

@@ -18,3 +18,13 @@ class Random {
return updateTime
}
}
extension Date: RawRepresentable {
public var rawValue: String {
self.timeIntervalSinceReferenceDate.description
}
public init?(rawValue: String) {
self = Date(timeIntervalSinceReferenceDate: Double(rawValue) ?? 0.0)
}
}

17
Shared/Stats.swift Normal file
View File

@@ -0,0 +1,17 @@
//
// Stats.swift
// Feels
//
// Created by Trey Tartt on 1/14/22.
//
import Foundation
class Stats {
static func getCountFor(moodType: Mood, inData data: [MoodEntry]) -> Int {
let num = data.filter({
$0.moodValue == moodType.rawValue
}).count
return num
}
}

8
Shared/views/AddMoodHeaderView.swift
View File

@@ -23,13 +23,15 @@ struct AddMoodHeaderView: View {
.foregroundColor(Color(UIColor.label))
.padding()
HStack{
ForEach(Mood.allValues) { mood in
ForEach(Mood.allValues.reversed()) { mood in
VStack {
Button(action: {
addItem(withMoodValue: mood.rawValue)
}, label: {
mood.icon
.font(.system(size: 50))
.resizable()
.frame(width: 50, height: 50, alignment: .center)
.foregroundColor(mood.color)
})
//Text(mood.strValue)
@@ -50,7 +52,7 @@ struct AddMoodHeaderView: View {
let newItem = MoodEntry(context: viewContext)
newItem.timestamp = Date()
newItem.moodValue = Int16(moodValue)
newItem.date = Date()
newItem.forDate = Date()
do {
try viewContext.save()

41
Shared/views/CircleView.swift Normal file
View File

@@ -0,0 +1,41 @@
//
// CircleView.swift
// Feels (iOS)
//
// Created by Trey Tartt on 1/13/22.
//
import Foundation
import SwiftUI
struct DayChartView: View, Hashable {
enum ViewType: Hashable {
case cicle
case square
case text(String)
}
let color: Color
let weekDay: Int
let viewType: ViewType
var body: some View {
switch viewType {
case .cicle:
Circle()
.fill(color)
.frame(minWidth: 5, idealWidth: 50, maxWidth: 50, minHeight: 5, idealHeight: 20, maxHeight: 50, alignment: .center)
.opacity(color == Mood.missing.color ? 0.5 : 1.0)
case .square:
Rectangle()
.fill(color)
.frame(minWidth: 5, idealWidth: 50, maxWidth: 50, minHeight: 5, idealHeight: 20, maxHeight: 50, alignment: .center)
case .text(let value):
Text(value)
.font(.footnote)
.frame(minWidth: 5, idealWidth: 50, maxWidth: 50, minHeight: 5, idealHeight: 20, maxHeight: 50, alignment: .center)
}
}
}

20
Shared/views/ContentView.swift
View File

@@ -16,7 +16,7 @@ struct ContentView: View {
@State private var showTodayInput = true
@FetchRequest(
sortDescriptors: [NSSortDescriptor(keyPath: \MoodEntry.date, ascending: false)],
sortDescriptors: [NSSortDescriptor(keyPath: \MoodEntry.forDate, ascending: false)],
animation: .spring())
private var items: FetchedResults<MoodEntry>
@@ -29,10 +29,16 @@ struct ContentView: View {
Label("Main", systemImage: "list.dash")
}
FilterView()
.tabItem {
Label("Filter", systemImage: "calendar.circle")
}
GraphView()
.tabItem {
Label("Graph", systemImage: "chart.line.uptrend.xyaxis")
Label("Stats", systemImage: "chart.line.uptrend.xyaxis")
}
}
}
@@ -56,13 +62,15 @@ struct ContentView: View {
ForEach(items) { item in
HStack {
item.mood.icon
.font(.system(size: 50))
.resizable()
.frame(width: 50, height: 50, alignment: .center)
.foregroundColor(item.mood.color)
VStack {
Text("\(item.moodString)")
.font(.title)
.foregroundColor(Color(UIColor.systemGray))
.frame(maxWidth: .infinity, alignment: .leading)
Text(item.date!, style: .date)
Text(item.forDate ?? Date(), style: .date)
.font(.body)
.foregroundColor(Color(UIColor.label))
.frame(maxWidth: .infinity, alignment: .leading)
@@ -123,8 +131,8 @@ struct ContentView: View {
// Note: Times are printed in UTC. Depending on where you live it won't print 00:00:00 but it will work with UTC times which can be converted to local time
// Set predicate as date being today's date
let fromPredicate = NSPredicate(format: "%@ <= %K", dateFrom as NSDate, #keyPath(MoodEntry.date))
let toPredicate = NSPredicate(format: "%K < %@", #keyPath(MoodEntry.date), dateTo as NSDate)
let fromPredicate = NSPredicate(format: "%@ <= %K", dateFrom as NSDate, #keyPath(MoodEntry.forDate))
let toPredicate = NSPredicate(format: "%K < %@", #keyPath(MoodEntry.forDate), dateTo as NSDate)
let datePredicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fromPredicate, toPredicate])
fetchRequest.predicate = datePredicate
let entries = try! self.viewContext.count(for: fetchRequest)

362
Shared/views/FilterView.swift Normal file
View File

@@ -0,0 +1,362 @@
//
// FilterView.swift
// Feels
//
// Created by Trey Tartt on 1/12/22.
//
import SwiftUI
import CoreData
class DataHolder: ObservableObject {
// year, month, items
@Published var data = [Int: [Int: [DayChartView]]]()
@Published var numberOfRatings: Int = 0
var uncategorizedData = [MoodEntry]() {
didSet {
self.numberOfRatings = uncategorizedData.count
}
}
}
struct FilterView: View {
typealias Year = Int
typealias Month = Int
let weekdays = [("Sun", 1), ("mon", 2), ("tue", 3), ("wed", 4), ("thur", 5), ("fri", 6), ("sat", 7)]
let months = [(0, "J"), (1, "F"), (2,"M"), (3,"A"), (4,"M"), (5, "J"), (6,"J"), (7,"A"), (8,"S"), (9,"O"), (10, "N"), (11,"D")]
@State private var toggle = true
@State var selectedDays = [Int]()
@State private var entryStartDate: Date = Date()
@State private var entryEndDate: Date = Date()
@State private var showFilter = false
@FetchRequest(
sortDescriptors: [NSSortDescriptor(keyPath: \MoodEntry.forDate, ascending: false)],
animation: .spring())
private var items: FetchedResults<MoodEntry>
@StateObject private var dataHolder = DataHolder()
//[
// 2001: [0: [], 1: [], 2: []],
// 2002: [0: [], 1: [], 2: []]
// ]
let columns = [
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
]
private func filterEntries(startDate: Date, endDate: Date) {
let filteredEntries = PersistenceController.shared.getData(startDate: startDate, endDate: endDate)
self.dataHolder.data.removeAll()
let filledOutData = buildGridData(withData: filteredEntries)
self.dataHolder.data = filledOutData
self.dataHolder.uncategorizedData = filteredEntries
}
private func buildGridData(withData data: [MoodEntry]) -> [Year: [Month: [DayChartView]]] {
var returnData = [Year: [Month: [DayChartView]]]()
if let earliestEntry = data.first,
let lastEntry = data.last {
let calendar = Calendar.current
let components = calendar.dateComponents([.year], from: earliestEntry.forDate!)
let earliestYear = components.year!
let latestComponents = calendar.dateComponents([.year], from: lastEntry.forDate!)
let latestYear = latestComponents.year!
for year in earliestYear...latestYear {
var allMonths = [Int: [DayChartView]]()
// add back in if months header has leading (-1, ""),
// and add back gridItem
// var dayViews = [DayChartView]()
// for day in 0...32 {
// let view = DayChartView(color: Mood.missing.color,
// weekDay: 2,
// viewType: .text(String(day+1)))
// dayViews.append(view)
// }
// allMonths[0] = dayViews
for month in (1...12) {
var components = DateComponents()
components.month = month
components.year = year
let startDateOfMonth = Calendar.current.date(from: components)!
let items = data.filter({ entry in
let components = calendar.dateComponents([.month, .year], from: startDateOfMonth)
let entryComponents = calendar.dateComponents([.month, .year], from: entry.forDate!)
return (components.month == entryComponents.month && components.year == entryComponents.year)
})
allMonths[month] = createViewFor(monthEntries: items, forMonth: startDateOfMonth)
}
returnData[year] = allMonths
}
}
return returnData
}
private func createViewFor(monthEntries: [MoodEntry], forMonth month: Date) -> [DayChartView] {
var filledOutArray = [DayChartView]()
let calendar = Calendar.current
let range = calendar.range(of: .day, in: .month, for: month)!
let numDays = range.count
for day in 1...numDays {
if let item = monthEntries.filter({ entry in
let components = calendar.dateComponents([.day, .weekday], from: entry.forDate!)
let date = components.day
let weekday = components.weekday!
if selectedDays.isEmpty {
return day == date
} else {
return day == date && selectedDays.contains(weekday)
}
}).first {
let view = DayChartView(color: item.mood.color,
weekDay: Int(item.weekDay),
viewType: .cicle)
filledOutArray.append(view)
} else {
let thisDate = Calendar.current.date(bySetting: .day, value: day, of: month)!
let view = DayChartView(color: Mood.missing.color,
weekDay: Calendar.current.component(.weekday, from: thisDate),
viewType: .cicle)
filledOutArray.append(view)
}
}
for _ in filledOutArray.count...32 {
let view = DayChartView(color: Mood.missing.color,
weekDay: 2,
viewType: .cicle)
filledOutArray.append(view)
}
return filledOutArray
}
var body: some View {
VStack {
Button(action: {
withAnimation{
showFilter.toggle()
}
}, label: {
Text("filter")
.textCase(.uppercase)
})
.padding([.leading, .trailing, .top])
statsView
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 120, maxHeight: 120)
.cornerRadius(25)
.padding([.leading, .trailing])
if showFilter {
filterView
}
gridView
.onAppear(perform: {
let monthEntries = PersistenceController.shared.getData(startDate: Date(timeIntervalSince1970: 0), endDate: Date())
entryStartDate = monthEntries.first!.forDate!
entryEndDate = monthEntries.last!.forDate!
self.dataHolder.data = buildGridData(withData: monthEntries)
self.dataHolder.uncategorizedData = monthEntries
// filterEntries(startDate: entryStartDate, endDate: entryEndDate)
})
}
}
struct StatsSubView: View {
let data: [MoodEntry]
let mood: Mood
var body: some View {
VStack {
Text(String(Stats.getCountFor(moodType: mood,
inData: data)))
.font(.title)
Text(mood.strValue)
.foregroundColor(mood.color)
}
}
}
private var statsView: some View {
ZStack {
Color(UIColor.secondarySystemBackground)
HStack {
Spacer()
ForEach(Mood.allValues.reversed(), id: \.self) { mood in
StatsSubView(data: self.dataHolder.uncategorizedData, mood: mood)
Spacer()
}
}
}
.cornerRadius(25)
.padding()
}
private var filterView: some View {
VStack {
VStack {
ZStack {
Color(UIColor.secondarySystemBackground)
DatePicker(
"Start Date",
selection: $entryStartDate,
displayedComponents: [.date]
).onChange(of: entryStartDate, perform: { value in
filterEntries(startDate: self.entryStartDate, endDate: self.entryEndDate)
})
.padding()
}
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25)
.padding([.leading, .trailing])
ZStack {
Color(UIColor.secondarySystemBackground)
DatePicker(
"End Date",
selection: $entryEndDate,
displayedComponents: [.date]
).onChange(of: entryStartDate, perform: { value in
filterEntries(startDate: self.entryStartDate, endDate: self.entryEndDate)
})
.padding()
}
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25)
.padding([.leading, .trailing])
ZStack {
Color(UIColor.secondarySystemBackground)
HStack {
Spacer()
ForEach(weekdays.indices, id: \.self) { dayIdx in
let day = String(weekdays[dayIdx].0)
let value = weekdays[dayIdx].1
Button(day.capitalized, action: {
if let index = selectedDays.firstIndex(of: value) {
selectedDays.remove(at: index)
} else {
selectedDays.append(value)
}
filterEntries(startDate: entryStartDate, endDate: entryEndDate)
})
.frame(maxWidth: .infinity)
.foregroundColor(selectedDays.contains(value) || selectedDays.isEmpty ? .green : .red)
}
Spacer()
}
}
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25)
.padding([ .leading, .trailing])
}
}
}
private var monthsHeader: some View {
LazyVGrid(columns: columns, spacing: 0) {
ForEach(months, id: \.self.0) { item in
Text(item.1)
.textCase(.uppercase)
}
}.padding([.leading, .trailing, .top])
}
private var gridView: some View {
VStack {
Text("Total: \(self.dataHolder.numberOfRatings)")
.font(.title2)
monthsHeader
.cornerRadius(25)
.padding([.leading, .trailing])
VStack {
ScrollView {
ForEach(Array(self.dataHolder.data.keys.sorted(by: >)), id: \.self) { yearKey in
let yearData = self.dataHolder.data[yearKey]!
Text(String(yearKey))
.font(.title)
yearGridView(yearData: yearData, columns: columns)
}
}
.padding()
}
}
}
private struct yearGridView: View {
let yearData: [Int: [DayChartView]]
let columns: [GridItem]
var body: some View {
ZStack {
Color(UIColor.secondarySystemBackground)
VStack {
LazyVGrid(columns: columns, spacing: 0) {
ForEach(Array(yearData.keys.sorted(by: <)), id: \.self) { monthKey in
let monthData = yearData[monthKey]!
VStack {
monthGridView(monthData: monthData)
}
}
}
.padding([.leading, .trailing, .top, .bottom])
}
}
.cornerRadius(25)
}
}
private struct monthGridView: View {
let monthData: [DayChartView]
var body: some View {
VStack {
ForEach(monthData, id: \.self) { view in
view
}
}
}
}
}
struct FilterView_Previews: PreviewProvider {
static var previews: some View {
Group {
FilterView()
FilterView()
.preferredColorScheme(.dark)
}
}
}

130
Shared/views/GraphView.swift
View File

@@ -8,9 +8,137 @@
import Foundation
import SwiftUI
import CoreData
import Charts
struct GraphView: View {
var body: some View {
Text("this is a graph")
ZStack {
Color(UIColor.secondarySystemBackground)
VStack {
VStack {
HStack {
ZStack {
Color(UIColor.systemBackground)
BarChartGraph(entries: [
BarChartDataEntry(x: 1, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 2, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 3, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
])
}
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.padding()
ZStack {
Color(UIColor.systemBackground)
BarChartGraph(entries: [
BarChartDataEntry(x: 1, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 2, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 3, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
])
}
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.padding()
}
ZStack {
Color(UIColor.systemBackground)
BarChartGraph(entries: [
BarChartDataEntry(x: 1, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 2, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 3, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
])
}.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.padding()
ZStack {
Color(UIColor.systemBackground)
BarChartGraph(entries: [
BarChartDataEntry(x: 1, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 2, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 3, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
])
}.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.padding()
}
}
}
}
}
struct BarChartGraph: UIViewRepresentable {
//Bar chart accepts data as array of BarChartDataEntry objects
var entries : [BarChartDataEntry]
// this func is required to conform to UIViewRepresentable protocol
func makeUIView(context: Context) -> BarChartView {
//crate new chart
let chart = BarChartView()
chart.drawGridBackgroundEnabled = false
chart.drawValueAboveBarEnabled = false
chart.xAxis.drawAxisLineEnabled = false
chart.xAxis.labelTextColor = .clear
chart.rightAxis.drawAxisLineEnabled = false
chart.rightAxis.labelTextColor = .clear
chart.leftAxis.drawAxisLineEnabled = false
chart.leftAxis.labelTextColor = .clear
chart.xAxis.drawGridLinesEnabled = false
chart.leftAxis.drawGridLinesEnabled = false
chart.leftAxis.axisLineColor = .clear
chart.rightAxis.axisLineColor = .clear
chart.legend.textColor = .clear
chart.legend.enabled = false
chart.drawBordersEnabled = false
chart.drawMarkers = false
// chart.yAxis.drawGridLinesEnabled = false
chart.rightAxis.drawGridLinesEnabled = false
chart.borderColor = .clear
//it is convenient to form chart data in a separate func
chart.data = addData()
return chart
}
// this func is required to conform to UIViewRepresentable protocol
func updateUIView(_ uiView: BarChartView, context: Context) {
//when data changes chartd.data update is required
uiView.data = addData()
}
func addData() -> BarChartData{
let data = BarChartData()
//BarChartDataSet is an object that contains information about your data, styling and more
let dataSet = BarChartDataSet(entries: entries)
// change bars color to green
dataSet.colors = [NSUIColor.green]
//change data label
data.append(dataSet)
return data
}
typealias UIViewType = BarChartView
}
struct GraphView_Previews: PreviewProvider {
static var previews: some View {
Group {
GraphView()
GraphView()
.preferredColorScheme(.dark)
}
}
}

2
Shared/views/HeaderStatsView.swift
View File

@@ -58,7 +58,7 @@ struct HeaderStatsView : UIViewRepresentable {
// change bars color to green
dataSet.colors = [NSUIColor.green]
//change data label
data.addDataSet(dataSet)
data.append(dataSet)
return data
}

88
Shared/views/SettingsView.swift
View File

@@ -10,47 +10,32 @@ import SwiftUI
struct SettingsView: View {
@Environment(\.dismiss) var dismiss
@State private var currentDate = Date() {
@AppStorage("notificationDate") private var notificationDate = Date() {
didSet {
if self.showReminder {
LocalNotification.scheduleReminder(atTime: self.currentDate)
LocalNotification.scheduleReminder(atTime: self.notificationDate)
}
}
}
@State private var showReminder: Bool = false {
didSet {
if self.showReminder {
LocalNotification.testIfEnabled(completion: { result in
switch result{
case .success(_):
LocalNotification.scheduleReminder(atTime: self.currentDate)
case .failure(_):
// show error
break
}
})
} else {
LocalNotification.removeNotificaiton()
}
}
}
@AppStorage("showReminder") private var showReminder: Bool = false
var body: some View { ZStack {
Color(UIColor.secondarySystemBackground)
VStack {
closeButtonView
.padding()
notificationCell
randomShitCell
addTestDataCell
clearDB
whyBackgroundMode
Spacer()
var body: some View {
ZStack {
Color(UIColor.secondarySystemBackground)
VStack {
closeButtonView
.padding()
notificationCell
randomShitCell
addTestDataCell
clearDB
whyBackgroundMode
Spacer()
}
.padding()
}
.padding()
}
}
private var closeButtonView: some View {
@@ -71,8 +56,14 @@ struct SettingsView: View {
Color(UIColor.systemBackground)
VStack {
Toggle("Would you like to be reminded?", isOn: $showReminder)
.onChange(of: showReminder, perform: { value in
self.maybeNotificaiotns(areEnabled: value)
})
.padding()
DatePicker("", selection: $currentDate, displayedComponents: .hourAndMinute)
DatePicker("", selection: $notificationDate, displayedComponents: .hourAndMinute)
.onChange(of: notificationDate, perform: { value in
self.updateNotificationTimes(toDate: value)
})
.disabled(showReminder == false)
.padding()
}
@@ -85,7 +76,11 @@ struct SettingsView: View {
ZStack {
Color(UIColor.systemBackground)
VStack {
Text("random shit")
Button(action: {
}, label: {
Text("Special thanks to")
})
.padding()
}
}
@@ -130,6 +125,29 @@ struct SettingsView: View {
.fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
}
private func updateNotificationTimes(toDate date: Date) {
LocalNotification.removeNotificaiton()
LocalNotification.scheduleReminder(atTime: date)
}
private func maybeNotificaiotns(areEnabled: Bool) {
if areEnabled {
LocalNotification.testIfEnabled(completion: { result in
switch result{
case .success(_):
LocalNotification.scheduleReminder(atTime: self.notificationDate)
case .failure(let error):
print(error)
// show error
break
}
})
} else {
LocalNotification.removeNotificaiton()
}
}
}
struct SettingsView_Previews: PreviewProvider {