Fix background color

aheze · aheze · commit a3a68e3a9910 · 2023-04-28T21:42:19.000-07:00
diff --git a/Sources/SettingEnvironment.swift b/Sources/SettingEnvironment.swift
@@ -20,22 +20,22 @@ private struct AccentColorKey: EnvironmentKey {
     static let defaultValue = Color.accentColor
 }
 
-private struct SecondaryBackgroundColorKey: EnvironmentKey {
+private struct BackgroundColorKey: EnvironmentKey {
     static let defaultValue: Color = {
         #if os(iOS)
-            return Color(uiColor: .secondarySystemGroupedBackground)
+            return Color(uiColor: .systemGroupedBackground)
         #else
-            return Color(nsColor: .textBackgroundColor)
+            return Color(nsColor: .windowBackgroundColor)
         #endif
     }()
 }
 
-private struct BackgroundColorKey: EnvironmentKey {
+private struct SecondaryBackgroundColorKey: EnvironmentKey {
     static let defaultValue: Color = {
         #if os(iOS)
-            return Color(uiColor: .systemGroupedBackground)
+            return Color(uiColor: .secondarySystemGroupedBackground)
         #else
-            return Color(nsColor: .windowBackgroundColor)
+            return Color(nsColor: .textBackgroundColor)
         #endif
     }()
 }
@@ -60,44 +60,43 @@ extension EnvironmentValues {
     }
 
     /// For outer views.
-    var settingSecondaryBackgroundColor: Color {
-        get { self[SecondaryBackgroundColorKey.self] }
-        set { self[SecondaryBackgroundColorKey.self] = newValue }
-    }
-
-    /// For inner views.
     var settingBackgroundColor: Color {
         get { self[BackgroundColorKey.self] }
         set { self[BackgroundColorKey.self] = newValue }
     }
-}
 
+    /// For inner views.
+    var settingSecondaryBackgroundColor: Color {
+        get { self[SecondaryBackgroundColorKey.self] }
+        set { self[SecondaryBackgroundColorKey.self] = newValue }
+    }
+}
 
-//var settingPrimaryColor: Color {
+// var settingPrimaryColor: Color {
 //    get { self[PrimaryColorKey.self] }
 //    set { self[PrimaryColorKey.self] = newValue }
-//}
+// }
 //
 ///// For secondary labels.
-//var settingSecondaryColor: Color {
+// var settingSecondaryColor: Color {
 //    get { self[SecondaryColorKey.self] }
 //    set { self[SecondaryColorKey.self] = newValue }
-//}
+// }
 //
 ///// For buttons.
-//var settingAccentColor: Color {
+// var settingAccentColor: Color {
 //    get { self[AccentColorKey.self] }
 //    set { self[AccentColorKey.self] = newValue }
-//}
+// }
 //
 ///// For outer views.
-//var settingSecondaryBackgroundColor: Color {
+// var settingSecondaryBackgroundColor: Color {
 //    get { self[SecondaryBackgroundColorKey.self] }
 //    set { self[SecondaryBackgroundColorKey.self] = newValue }
-//}
+// }
 //
 ///// For inner views.
-//var settingBackgroundColor: Color {
+// var settingBackgroundColor: Color {
 //    get { self[BackgroundColorKey.self] }
 //    set { self[BackgroundColorKey.self] = newValue }
