Merge pull request macadmins#323 from macadmins/differentiateWithoutC…

…olor differentiateWithoutColor for .red color scheme
Dmachine44 · Feb 24, 2022 · ed3afa1 · ed3afa1
2 parents bb5c752 + a0ec446
commit ed3afa1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/Nudge/UI/Common/DeferView.swift b/Nudge/UI/Common/DeferView.swift
@@ -13,6 +13,7 @@ struct DeferView: View {
     @ObservedObject var viewObserved: ViewState
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     @State var nudgeCustomEventDate = Date()
 
@@ -26,7 +27,7 @@ struct DeferView: View {
                     Image(systemName: "xmark.circle")
                         .resizable()
                         .frame(width: 20, height: 20)
-                        .foregroundColor(.red)
+                        .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                 }
                 .keyboardShortcut(.escape)
                 .buttonStyle(.plain)

diff --git a/Nudge/UI/Common/DeviceInfo.swift b/Nudge/UI/Common/DeviceInfo.swift
@@ -11,6 +11,7 @@ import SwiftUI
 // Sheet view for Device Information
 struct DeviceInfo: View {
     @Environment(\.presentationMode) var presentationMode
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     // State variables
     @State var systemConsoleUsername = Utils().getSystemConsoleUsername()
@@ -28,7 +29,7 @@ struct DeviceInfo: View {
                     Image(systemName: "xmark.circle")
                         .resizable()
                         .frame(width: 20, height: 20)
-                        .foregroundColor(.red)
+                        .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                 }
                 .buttonStyle(.plain)
                 .help("Click to close".localized(desiredLanguage: getDesiredLanguage()))

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -14,6 +14,7 @@ struct SimpleMode: View {
     // Get the color scheme so we can dynamically change properties
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.openURL) var openURL
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     let bottomPadding: CGFloat = 10
     let contentWidthPadding: CGFloat = 25
@@ -50,12 +51,12 @@ struct SimpleMode: View {
                     } else if viewObserved.daysRemaining == 0 && !Utils().demoModeEnabled() {
                             Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                             Text(String(viewObserved.hoursRemaining))
-                                .foregroundColor(.red)
+                                .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                                 .fontWeight(.bold)
                     } else {
                         Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                         Text(String(viewObserved.daysRemaining))
-                            .foregroundColor(.red)
+                            .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                             .fontWeight(.bold)
 
                     }

diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift
@@ -13,6 +13,7 @@ struct StandardModeLeftSide: View {
     @ObservedObject var viewObserved: ViewState
     // Get the color scheme so we can dynamically change properties
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     let logoWidth: CGFloat = 200
     let logoHeight: CGFloat = 150
@@ -71,13 +72,13 @@ struct StandardModeLeftSide: View {
                                 Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                                 Spacer()
                                 Text(String(viewObserved.hoursRemaining))
-                                    .foregroundColor(.red)
+                                    .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                                     .fontWeight(.bold)
                         } else {
                             Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                             Spacer()
                             Text(String(viewObserved.daysRemaining))
-                                .foregroundColor(.red)
+                                .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                                 .fontWeight(.bold)
 
                         }

diff --git a/Nudge/UI/StandardMode/RightSide.swift b/Nudge/UI/StandardMode/RightSide.swift
@@ -14,6 +14,7 @@ struct StandardModeRightSide: View {
     // Get the color scheme so we can dynamically change properties
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.openURL) var openURL
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     // Modal view for screenshot and deferral info
     @State var showSSDetail = false
@@ -101,7 +102,7 @@ struct StandardModeRightSide: View {
                         Text(mainContentNote)
                             .font(.callout)
                             .fontWeight(.bold)
-                            .foregroundColor(Color.red)
+                            .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                         Spacer()
                     }
 

diff --git a/Nudge/UI/StandardMode/ScreenShotZoom.swift b/Nudge/UI/StandardMode/ScreenShotZoom.swift
@@ -12,6 +12,7 @@ import SwiftUI
 struct ScreenShotZoom: View {
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.accessibilityDifferentiateWithoutColor) var differentiateWithoutColor
 
     var body: some View {
         let darkMode = colorScheme == .dark
@@ -25,7 +26,7 @@ struct ScreenShotZoom: View {
                     Image(systemName: "xmark.circle")
                         .resizable()
                         .frame(width: 20, height: 20)
-                        .foregroundColor(.red)
+                        .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
                 }
                 .buttonStyle(.plain)
                 .help("Click to close".localized(desiredLanguage: getDesiredLanguage()))