simplify the code for accessibleRed and keep original red for X buttons

macadmins · Feb 24, 2022 · a02a1ed · a02a1ed
1 parent 7834fd3
commit a02a1ed
Show file tree

Hide file tree

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

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

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -51,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(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                                .foregroundColor(differentiateWithoutColor ? .accessibleRed : .red)
                                 .fontWeight(.bold)
                     } else {
                         Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                         Text(String(viewObserved.daysRemaining))
-                            .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                            .foregroundColor(differentiateWithoutColor ? .accessibleRed : .red)
                             .fontWeight(.bold)
 
                     }

diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift
@@ -72,13 +72,13 @@ struct StandardModeLeftSide: View {
                                 Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                                 Spacer()
                                 Text(String(viewObserved.hoursRemaining))
-                                    .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                                    .foregroundColor(differentiateWithoutColor ? .accessibleRed : .red)
                                     .fontWeight(.bold)
                         } else {
                             Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
                             Spacer()
                             Text(String(viewObserved.daysRemaining))
-                                .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                                .foregroundColor(differentiateWithoutColor ? .accessibleRed : .red)
                                 .fontWeight(.bold)
 
                         }

diff --git a/Nudge/UI/StandardMode/RightSide.swift b/Nudge/UI/StandardMode/RightSide.swift
@@ -102,7 +102,7 @@ struct StandardModeRightSide: View {
                         Text(mainContentNote)
                             .font(.callout)
                             .fontWeight(.bold)
-                            .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                            .foregroundColor(differentiateWithoutColor ? .accessibleRed : .red)
                         Spacer()
                     }
 
@@ -112,8 +112,6 @@ struct StandardModeRightSide: View {
                             HStack {
                                 Text(mainContentText.replacingOccurrences(of: "\\n", with: "\n"))
                                     .font(.callout)
-                                    .font(.body)
-                                    .fontWeight(.regular)
                                     .multilineTextAlignment(.leading)
                                 Spacer()
                             }

diff --git a/Nudge/UI/StandardMode/ScreenShotZoom.swift b/Nudge/UI/StandardMode/ScreenShotZoom.swift
@@ -12,7 +12,6 @@ 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
@@ -26,7 +25,7 @@ struct ScreenShotZoom: View {
                     Image(systemName: "xmark.circle")
                         .resizable()
                         .frame(width: 20, height: 20)
-                        .foregroundColor(differentiateWithoutColor ? Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255) : .red)
+                        .foregroundColor(.red)
                 }
                 .buttonStyle(.plain)
                 .help("Click to close".localized(desiredLanguage: getDesiredLanguage()))

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -563,6 +563,8 @@ extension FixedWidthInteger {
 }
 
 extension Color {
+    static let accessibleBlue = Color(red: 26 / 255, green: 133 / 255, blue: 255 / 255)
+    static let accessibleRed = Color(red: 230 / 255, green: 97 / 255, blue: 0 / 255)
     static let accessibleSecondaryLight = Color(red: 100 / 255, green: 100 / 255, blue: 100 / 255)
     static let accessibleSecondaryDark = Color(red: 150 / 255, green: 150 / 255, blue: 150 / 255)
 }