diff --git a/Shared/AppDelegate.swift b/Shared/AppDelegate.swift index 4d00513..58511c8 100644 --- a/Shared/AppDelegate.swift +++ b/Shared/AppDelegate.swift @@ -15,11 +15,12 @@ import Firebase class AppDelegate: NSObject, UIApplicationDelegate { private let savedOnboardingData = UserDefaultsStore.getOnboarding() @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor - + func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { -// PersistenceController.shared.clearDB() -// PersistenceController.shared.deleteLast(numberOfEntries: 5) -// GroupUserDefaults.groupDefaults.set(false, forKey: UserDefaultsStore.Keys.showNSFW.rawValue) + // PersistenceController.shared.clearDB() + // PersistenceController.shared.deleteLast(numberOfEntries: 5) +// PersistenceController.shared.deleteRandomFromLast(numberOfEntries: 10) + // GroupUserDefaults.groupDefaults.set(false, forKey: UserDefaultsStore.Keys.showNSFW.rawValue) FirebaseApp.configure() PersistenceController.shared.removeNoForDates() diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json b/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json deleted file mode 100644 index 142b7c8..0000000 --- a/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "images" : [ - { - "filename" : "xmark-solid.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "xmark-solid@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "xmark-solid@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid.png b/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid.png deleted file mode 100644 index 686a37b..0000000 Binary files a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid.png and /dev/null differ diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@2x.png b/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@2x.png deleted file mode 100644 index 83ab452..0000000 Binary files a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@2x.png and /dev/null differ diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@3x.png b/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@3x.png deleted file mode 100644 index 00c61b2..0000000 Binary files a/Shared/Assets.xcassets/default_image/missing.imageset/xmark-solid@3x.png and /dev/null differ diff --git a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png index 686a37b..35e7d26 100644 Binary files a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png and b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png differ diff --git a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png index 83ab452..886e582 100644 Binary files a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png and b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png differ diff --git a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png index 00c61b2..cb9551a 100644 Binary files a/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png and b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png differ diff --git a/Shared/Persisence/PersistenceDELETE.swift b/Shared/Persisence/PersistenceDELETE.swift index 59bc3bc..dbc5172 100644 --- a/Shared/Persisence/PersistenceDELETE.swift +++ b/Shared/Persisence/PersistenceDELETE.swift @@ -29,4 +29,16 @@ extension PersistenceController { } try! viewContext.save() } + + func deleteRandomFromLast(numberOfEntries: Int) { + let entries = PersistenceController.shared.getData(startDate: Calendar.current.date(byAdding: .day, value: -numberOfEntries, to: Date())!, + endDate: Date(), + includedDays: []) + for entry in entries { + if Bool.random() { + viewContext.delete(entry) + } + } + try! viewContext.save() + } } diff --git a/Shared/views/MonthView/MonthDetailView.swift b/Shared/views/MonthView/MonthDetailView.swift index 309f21a..94b9f27 100644 --- a/Shared/views/MonthView/MonthDetailView.swift +++ b/Shared/views/MonthView/MonthDetailView.swift @@ -167,29 +167,27 @@ struct MonthDetailView: View { Text(" ") .font(.title3) .foregroundColor(Mood.placeholder.color) + + Circle() + .frame(minWidth: 5, + maxWidth: 50, + minHeight: 5, + maxHeight: 50, + alignment: .center) + .foregroundColor(moodTint.color(forMood: entry.mood)) } else { Text(entry.forDate!, format: Date.FormatStyle().day()) .font(.title3) .foregroundColor(textColor) - } - - if entry.mood == .placeholder { - Circle() - .frame(minWidth: 5, - maxWidth: 500, - minHeight: 5, - maxHeight: 500, - alignment: .center) - .foregroundColor(moodTint.color(forMood: entry.mood)) - } else { + entry.mood.icon .resizable() - .aspectRatio(contentMode: .fit) + .scaledToFit() .frame(minWidth: 5, - maxWidth: 500, + maxWidth: 50, minHeight: 5, - maxHeight: 500, + maxHeight: 50, alignment: .center) .foregroundColor(moodTint.color(forMood: entry.mood)) }