Set default color

DominikBucher12 · DominikBucher12 · commit d3993489d13c · 2024-01-23T13:20:04.000+01:00
diff --git a/Demo/iOS/EditorScreen.swift b/Demo/iOS/EditorScreen.swift
@@ -59,7 +59,7 @@ private extension EditorScreen {
             trailingButtons: {}
         ) {
             var sheet = $0
-            // sheet.colorPickers = .all
+            sheet.colorPickers = .all
             return sheet
         }
     }
diff --git a/Sources/RichTextKit/Actions/RichTextAction+Button.swift b/Sources/RichTextKit/Actions/RichTextAction+Button.swift
@@ -47,7 +47,6 @@ public extension RichTextAction {
                     .labelStyle(.iconOnly)
                     .frame(maxHeight: fillVertically ? .infinity : nil)
                     .contentShape(Rectangle())
-                    .foregroundColor(.systemSpecificTextColor)
             }
             .keyboardShortcut(for: action)
             .disabled(!context.canHandle(action))
diff --git a/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift b/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift
@@ -17,7 +17,6 @@ public extension RichTextAlignment {
      be styled and configured with plain SwiftUI.
      */
     struct Picker: View {
-        @Environment(\.colorScheme) var colorScheme
         /**
          Create a rich text alignment picker.
          
diff --git a/Sources/RichTextKit/Styles/RichTextStyle+Button.swift b/Sources/RichTextKit/Styles/RichTextStyle+Button.swift
@@ -86,7 +86,7 @@ extension View {
         if cond {
             self.foregroundStyle(Color.accentColor)
         } else {
-            self
+            self.foregroundStyle(color)
         }
     }
 }
diff --git a/Sources/RichTextKit/Styles/RichTextStyle+Toggle.swift b/Sources/RichTextKit/Styles/RichTextStyle+Toggle.swift
@@ -77,6 +77,7 @@ public extension RichTextStyle {
                 style.icon
                     .frame(maxHeight: fillVertically ? .infinity : nil)
             }
+            .foreground(Color(ColorRepresentable.textColor), if: isOn)
             .keyboardShortcut(for: style)
             .accessibilityLabel(style.title)
         }
diff --git a/Sources/RichTextKit/Styles/RichTextStyleButton.swift b/Sources/RichTextKit/Styles/RichTextStyleButton.swift
diff --git a/Sources/RichTextKit/Styles/RichTextStyleToggle.swift b/Sources/RichTextKit/Styles/RichTextStyleToggle.swift

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private extension EditorScreen {`
`59`	`59`	`trailingButtons: {}`
`60`	`60`	`) {`
`61`	`61`	`var sheet = $0`
`62`		`- // sheet.colorPickers = .all`
	`62`	`+ sheet.colorPickers = .all`
`63`	`63`	`return sheet`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ public extension RichTextAction {`
`47`	`47`	`.labelStyle(.iconOnly)`
`48`	`48`	`.frame(maxHeight: fillVertically ? .infinity : nil)`
`49`	`49`	`.contentShape(Rectangle())`
`50`		`- .foregroundColor(.systemSpecificTextColor)`
`51`	`50`	`}`
`52`	`51`	`.keyboardShortcut(for: action)`
`53`	`52`	`.disabled(!context.canHandle(action))`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ extension View {`
`86`	`86`	`if cond {`
`87`	`87`	`self.foregroundStyle(Color.accentColor)`
`88`	`88`	`} else {`
`89`		`- self`
	`89`	`+ self.foregroundStyle(color)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public extension RichTextStyle {`
`77`	`77`	`style.icon`
`78`	`78`	`.frame(maxHeight: fillVertically ? .infinity : nil)`
`79`	`79`	`}`
	`80`	`+ .foreground(Color(ColorRepresentable.textColor), if: isOn)`
`80`	`81`	`.keyboardShortcut(for: style)`
`81`	`82`	`.accessibilityLabel(style.title)`
`82`	`83`	`}`