Fix button inconsistencies (#342)

* Fixes inconsistencies from the initial PR that I noticed during testing

* (Possibly contentious) Move shadow modifiers inside views

* Add VStack after getting previews running

apple/DemoApp/Demo/DemoNavigationView.swift

@@ -143,7 +143,6 @@ struct DemoNavigationView: View {
                                         .font(.body.bold())
                                 }
                                 .disabled(routes?.isEmpty == true)
-                                .shadow(radius: 10)
                             }
                         } else {
                             NavigationUIButton {

apple/Sources/FerrostarSwiftUI/Views/Controls/NavigationUIButton.swift

@@ -11,6 +11,7 @@ public struct NavigationUIButtonStyle: ButtonStyle {
             .foregroundStyle(.primary)
             .clipShape(Capsule())
             .frame(minWidth: 52, minHeight: 52)
+            .shadow(radius: 8)
     }
 }
 

apple/Sources/FerrostarSwiftUI/Views/Controls/MuteUIButton.swift → apple/Sources/FerrostarSwiftUI/Views/Controls/NavigationUIMuteButton.swift

@@ -1,8 +1,7 @@
 import FerrostarCore
-import FerrostarCoreFFI
 import SwiftUI
 
-public struct MuteUIButton: View {
+public struct NavigationUIMuteButton: View {
     let isMuted: Bool
     let action: () -> Void
 
@@ -12,21 +11,19 @@ public struct MuteUIButton: View {
     }
 
     public var body: some View {
-        Button(action: action) {
+        NavigationUIButton(action: action) {
             Image(systemName: isMuted ? "speaker.slash.fill" : "speaker.2.fill")
                 .resizable()
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 18, height: 18)
-                .padding()
         }
-        .foregroundColor(.black)
-        .background(Color.white)
-        .clipShape(Circle())
     }
 }
 
 #Preview {
-    MuteUIButton(isMuted: true, action: {})
+    VStack {
+        NavigationUIMuteButton(isMuted: true, action: {})
 
-    MuteUIButton(isMuted: false, action: {})
+        NavigationUIMuteButton(isMuted: false, action: {})
+    }
 }

apple/Sources/FerrostarSwiftUI/Views/Controls/NavigationUIZoomButton.swift

@@ -34,6 +34,7 @@ public struct NavigationUIZoomButton: View {
         .foregroundColor(.primary)
         .background(Color(.systemBackground))
         .clipShape(Capsule())
+        .shadow(radius: 8)
     }
 }
 

apple/Sources/FerrostarSwiftUI/Views/GridViews/NavigatingInnerGridView.swift

@@ -87,8 +87,7 @@ public struct NavigatingInnerGridView: View, CustomizableNavigatingInnerGridView
             topCenter: { topCenter?() },
             topTrailing: {
                 if showMute {
-                    MuteUIButton(isMuted: isMuted, action: onMute)
-                        .shadow(radius: 8)
+                    NavigationUIMuteButton(isMuted: isMuted, action: onMute)
                 }
             },
             midLeading: { midLeading?() },
@@ -99,7 +98,6 @@ public struct NavigatingInnerGridView: View, CustomizableNavigatingInnerGridView
             midTrailing: {
                 if showZoom {
                     NavigationUIZoomButton(onZoomIn: onZoomIn, onZoomOut: onZoomOut)
-                        .shadow(radius: 8)
                 } else {
                     Spacer()
                 }
@@ -112,7 +110,6 @@ public struct NavigatingInnerGridView: View, CustomizableNavigatingInnerGridView
                             .aspectRatio(contentMode: .fit)
                             .frame(width: 18, height: 18)
                     }
-                    .shadow(radius: 8)
                 } else {
                     Spacer()
                 }

apple/Tests/FerrostarSwiftUITests/Views/MuteButtonTests.swift

@@ -5,27 +5,27 @@ import XCTest
 final class MuteUIButtonTests: XCTestCase {
     func test_muted() {
         assertView {
-            MuteUIButton(isMuted: true, action: {})
+            NavigationUIMuteButton(isMuted: true, action: {})
         }
     }
 
     func test_unmuted() {
         assertView {
-            MuteUIButton(isMuted: false, action: {})
+            NavigationUIMuteButton(isMuted: false, action: {})
         }
     }
 
     // MARK: Dark Mode
 
     func test_muted_darkMode() {
         assertView(colorScheme: .dark) {
-            MuteUIButton(isMuted: true, action: {})
+            NavigationUIMuteButton(isMuted: true, action: {})
         }
     }
 
     func test_unmuted_darkMode() {
         assertView(colorScheme: .dark) {
-            MuteUIButton(isMuted: false, action: {})
+            NavigationUIMuteButton(isMuted: false, action: {})
         }
     }
 }