v3.6.0

Pearcleaner/Logic/AppCommands.swift

@@ -69,7 +69,7 @@ struct AppCommands: Commands {
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                         appState.sortedApps = sortedApps
                         for app in appState.trashedFiles {
-                            AppPathFinder(appInfo: app, appState: appState, locations: locations).findPaths()
+                            AppPathFinder(appInfo: app, appState: appState, locations: locations, undo: true).findPaths()
                         }
                     }
                 }

Pearcleaner/Logic/AppPathsFetch.swift

@@ -16,16 +16,18 @@ class AppPathFinder {
     private var locations: Locations
     private var backgroundRun: Bool
     private var reverseAddon: Bool
+    private var undo: Bool
     private var completion: () -> Void = {}
     private var collection: [URL] = []
     private let collectionAccessQueue = DispatchQueue(label: "com.alienator88.Pearcleaner.appPathFinder.collectionAccess")
 
-    init(appInfo: AppInfo = .empty, appState: AppState, locations: Locations, backgroundRun: Bool = false, reverseAddon: Bool = false, completion: @escaping () -> Void = {}) {
+    init(appInfo: AppInfo = .empty, appState: AppState, locations: Locations, backgroundRun: Bool = false, reverseAddon: Bool = false, undo: Bool = false, completion: @escaping () -> Void = {}) {
         self.appInfo = appInfo
         self.appState = appState
         self.locations = locations
         self.backgroundRun = backgroundRun
         self.reverseAddon = reverseAddon
+        self.undo = undo
         self.completion = completion
     }
 
@@ -306,7 +308,10 @@ class AppPathFinder {
 
             if !self.backgroundRun {
                 self.appState.appInfo = self.appInfo
-                self.appState.selectedItems = Set(updatedCollection)
+                if !self.undo {
+                    self.appState.selectedItems = Set(updatedCollection)
+
+                }
             }
 
             // Append object to store if running reverse search with empty store

Pearcleaner/Logic/AppState.swift

@@ -24,14 +24,13 @@ class AppState: ObservableObject
     @Published var currentView = CurrentDetailsView.empty
     @Published var showAlert: Bool = false
     @Published var sidebar: Bool = true
-//    @Published var isReminderVisible: Bool = false
     @Published var releases = [Release]()
     @Published var progressBar: (String, Double) = ("Ready", 0.0)
     @Published var reload: Bool = false
     @Published var showProgress: Bool = false
     @Published var finderExtensionEnabled: Bool = false
 
-    
+
     init() {
         self.appInfo = AppInfo(
             id: UUID(),

Pearcleaner/Logic/ReversePathsFetch.swift

@@ -39,6 +39,7 @@ class ReversePathsSearcher {
         let allNames = appState.appInfoStore.map { $0.appName.pearFormat() }
 
         for location in locations.reverse.paths where fileManager.fileExists(atPath: location) {
+
             dispatchGroup.enter()
             processLocation(location, allPaths: allPaths, allNames: allNames)
             dispatchGroup.leave()

Pearcleaner/Logic/Styles.swift

@@ -11,22 +11,26 @@ import SwiftUI
 struct SimpleButtonStyle: ButtonStyle {
     @State private var hovered = false
     let icon: String
+    let iconFlip: String
     let label: String
     let help: String
     let color: Color
     let size: CGFloat
+    let padding: CGFloat
 
-    init(icon: String, label: String = "", help: String, color: Color = Color("mode"), size: CGFloat = 20) {
+    init(icon: String, iconFlip: String = "", label: String = "", help: String, color: Color = Color("mode"), size: CGFloat = 20, padding: CGFloat = 5) {
         self.icon = icon
+        self.iconFlip = iconFlip
         self.label = label
         self.help = help
         self.color = color
         self.size = size
+        self.padding = padding
     }
     
     func makeBody(configuration: Self.Configuration) -> some View {
-        HStack {
-            Image(systemName: icon)
+        HStack(alignment: .center) {
+            Image(systemName: (hovered && !iconFlip.isEmpty) ? iconFlip : icon)
                 .resizable()
                 .scaledToFit()
                 .frame(width: size, height: size)
@@ -35,7 +39,7 @@ struct SimpleButtonStyle: ButtonStyle {
             }
         }
         .foregroundColor(hovered ? color : color.opacity(0.5))
-        .padding(5)
+        .padding(padding)
         .onHover { hovering in
             withAnimation() {
                 hovered = hovering
@@ -121,6 +125,35 @@ struct ResetSettingsButtonStyle: ButtonStyle {
 }
 
 
+struct SimpleCheckboxToggleStyle: ToggleStyle {
+    @EnvironmentObject private var themeSettings: ThemeSettings
+    @State private var isHovered: Bool = false
+
+    func makeBody(configuration: Configuration) -> some View {
+        HStack {
+            RoundedRectangle(cornerRadius: 4)
+                .fill(themeSettings.themeColor.darker(by: 5))
+                .frame(width: 18, height: 18)
+                .overlay {
+                    if configuration.isOn {
+                        Image(systemName: "checkmark")
+                            .foregroundStyle(Color("mode"))
+                            .scaleEffect(isHovered ? 0.8 : 1.0)
+                    }
+                }
+                .onTapGesture {
+                    withAnimation(.smooth()) {
+                        configuration.isOn.toggle()
+                    }
+                }
+            configuration.label
+        }
+        .onHover(perform: { hovering in
+            self.isHovered = hovering
+        })
+    }
+}
+
 
 struct InfoButton: View {
     @State private var isPopoverPresented: Bool = false
@@ -192,10 +225,40 @@ struct UninstallButton: ButtonStyle {
         .padding(.horizontal)
         .padding(.vertical, 4)
         .background(configuration.isPressed ? Color("uninstall").opacity(0.8) : Color("uninstall"))
-//        .background(
-//            configuration.isPressed ? Color("uninstall").opacity(0.8) :
-//                (isEnabled ? Color("uninstall") : Color.gray)
-//        )
+        .cornerRadius(8)
+        .onHover { over in
+            if over {
+                NSCursor.pointingHand.push()
+            } else {
+                NSCursor.pop()
+            }
+        }
+    }
+}
+
+
+
+struct RescanButton: ButtonStyle {
+
+    func makeBody(configuration: Configuration) -> some View {
+        HStack(alignment: .center, spacing: 10) {
+            Image(systemName: "arrow.counterclockwise.circle")
+                .foregroundColor(.white)
+
+            Divider()
+                .frame(height: 24)
+                .foregroundColor(.white)
+                .opacity(0.5)
+
+            configuration.label
+                .foregroundColor(.white)
+
+        }
+        .frame(height: 24)
+        .frame(minWidth: 75)
+        .padding(.horizontal)
+        .padding(.vertical, 4)
+        .background(configuration.isPressed ? Color("button").opacity(0.8) : Color("button"))
         .cornerRadius(8)
         .onHover { over in
             if over {
@@ -475,68 +538,6 @@ struct AnimatedSearchStyle: TextFieldStyle {
 
 
 
-
-struct SimpleSearchStyle: TextFieldStyle {
-    @State private var isHovered = false
-    @FocusState private var isFocused: Bool
-    @State var icon: Image?
-    @State var trash: Bool = false
-    @Binding var text: String
-    @EnvironmentObject var appState: AppState
-    @AppStorage("settings.general.mini") private var mini: Bool = false
-
-    func _body(configuration: TextField<Self._Label>) -> some View {
-        
-        HStack(spacing: 5) {
-            
-            HStack(spacing: 5) {
-                if icon != nil {
-                    icon
-                        .foregroundColor(Color("mode").opacity(0.5))
-                }
-                
-                configuration
-                    .font(.title3)
-                    .textFieldStyle(PlainTextFieldStyle())
-
-                
-                if trash && text != "" {
-                    Image(systemName: "xmark")
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: 10, height: 10)
-                        .padding(.trailing, 5)
-                        .foregroundStyle(isHovered ? Color("mode").opacity(0.8) : Color("mode").opacity(0.5))
-                        .onTapGesture {
-                            text = ""
-                        }
-                        .help("Clear search")
-                }
-            }
-            
-        }
-        .padding(6)
-        .overlay(
-            RoundedRectangle(cornerRadius: 6)
-                .strokeBorder(Color("mode").opacity(0.2), lineWidth: 1)
-                .allowsHitTesting(false)
-        )
-        .onHover { hovering in
-            withAnimation(Animation.easeInOut(duration: 0.15)) {
-                self.isHovered = hovering
-                self.isFocused = true
-            }
-        }
-        .focused($isFocused)
-        .onAppear {
-            updateOnMain {
-                self.isFocused = false
-            }
-        }
-    }
-}
-
-
 struct GlassEffect: NSViewRepresentable {
     var material: NSVisualEffectView.Material // Choose the material you want
     var blendingMode: NSVisualEffectView.BlendingMode // Choose the blending mode

Pearcleaner/Logic/Utilities.swift

@@ -386,6 +386,9 @@ func removeApp(appState: AppState, withId id: UUID) {
         if brew {
             caskCleanup(app: appState.appInfo.appName)
         }
+
+        appState.appInfo = AppInfo.empty
+
     }
 }