From c25fc69de2a8bfe886d9a2dd093cd29ea7a872af Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 6 Mar 2022 13:38:47 -0600 Subject: [PATCH] update text to use user chosen text color --- Shared/views/CustomizeView/CustomizeView.swift | 3 +++ .../views/SharingTemplates/AllMoodsTotalTemplate.swift | 10 +++++----- .../views/SharingTemplates/LongestStreakTemplate.swift | 3 ++- Shared/views/SharingTemplates/MonthTotalTemplate.swift | 6 +++--- Shared/views/SmallRollUpHeaderView.swift | 4 +++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Shared/views/CustomizeView/CustomizeView.swift b/Shared/views/CustomizeView/CustomizeView.swift index 1138294..9e639c5 100644 --- a/Shared/views/CustomizeView/CustomizeView.swift +++ b/Shared/views/CustomizeView/CustomizeView.swift @@ -127,6 +127,8 @@ struct CustomizeView: View { .stroke(Color(UIColor.systemGray), style: StrokeStyle(lineWidth: 2)) ) Text(aTheme.title) + .foregroundColor(textColor) + .font(.body) } }) .contentShape(Rectangle()) @@ -179,6 +181,7 @@ struct CustomizeView: View { .cornerRadius(10) Text("[How to add widget](https://support.apple.com/guide/iphone/add-widgets-iphb8f1bf206/ios)") + .accentColor(textColor) .padding(.bottom) } } diff --git a/Shared/views/SharingTemplates/AllMoodsTotalTemplate.swift b/Shared/views/SharingTemplates/AllMoodsTotalTemplate.swift index d80a74f..487c8d1 100644 --- a/Shared/views/SharingTemplates/AllMoodsTotalTemplate.swift +++ b/Shared/views/SharingTemplates/AllMoodsTotalTemplate.swift @@ -20,7 +20,7 @@ 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 + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .white @StateObject private var shareImage = StupidAssShareObservableObject() private var entries = [MoodMetrics]() @@ -77,7 +77,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate { .scaledToFill() .minimumScaleFactor(0.5) .lineLimit(1) - .foregroundColor(Color(UIColor.white)) + .foregroundColor(textColor) .padding(2) } } @@ -95,7 +95,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate { .scaledToFill() .minimumScaleFactor(0.5) .lineLimit(1) - .foregroundColor(Color(UIColor.white)) + .foregroundColor(textColor) .padding(2) } } @@ -115,7 +115,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate { .scaledToFill() .minimumScaleFactor(0.5) .lineLimit(1) - .foregroundColor(Color(UIColor.white)) + .foregroundColor(textColor) .padding(2) } } @@ -141,8 +141,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate { mood.icon .resizable() .aspectRatio(contentMode: .fit) - .foregroundColor(.white) .padding(9) + .foregroundColor(textColor) ) } } diff --git a/Shared/views/SharingTemplates/LongestStreakTemplate.swift b/Shared/views/SharingTemplates/LongestStreakTemplate.swift index 6e05c7c..71b7ebd 100644 --- a/Shared/views/SharingTemplates/LongestStreakTemplate.swift +++ b/Shared/views/SharingTemplates/LongestStreakTemplate.swift @@ -33,7 +33,7 @@ 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 + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .white let columns = [ GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center), @@ -124,6 +124,7 @@ struct LongestStreakTemplate: View, SharingTemplate { .resizable() .aspectRatio(contentMode: .fit) .frame(width: 75, height: 75) + .foregroundColor(moodTint.color(forMood: selectedMood)) VStack { Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter) diff --git a/Shared/views/SharingTemplates/MonthTotalTemplate.swift b/Shared/views/SharingTemplates/MonthTotalTemplate.swift index e54dd27..7d44c3c 100644 --- a/Shared/views/SharingTemplates/MonthTotalTemplate.swift +++ b/Shared/views/SharingTemplates/MonthTotalTemplate.swift @@ -25,7 +25,7 @@ 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 + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .white private var moodMetrics = [MoodMetrics]() private var moodEntries = [MoodEntry]() @@ -92,7 +92,7 @@ struct MonthTotalTemplate: View, SharingTemplate { .fontWeight(.bold) .minimumScaleFactor(0.5) .lineLimit(1) - .foregroundColor(Color(UIColor.white)) + .foregroundColor(textColor) .padding(5) } .frame(maxWidth: .infinity, alignment: .center) @@ -119,7 +119,7 @@ struct MonthTotalTemplate: View, SharingTemplate { mood.icon .resizable() .aspectRatio(contentMode: .fit) - .foregroundColor(.white) + .foregroundColor(textColor) .padding(9) ) } diff --git a/Shared/views/SmallRollUpHeaderView.swift b/Shared/views/SmallRollUpHeaderView.swift index aaf0198..7f3f059 100644 --- a/Shared/views/SmallRollUpHeaderView.swift +++ b/Shared/views/SmallRollUpHeaderView.swift @@ -10,6 +10,8 @@ import SwiftUI struct SmallRollUpHeaderView: View { @Binding var viewType: MainSwitchableViewType @AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default + + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .black let entries: [MoodEntry] private var moodMetrics = [MoodMetrics]() @@ -63,7 +65,7 @@ struct SmallRollUpHeaderView: View { .fontWeight(.bold) .lineLimit(1) .clipShape(ContainerRelativeShape()) - .foregroundColor(Color(UIColor.white)) + .foregroundColor(textColor) .minimumScaleFactor(0.7) ) }