Use system theme

Author: Cavallando

Sources/CommandBarIOS/Components/Buttons/Button.swift

@@ -1,21 +1,23 @@
 import SwiftUI
 
 struct CMDButton: View {
+    @Environment(\.colorScheme) var colorScheme
+    
     var title: String
     var variant: NudgeContentButtonBlockMeta.ButtonType?
     var fullWidth: Bool = false
     var action: (() -> Void)?
 
     var backgroundColor: Color {
-        return  (variant  ?? .primary) == .primary ? Color.black : Color.white
+        return  (variant  ?? .primary) == .primary ? colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 15)!) : Color.black : Color.white
     }
 
     var foregroundColor: Color {
         return  (variant  ?? .primary) == .primary ? Color.white : Color.black
     }
 
     var borderColor: Color {
-        return (variant  ?? .primary) == .primary ? Color.black : Color.gray.opacity(0.5)
+        return (variant  ?? .primary) == .primary ? colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 15)!) : Color.black : Color.gray.opacity(0.5)
     }
 
     var body: some View {

Sources/CommandBarIOS/Components/Buttons/ButtonGroup.swift

@@ -8,6 +8,8 @@ enum ButtonGroupVariant {
 }
 
 struct ButtonGroupView<Option, Content: View>: View {
+    @Environment(\.colorScheme) var colorScheme
+    
     let variant: ButtonGroupVariant
     let options: [Option]
     let content: (Option, Bool) -> Content
@@ -29,6 +31,7 @@ struct ButtonGroupView<Option, Content: View>: View {
                 }) {
                     content(options[index], isSelected)
                 }.frame(maxWidth: .infinity)
+                
             }
         }
     }

Sources/CommandBarIOS/Nudges/Content/SurveyRatingBlock.swift

@@ -2,6 +2,8 @@ import SwiftUI
 
 
 struct StarButtons: View {
+    @Environment(\.colorScheme) var colorScheme
+    
     @Binding var selection: Int;
 
     let action: () -> Void;
@@ -19,6 +21,7 @@ struct StarButtons: View {
 
         ButtonGroupView(variant: .inclusive, options: stars, selection: $selection) { option, isSelected in
             ZStack {
+          
                 Image(systemName: "star")
                     .resizable()
                     .scaledToFit()
@@ -29,22 +32,22 @@ struct StarButtons: View {
                     .resizable()
                     .scaledToFit()
                     .frame(width: isSelected ? 20 : 24, height: isSelected ? 20 : 24) // Original size
-                    .foregroundColor(isSelected ? activeStarColor : starColor)
+                    .foregroundColor(isSelected ? activeStarColor : colorScheme == .dark ? .gray.opacity(0.8) : starColor)
             }
             .frame(maxWidth: .infinity)
             .padding(.vertical, 8)
-            .background(isSelected ? activeBackgroundColor : backgroundColor)
-            .foregroundColor(.white)
+            .foregroundColor(colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 15)!) : .white)
             .cornerRadius(4)
             .overlay(
                 RoundedRectangle(cornerRadius: 4)
-                    .stroke(isSelected ? activeBorderColor : borderColor, lineWidth: 1)
+                    .stroke(isSelected ? activeBorderColor : colorScheme == .dark ? .gray.opacity(0.8)  : borderColor, lineWidth: 1)
             )
         }
     }
 }
 
 struct EmojiButtons: View {
+    @Environment(\.colorScheme) var colorScheme
     @Binding var selection: Int;
 
     let action: () -> Void;
@@ -62,18 +65,19 @@ struct EmojiButtons: View {
                 .shadow(color: .init(.sRGB, red: 0, green: 0, blue: 0, opacity: isSelected ? 0.35 : 0), radius: 7, x: 0, y: 4)
                 .frame(maxWidth: .infinity)
                 .padding(.vertical, 8)
-                .background(isSelected ? activeBackgroundColor : backgroundColor)
-                .foregroundColor(.white)
+                .background(isSelected ? activeBackgroundColor : colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 15)!) : .white)
+                .foregroundColor( colorScheme == .dark && !isSelected ? .white : .black)
                 .cornerRadius(4)
                 .overlay(
                     RoundedRectangle(cornerRadius: 4)
-                        .stroke(isSelected ? activeBorderColor : borderColor, lineWidth: 1)
+                        .stroke(isSelected ? activeBorderColor : colorScheme == .dark ? .gray.opacity(0.8)  : borderColor, lineWidth: 1)
                 )
         }
     }
 }
 
 struct NumberButtons: View {
+    @Environment(\.colorScheme) var colorScheme
     @Binding var selection: Int;
 
     let action: () -> Void;
@@ -91,12 +95,12 @@ struct NumberButtons: View {
             Text(option)
                 .frame(maxWidth: .infinity)
                 .padding(.vertical, 8)
-                .background(isSelected ? activeBackgroundColor : backgroundColor)
-                .foregroundColor(.black)
+                .background(isSelected ? activeBackgroundColor : colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 15)!) : .white)
+                .foregroundColor( colorScheme == .dark && !isSelected ? .white : .black)
                 .cornerRadius(4)
                 .overlay(
                     RoundedRectangle(cornerRadius: 4)
-                        .stroke(isSelected ? activeBorderColor : borderColor, lineWidth: 1)
+                        .stroke(isSelected ? activeBorderColor : colorScheme == .dark ? .gray.opacity(0.8)  : borderColor, lineWidth: 1)
                 )
         }
     }

Sources/CommandBarIOS/Nudges/NudgeView.swift

@@ -1,6 +1,8 @@
 import SwiftUI
 
 struct NudgeView: View {
+    @Environment(\.colorScheme) var colorScheme
+    
     let nudge: Nudge
     let step: NudgeStep
     let stepIndex: Int
@@ -116,7 +118,7 @@ struct NudgeView: View {
                     ContentStack
                 }
                 .padding()
-                .background(Color(UIColor.systemBackground))
+                .background(colorScheme == .dark ? Color(UIColor.systemBackground.lighter(by: 10)!) : Color.white)
                 .cornerRadius(cornerRadius)
                 .scaleEffect(self.appear == 1 ? 1 : 0)
                 .onAppear {