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

update text to use user chosen text color

Browse Source
This commit is contained in:
Trey t
2022-03-06 13:38:47 -06:00
parent 7692f455c8
commit c25fc69de2
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/views/CustomizeView/CustomizeView.swift
View File

@@ -127,6 +127,8 @@ struct CustomizeView: View {
.stroke(Color(UIColor.systemGray), style: StrokeStyle(lineWidth: 2)) .stroke(Color(UIColor.systemGray), style: StrokeStyle(lineWidth: 2))
) )
Text(aTheme.title) Text(aTheme.title)
.foregroundColor(textColor)
.font(.body)
} }
}) })
.contentShape(Rectangle()) .contentShape(Rectangle())
@@ -179,6 +181,7 @@ struct CustomizeView: View {
.cornerRadius(10) .cornerRadius(10)
Text("[How to add widget](https://support.apple.com/guide/iphone/add-widgets-iphb8f1bf206/ios)") Text("[How to add widget](https://support.apple.com/guide/iphone/add-widgets-iphb8f1bf206/ios)")
.accentColor(textColor)
.padding(.bottom) .padding(.bottom)
} }
} }

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

@@ -20,7 +20,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
@Environment(\.presentationMode) var presentationMode @Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default @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.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() @StateObject private var shareImage = StupidAssShareObservableObject()
private var entries = [MoodMetrics]() private var entries = [MoodMetrics]()
@@ -77,7 +77,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
.scaledToFill() .scaledToFill()
.minimumScaleFactor(0.5) .minimumScaleFactor(0.5)
.lineLimit(1) .lineLimit(1)
.foregroundColor(Color(UIColor.white)) .foregroundColor(textColor)
.padding(2) .padding(2)
} }
} }
@@ -95,7 +95,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
.scaledToFill() .scaledToFill()
.minimumScaleFactor(0.5) .minimumScaleFactor(0.5)
.lineLimit(1) .lineLimit(1)
.foregroundColor(Color(UIColor.white)) .foregroundColor(textColor)
.padding(2) .padding(2)
} }
} }
@@ -115,7 +115,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
.scaledToFill() .scaledToFill()
.minimumScaleFactor(0.5) .minimumScaleFactor(0.5)
.lineLimit(1) .lineLimit(1)
.foregroundColor(Color(UIColor.white)) .foregroundColor(textColor)
.padding(2) .padding(2)
} }
} }
@@ -141,8 +141,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
mood.icon mood.icon
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.foregroundColor(.white)
.padding(9) .padding(9)
.foregroundColor(textColor)
) )
} }
} }

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

@@ -33,7 +33,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
@Environment(\.presentationMode) var presentationMode @Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default @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.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 = [ let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center), GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -124,6 +124,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(width: 75, height: 75) .frame(width: 75, height: 75)
.foregroundColor(moodTint.color(forMood: selectedMood))
VStack { VStack {
Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter) Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter)

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

@@ -25,7 +25,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
@Environment(\.presentationMode) var presentationMode @Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default @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.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 moodMetrics = [MoodMetrics]()
private var moodEntries = [MoodEntry]() private var moodEntries = [MoodEntry]()
@@ -92,7 +92,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
.fontWeight(.bold) .fontWeight(.bold)
.minimumScaleFactor(0.5) .minimumScaleFactor(0.5)
.lineLimit(1) .lineLimit(1)
.foregroundColor(Color(UIColor.white)) .foregroundColor(textColor)
.padding(5) .padding(5)
} }
.frame(maxWidth: .infinity, alignment: .center) .frame(maxWidth: .infinity, alignment: .center)
@@ -119,7 +119,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
mood.icon mood.icon
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.foregroundColor(.white) .foregroundColor(textColor)
.padding(9) .padding(9)
) )
} }

4
Shared/views/SmallRollUpHeaderView.swift
View File

@@ -11,6 +11,8 @@ struct SmallRollUpHeaderView: View {
@Binding var viewType: MainSwitchableViewType @Binding var viewType: MainSwitchableViewType
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default @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] let entries: [MoodEntry]
private var moodMetrics = [MoodMetrics]() private var moodMetrics = [MoodMetrics]()
@@ -63,7 +65,7 @@ struct SmallRollUpHeaderView: View {
.fontWeight(.bold) .fontWeight(.bold)
.lineLimit(1) .lineLimit(1)
.clipShape(ContainerRelativeShape()) .clipShape(ContainerRelativeShape())
.foregroundColor(Color(UIColor.white)) .foregroundColor(textColor)
.minimumScaleFactor(0.7) .minimumScaleFactor(0.7)
) )
} }