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

everything changed

Browse Source
This commit is contained in:
Trey t
2022-02-20 14:33:58 -06:00
parent 1cf38cb854
commit 0035f61204
50 changed files with 2155 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Shared/views/SharingTemplates/AllMoodsTotalTemplate.swift
View File

@@ -19,6 +19,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
@State var showSharingTemplate = false
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
private var entries = [MoodMetrics]()
@@ -41,16 +43,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
totalEntryCount = moodEntries?.count ?? 0
if let moodEntries = moodEntries {
for (_, mood) in Mood.allValues.enumerated() {
let moodEntries = moodEntries.filter({
Int($0.moodValue) == mood.rawValue
})
let total = moodEntries.count
let perc = (Float(total) / Float(totalEntryCount)) * 100
entries.append(MoodMetrics(mood: mood, total: total, percent: perc))
}
entries = Random.createTotalPerc(fromEntries: moodEntries)
entries = entries.sorted(by: {
$0.percent > $1.percent
})
@@ -78,7 +71,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(mood.color)
.foregroundColor(moodTint.color(forMood: mood))
}
}
@@ -86,7 +79,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
HStack {
ForEach(entries.prefix(2), id: \.mood) { model in
ZStack {
Circle().fill(model.mood.color)
Circle().fill(moodTint.color(forMood: model.mood))
Text("\(model.percent, specifier: "%.0f")%")
.font(.title)
@@ -104,7 +97,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
HStack {
ForEach(entries.suffix(3), id: \.mood) { model in
ZStack {
Circle().fill(model.mood.color)
Circle().fill(moodTint.color(forMood: model.mood))
Text("\(model.percent, specifier: "%.0f")%")
.font(.title)
@@ -124,7 +117,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
HStack {
ForEach(entries, id: \.mood) { model in
ZStack {
Circle().fill(model.mood.color)
Circle().fill(moodTint.color(forMood: model.mood))
Text("\(model.total)")
.font(.title)
@@ -144,7 +137,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_all_moods_total_template_title"), totalEntryCount))
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()
@@ -203,7 +196,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
.padding([.leading, .trailing], -20)
} else {
mainView
.padding([.leading, .trailing])
.padding([.leading, .trailing, .top])
}
}
}

12
Shared/views/SharingTemplates/CurrentStreakTemplate.swift
View File

@@ -23,7 +23,8 @@ struct CurrentStreakTemplate: View, SharingTemplate {
@State var showSharingTemplate = false
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -60,7 +61,7 @@ struct CurrentStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -72,7 +73,7 @@ struct CurrentStreakTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_current_streak_template_title")))
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top)
@@ -83,7 +84,7 @@ struct CurrentStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -141,7 +142,8 @@ struct CurrentStreakTemplate: View, SharingTemplate {
.padding([.leading, .trailing], -20)
} else {
mainView
.padding([.leading, .trailing])
.padding([.leading, .trailing, .top])
}
}
}

18
Shared/views/SharingTemplates/LongestStreakTemplate.swift
View File

@@ -33,7 +33,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
@State var showSharingTemplate = false
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -96,7 +97,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -112,26 +113,26 @@ struct LongestStreakTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_longest_streak_template_title"), self.selectedMood.strValue))
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()
HStack {
Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text("-")
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text(self.moodEntries.last?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
}
@@ -144,7 +145,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -224,7 +225,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
.padding([.leading, .trailing], -20)
} else {
mainView
.padding([.leading, .trailing])
.padding([.leading, .trailing, .top])
}
}
}

25
Shared/views/SharingTemplates/MonthTotalTemplate.swift
View File

@@ -21,6 +21,8 @@ struct MonthTotalTemplate: View, SharingTemplate {
@State var showSharingTemplate = false
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
private var moodMetrics = [MoodMetrics]()
private var moodEntries = [MoodEntry]()
@@ -59,16 +61,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
moodEntries = _moodEntries ?? [MoodEntry]()
totalEntryCount = moodEntries.count
for (_, mood) in Mood.allValues.enumerated() {
let moodEntries = moodEntries.filter({
Int($0.moodValue) == mood.rawValue
})
let total = moodEntries.count
let perc = (Float(total) / Float(totalEntryCount)) * 100
moodMetrics.append(MoodMetrics(mood: mood, total: total, percent: perc))
}
moodMetrics = Random.createTotalPerc(fromEntries: moodEntries)
moodMetrics = moodMetrics.sorted(by: {
$0.mood.rawValue > $1.mood.rawValue
})
@@ -89,7 +82,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
HStack {
ForEach(moodMetrics, id: \.mood) { model in
ZStack {
Circle().fill(model.mood.color)
Circle().fill(moodTint.color(forMood: model.mood))
Text("\(model.percent, specifier: "%.0f")%")
.font(.title)
@@ -109,7 +102,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_month_moods_total_template_title"), Random.monthName(fromMonthInt: month), moodEntries.count))
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()
@@ -119,7 +112,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -179,15 +172,15 @@ struct MonthTotalTemplate: View, SharingTemplate {
.padding([.leading, .trailing], -20)
} else {
mainView
.padding([.leading, .trailing])
.padding([.leading, .trailing, .top])
}
}
}
struct MonthTotalTemplate_Previews: PreviewProvider {
static var previews: some View {
MonthTotalTemplate(isPreview: true, startDate: Date().startOfMonth(), endDate: Date().endOfMonth(), fakeData: true)
MonthTotalTemplate(isPreview: true, startDate: Date().startOfMonth, endDate: Date().endOfMonth, fakeData: true)
MonthTotalTemplate(isPreview: false, startDate: Date().startOfMonth(), endDate: Date().endOfMonth(), fakeData: true)
MonthTotalTemplate(isPreview: false, startDate: Date().startOfMonth, endDate: Date().endOfMonth, fakeData: true)
}
}