-//}
+// }
diff --git a/Sources/Views/SettingGroup.swift b/Sources/Views/SettingGroup.swift
@@ -49,7 +49,7 @@ public struct SettingGroup: Setting {
 }
 
 public struct SettingGroupView<Content: View>: View {
-    @Environment(\.settingBackgroundColor) var settingBackgroundColor
+    @Environment(\.settingSecondaryBackgroundColor) var settingSecondaryBackgroundColor
     @Environment(\.settingSecondaryColor) var settingSecondaryColor
 
     public var icon: SettingIcon?
@@ -117,7 +117,7 @@ public struct SettingGroupView<Content: View>: View {
             ) {
                 content()
             }
-            .background(backgroundColor ?? settingBackgroundColor)
+            .background(backgroundColor ?? settingSecondaryBackgroundColor)
             .cornerRadius(backgroundCornerRadius)
 
             if let footer {
diff --git a/Sources/Views/SettingPage.swift b/Sources/Views/SettingPage.swift
@@ -98,7 +98,7 @@ public extension SettingPage {
 }
 
 struct SettingPageView<Content>: View where Content: View {
-    @Environment(\.settingSecondaryBackgroundColor) var settingSecondaryBackgroundColor
+    @Environment(\.settingBackgroundColor) var settingBackgroundColor
 
     var title: String
     var spacing = CGFloat(20)
@@ -143,7 +143,7 @@ struct SettingPageView<Content>: View where Content: View {
                 .padding(.vertical, verticalPadding)
             }
             .scrollDismissesKeyboard(.interactively)
-            .background(backgroundColor)
+            .background(backgroundColor ?? settingBackgroundColor)
             .navigationTitle(title)
         } else {
             ScrollView {
@@ -153,7 +153,7 @@ struct SettingPageView<Content>: View where Content: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .padding(.vertical, verticalPadding)
             }
-            .background(backgroundColor ?? settingSecondaryBackgroundColor)
+            .background(backgroundColor ?? settingBackgroundColor)
             .navigationTitle(title)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public struct SettingGroup: Setting {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public struct SettingGroupView<Content: View>: View {`
`52`		`- @Environment(\.settingBackgroundColor) var settingBackgroundColor`
	`52`	`+ @Environment(\.settingSecondaryBackgroundColor) var settingSecondaryBackgroundColor`
`53`	`53`	`@Environment(\.settingSecondaryColor) var settingSecondaryColor`
`54`	`54`
`55`	`55`	`public var icon: SettingIcon?`
`@@ -117,7 +117,7 @@ public struct SettingGroupView<Content: View>: View {`
`117`	`117`	`) {`
`118`	`118`	`content()`
`119`	`119`	`}`
`120`		`- .background(backgroundColor ?? settingBackgroundColor)`
	`120`	`+ .background(backgroundColor ?? settingSecondaryBackgroundColor)`
`121`	`121`	`.cornerRadius(backgroundCornerRadius)`
`122`	`122`
`123`	`123`	`if let footer {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public extension SettingPage {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`struct SettingPageView<Content>: View where Content: View {`
`101`		`- @Environment(\.settingSecondaryBackgroundColor) var settingSecondaryBackgroundColor`
	`101`	`+ @Environment(\.settingBackgroundColor) var settingBackgroundColor`
`102`	`102`
`103`	`103`	`var title: String`
`104`	`104`	`var spacing = CGFloat(20)`
`@@ -143,7 +143,7 @@ struct SettingPageView<Content>: View where Content: View {`
`143`	`143`	`.padding(.vertical, verticalPadding)`
`144`	`144`	`}`
`145`	`145`	`.scrollDismissesKeyboard(.interactively)`
`146`		`- .background(backgroundColor)`
	`146`	`+ .background(backgroundColor ?? settingBackgroundColor)`
`147`	`147`	`.navigationTitle(title)`
`148`	`148`	`} else {`
`149`	`149`	`ScrollView {`
`@@ -153,7 +153,7 @@ struct SettingPageView<Content>: View where Content: View {`
`153`	`153`	`.frame(maxWidth: .infinity, alignment: .leading)`
`154`	`154`	`.padding(.vertical, verticalPadding)`
`155`	`155`	`}`
`156`		`- .background(backgroundColor ?? settingSecondaryBackgroundColor)`
	`156`	`+ .background(backgroundColor ?? settingBackgroundColor)`
`157`	`157`	`.navigationTitle(title)`
`158`	`158`	`}`
`159`	`159`	`}`