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

Merge branch 'develop' into iap

Browse Source
This commit is contained in:
Trey t
2022-07-17 10:58:17 -05:00
parent bd238e5743 ef0cfbd2cf
commit 044e0bb027
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
FeelsWidget/FeelsWidget.swift
View File

@@ -30,16 +30,14 @@ class WatchTimelineView: Identifiable {
struct TimeLineCreator { struct TimeLineCreator {
static func createViews(daysBack: Int) -> [WatchTimelineView] { static func createViews(daysBack: Int) -> [WatchTimelineView] {
var timeLineView = [WatchTimelineView]() var timeLineView = [WatchTimelineView]()
var startDayOffset = 0
if !ShowBasedOnVoteLogics.passedTodaysVotingUnlock(voteDate: UserDefaultsStore.getOnboarding().date) { let latestDayToShow = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: UserDefaultsStore.getOnboarding())
startDayOffset = 1 let dates = Array(0...daysBack).map({
} Calendar.current.date(byAdding: .day, value: -$0, to: latestDayToShow)!
})
for day in startDayOffset..<daysBack{ for date in dates {
let day = Calendar.current.date(byAdding: .day, value: -day, to: Date())! let dayStart = Calendar.current.startOfDay(for: date)
let dayStart = Calendar.current.startOfDay(for: day)
let dayEnd = Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: dayStart)! let dayEnd = Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: dayStart)!
let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable() let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable()
let moodImages: MoodImagable.Type = UserDefaultsStore.moodMoodImagable() let moodImages: MoodImagable.Type = UserDefaultsStore.moodMoodImagable()
@@ -58,6 +56,7 @@ struct TimeLineCreator {
secondaryColor: moodTint.secondary(forMood: .missing))) secondaryColor: moodTint.secondary(forMood: .missing)))
} }
} }
timeLineView = timeLineView.sorted(by: { $0.date > $1.date }) timeLineView = timeLineView.sorted(by: { $0.date > $1.date })
return timeLineView return timeLineView
} }