Small simplifications

Author: CamilleScholtz

swmpc/Views/Content/ContentView.swift

@@ -198,6 +198,7 @@ extension ContentDestination: NavigationDestination {
             VStack(alignment: .leading, spacing: spacing) {
                 #if os(macOS)
                     BackButtonView()
+                        .padding(.top, 12)
                         .offset(y: 5)
                 #endif
 
@@ -227,23 +228,15 @@ extension ContentDestination: NavigationDestination {
     struct BackButtonView: View {
         @Environment(\.navigator) private var navigator
 
-        @State private var isHovering = false
-
         var body: some View {
-            Image(systemSymbol: .chevronBackward)
-                .frame(width: 22, height: 22)
-                .background(
-                    RoundedRectangle(cornerRadius: 4)
-                        .fill(isHovering ? Color(.secondarySystemFill) : .clear)
-                )
-                .padding(.top, 12)
-                .animation(.interactiveSpring, value: isHovering)
-                .onHover { value in
-                    isHovering = value
-                }
-                .onTapGesture {
-                    navigator.back()
-                }
+            Button(action: {
+                navigator.back()
+            }) {
+                Image(systemSymbol: .chevronBackward)
+                    .frame(width: 22, height: 22)
+                    .contentShape(Circle())
+            }
+            .button()
         }
     }
 #endif

swmpc/Views/Content/Destinations/Rows/SongView.swift

@@ -26,33 +26,31 @@ struct SongView: View {
     var body: some View {
         HStack(spacing: 15) {
             Group {
-                #if os(iOS)
-                    if mpd.status.song != song {
+                if mpd.status.song != song {
+                    #if os(iOS)
                         Text(String(song.track))
                             .font(.title3)
                             .fontWeight(.regular)
                             .foregroundStyle(.secondary)
                             .frame(width: 20)
-                    } else {
-                        WaveView()
-                    }
-                #elseif os(macOS)
-                    if !isHovering, mpd.status.song != song {
-                        Text(String(song.track))
-                            .font(.title3)
-                            .fontWeight(.regular)
-                            .foregroundStyle(.secondary)
-                            .frame(width: 20)
-                    } else {
-                        if mpd.status.song == song {
-                            WaveView()
-                        } else {
+                    #elseif os(macOS)
+                        if isHovering {
                             Image(systemSymbol: .playFill)
                                 .font(.title3)
                                 .foregroundColor(.accentColor)
+                                .transition(.opacity)
+
+                        } else {
+                            Text(String(song.track))
+                                .font(.title3)
+                                .fontWeight(.regular)
+                                .foregroundStyle(.secondary)
+                                .frame(width: 20)
                         }
-                    }
-                #endif
+                    #endif
+                } else {
+                    WaveView()
+                }
             }
             .frame(width: 20)