Clean Up Boolean Statements in Views

Author: thecoolwinter

Sources/CodeEditSourceEditor/Find/PanelView/FindControls.swift

@@ -11,32 +11,42 @@ struct FindControls: View {
     @ObservedObject var viewModel: FindPanelViewModel
     var condensed: Bool
 
+    var imageOpacity: CGFloat {
+        viewModel.matchesEmpty ? 0.33 : 1
+    }
+
+    var dynamicPadding: CGFloat {
+        condensed ? 0 : 5
+    }
+
     var body: some View {
         HStack(spacing: 4) {
             ControlGroup {
                 Button {
                     viewModel.moveToPreviousMatch()
                 } label: {
                     Image(systemName: "chevron.left")
-                        .opacity(viewModel.matchCount == 0 ? 0.33 : 1)
-                        .padding(.horizontal, condensed ? 0 : 5)
+                        .opacity(imageOpacity)
+                        .padding(.horizontal, dynamicPadding)
                 }
                 .help("Previous Match")
-                .disabled(viewModel.matchCount == 0)
+                .disabled(viewModel.matchesEmpty)
+
                 Divider()
                     .overlay(Color(nsColor: .tertiaryLabelColor))
                 Button {
                     viewModel.moveToNextMatch()
                 } label: {
                     Image(systemName: "chevron.right")
-                        .opacity(viewModel.matchCount == 0 ? 0.33 : 1)
-                        .padding(.horizontal, condensed ? 0 : 5)
+                        .opacity(imageOpacity)
+                        .padding(.horizontal, dynamicPadding)
                 }
                 .help("Next Match")
-                .disabled(viewModel.matchCount == 0)
+                .disabled(viewModel.matchesEmpty)
             }
             .controlGroupStyle(PanelControlGroupStyle())
             .fixedSize()
+
             Button {
                 viewModel.dismiss?()
             } label: {
@@ -47,8 +57,8 @@ struct FindControls: View {
                         Text("Done")
                     }
                 }
-                .help(condensed ? "Done" : "")
-                .padding(.horizontal, condensed ? 0 : 5)
+                .help("Done")
+                .padding(.horizontal, dynamicPadding)
             }
             .buttonStyle(PanelButtonStyle())
         }

Sources/CodeEditSourceEditor/Find/PanelView/FindPanelHostingView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import AppKit
 import Combine
 
-// NSView wrapper for using SwiftUI view in AppKit
+/// A subclass of `NSHostingView` that hosts a `FindPanelView` in an AppKit context.
 final class FindPanelHostingView: NSHostingView<FindPanelView> {
     private weak var viewModel: FindPanelViewModel?
 

Sources/CodeEditSourceEditor/Find/PanelView/FindSearchField.swift

@@ -13,6 +13,16 @@ struct FindSearchField: View {
     @Binding var findModePickerWidth: CGFloat
     var condensed: Bool
 
+    private var helperText: String? {
+        if viewModel.findText.isEmpty {
+            nil
+        } else if condensed {
+            "\(viewModel.matchCount)"
+        } else {
+            "\(viewModel.matchCount) \(viewModel.matchCount == 1 ? "match" : "matches")"
+        }
+    }
+
     var body: some View {
         PanelTextField(
             "Text",
@@ -74,11 +84,7 @@ struct FindSearchField: View {
                 })
                 .toggleStyle(.icon)
             },
-            helperText: viewModel.findText.isEmpty
-            ? nil
-            : condensed
-                ? "\(viewModel.matchCount)"
-                : "\(viewModel.matchCount) \(viewModel.matchCount == 1 ? "match" : "matches")",
+            helperText: helperText,
             clearable: true
         )
         .controlSize(.small)

Sources/CodeEditSourceEditor/Find/PanelView/ReplaceControls.swift

@@ -11,6 +11,14 @@ struct ReplaceControls: View {
     @ObservedObject var viewModel: FindPanelViewModel
     var condensed: Bool
 
+    var shouldDisableSingle: Bool {
+        !viewModel.isFocused || viewModel.findText.isEmpty || viewModel.matchesEmpty
+    }
+
+    var shouldDisableAll: Bool {
+        viewModel.findText.isEmpty || viewModel.matchesEmpty
+    }
+
     var body: some View {
         HStack(spacing: 4) {
             ControlGroup {
@@ -24,18 +32,10 @@ struct ReplaceControls: View {
                             Text("Replace")
                         }
                     }
-                    .opacity(
-                        !viewModel.isFocused
-                        || viewModel.findText.isEmpty
-                        || viewModel.matchCount == 0 ? 0.33 : 1
-                    )
+                    .opacity(shouldDisableSingle ? 0.33 : 1)
                 }
-                .help(condensed ? "Replace" : "")
-                .disabled(
-                    !viewModel.isFocused
-                    || viewModel.findText.isEmpty
-                    || viewModel.matchCount == 0
-                )
+                .help("Replace")
+                .disabled(shouldDisableSingle)
                 .frame(maxWidth: .infinity)
 
                 Divider().overlay(Color(nsColor: .tertiaryLabelColor))
@@ -50,10 +50,10 @@ struct ReplaceControls: View {
                             Text("All")
                         }
                     }
-                    .opacity(viewModel.findText.isEmpty || viewModel.matchCount == 0 ? 0.33 : 1)
+                    .opacity(shouldDisableAll ? 0.33 : 1)
                 }
-                .help(condensed ? "Replace All" : "")
-                .disabled(viewModel.findText.isEmpty || viewModel.matchCount == 0)
+                .help("Replace All")
+                .disabled(shouldDisableAll)
                 .frame(maxWidth: .infinity)
             }
             .controlGroupStyle(PanelControlGroupStyle())

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel.swift

@@ -40,6 +40,10 @@ class FindPanelViewModel: ObservableObject {
         findMatches.count
     }
 
+    var matchesEmpty: Bool {
+        matchCount == 0
+    }
+
     var isTargetFirstResponder: Bool {
         target?.findPanelTargetView.window?.firstResponder === target?.findPanelTargetView
     }