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

customize text color

Browse Source
This commit is contained in:
Trey t
2022-03-06 11:25:05 -06:00
parent 6ec0a9bb99
commit 7692f455c8
22 changed files with 225 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
@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
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .black
@StateObject private var shareImage = StupidAssShareObservableObject()
private var entries = [MoodMetrics]()
init(isPreview: Bool, startDate: Date, endDate: Date, fakeData: Bool) {
@@ -126,7 +127,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_all_moods_total_template_title"), totalEntryCount))
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()

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

@@ -23,7 +23,8 @@ struct CurrentStreakTemplate: View, SharingTemplate {
@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
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .black
let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -76,7 +77,7 @@ struct CurrentStreakTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_current_streak_template_title")))
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top)

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

@@ -33,7 +33,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
@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
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .black
let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -115,7 +116,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_longest_streak_template_title"), self.selectedMood.strValue))
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()
@@ -127,19 +128,19 @@ struct LongestStreakTemplate: View, SharingTemplate {
VStack {
Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text("-")
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text(self.moodEntries.last?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
}
@@ -168,7 +169,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
}, label: {
Text("Pick Mood")
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.padding()
})
.frame(maxWidth: .infinity, alignment: .center)

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

@@ -25,7 +25,8 @@ struct MonthTotalTemplate: View, SharingTemplate {
@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
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .black
private var moodMetrics = [MoodMetrics]()
private var moodEntries = [MoodEntry]()
@@ -104,7 +105,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(theme.currentTheme.labelColor)
.foregroundColor(textColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()