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

fix issue with two votes on the same date

Browse Source 
fix issue with header not showing correct vote date
split logic for Persistence into different files
create class that deals with voting time, existing votes, and what should be shown based on that
This commit is contained in:
Trey t
2022-02-17 14:46:11 -06:00
parent f0ed56fe94
commit 675e44bca9
12 changed files with 547 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Feels.xcodeproj/project.pbxproj
View File

@@ -27,6 +27,16 @@
1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */; };
1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */; };
1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */; };
1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; };
1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; };
1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */; };
1C4FF3C027BEE06900BE8F34 /* PersistenceGET.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */; };
1C4FF3C127BEE06900BE8F34 /* PersistenceGET.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */; };
1C4FF3C327BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */; };
1C4FF3C427BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */; };
1C4FF3C727BEE09E00BE8F34 /* PersistenceADD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */; };
1C4FF3C827BEE09E00BE8F34 /* PersistenceADD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */; };
1C4FF3C927BEE0C300BE8F34 /* PersistenceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */; };
1C5F4976279C84090092F1B4 /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; };
1C5F4978279C945E0092F1B4 /* UserDefaultsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */; };
1C683FCA2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
@@ -149,6 +159,11 @@
1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentStreakTemplate.swift; sourceTree = "<group>"; };
1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthTotalTemplate.swift; sourceTree = "<group>"; };
1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekTotalTemplate.swift; sourceTree = "<group>"; };
1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowBasedOnVoteLogics.swift; sourceTree = "<group>"; };
1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceHelper.swift; sourceTree = "<group>"; };
1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceGET.swift; sourceTree = "<group>"; };
1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceDELETE.swift; sourceTree = "<group>"; };
1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceADD.swift; sourceTree = "<group>"; };
1C5F4975279C84090092F1B4 /* OnboardingData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingData.swift; sourceTree = "<group>"; };
1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsStore.swift; sourceTree = "<group>"; };
1C683FC92792281400745862 /* Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stats.swift; sourceTree = "<group>"; };
@@ -275,6 +290,18 @@
path = SharingTemplates;
sourceTree = "<group>";
};
1C4FF3C527BEE07800BE8F34 /* Persisence */ = {
isa = PBXGroup;
children = (
1CD90AEF278C7DDF001C4FEA /* Persistence.swift */,
1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */,
1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */,
1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */,
1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */,
);
path = Persisence;
sourceTree = "<group>";
};
1CA03771279A291F00D26164 /* Onboarding */ = {
isa = PBXGroup;
children = (
@@ -345,9 +372,10 @@
1C744F2B278CE15600953A57 /* AppDelegate.swift */,
1CC469A9278F30A0003E0C6E /* BGTask.swift */,
1CD90B75278C8119001C4FEA /* LocalNotification.swift */,
1CD90AEF278C7DDF001C4FEA /* Persistence.swift */,
1C4FF3C527BEE07800BE8F34 /* Persisence */,
1CD90B5C278C7EAD001C4FEA /* Random.swift */,
1C683FC92792281400745862 /* Stats.swift */,
1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */,
1CA03771279A291F00D26164 /* Onboarding */,
1C26190127960CDA00FDC148 /* Protocols */,
1CAD602A27A5C1C800C520BD /* Views */,
@@ -639,6 +667,7 @@
1CAD603C27A5C1C800C520BD /* HeaderStatsView.swift in Sources */,
1CAD603827A5C1C800C520BD /* AddMoodHeaderView.swift in Sources */,
1CA0377C279B605000D26164 /* OnboardingWrapup.swift in Sources */,
1C4FF3C327BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */,
1CA03775279A294800D26164 /* OnboardingDay.swift in Sources */,
1CAD603727A5C1C800C520BD /* FilterView.swift in Sources */,
1C683FCA2792281400745862 /* Stats.swift in Sources */,
@@ -646,6 +675,7 @@
1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */,
1C358FB627B0AE15002C83A6 /* AllMoodsTotalTemplate.swift in Sources */,
1CD90B16278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */,
1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */,
1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */,
1CAD603B27A5C1C800C520BD /* ContentView.swift in Sources */,
1C5F4976279C84090092F1B4 /* OnboardingData.swift in Sources */,
@@ -658,6 +688,8 @@
1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */,
1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */,
1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */,
1C4FF3C727BEE09E00BE8F34 /* PersistenceADD.swift in Sources */,
1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */,
1CAD603527A5C1C800C520BD /* SettingsView.swift in Sources */,
1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
1CC469AC27907D48003E0C6E /* DayChartView.swift in Sources */,
@@ -677,6 +709,7 @@
1CD90B18278C7DE0001C4FEA /* FeelsApp.swift in Sources */,
1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */,
1CA03777279A295600D26164 /* OnboardingTitle.swift in Sources */,
1C4FF3C027BEE06900BE8F34 /* PersistenceGET.swift in Sources */,
1CEC967127B9C2BB00CC8688 /* CustomIcon.swift in Sources */,
1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */,
1C02589C27B9677A00EB91AC /* CreateIconView.swift in Sources */,
@@ -722,6 +755,8 @@
files = (
1CD90B65278C7EBA001C4FEA /* Mood.swift in Sources */,
1CEC967227B9C9FB00CC8688 /* IconView.swift in Sources */,
1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */,
1C4FF3C927BEE0C300BE8F34 /* PersistenceHelper.swift in Sources */,
1CA2662D2793908700C0E12C /* Persistence.swift in Sources */,
1CD90B5F278C7EAD001C4FEA /* Random.swift in Sources */,
1CD90B68278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */,
@@ -731,6 +766,9 @@
1C683FCB2792281400745862 /* Stats.swift in Sources */,
1CEC967327B9CA0C00CC8688 /* CustomIcon.swift in Sources */,
1C10E25027A1AB220047948B /* OnboardingDay.swift in Sources */,
1C4FF3C427BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */,
1C4FF3C827BEE09E00BE8F34 /* PersistenceADD.swift in Sources */,
1C4FF3C127BEE06900BE8F34 /* PersistenceGET.swift in Sources */,
1C10E24F27A1AB1D0047948B /* OnboardingData.swift in Sources */,
1CD90B52278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
1CD90B4D278C7E7A001C4FEA /* FeelsWidget.swift in Sources */,