diff --git a/Gaze.xcodeproj/project.pbxproj b/Gaze.xcodeproj/project.pbxproj index df1fed8..83d90be 100644 --- a/Gaze.xcodeproj/project.pbxproj +++ b/Gaze.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 275915892F132A9200D0E60D /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 27AE10B12F10B1FC00E00DBC /* Lottie */; }; - 27SPARKLE00000000003 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 27SPARKLE00000000002 /* Sparkle */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,7 +70,6 @@ buildActionMask = 2147483647; files = ( 275915892F132A9200D0E60D /* Lottie in Frameworks */, - 27SPARKLE00000000003 /* Sparkle in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -133,7 +131,6 @@ name = Gaze; packageProductDependencies = ( 27AE10B12F10B1FC00E00DBC /* Lottie */, - 27SPARKLE00000000002 /* Sparkle */, ); productName = Gaze; productReference = 27A21B3C2F0F69DC0018C4F3 /* Gaze.app */; @@ -219,7 +216,6 @@ minimizedProjectReferenceProxies = 1; packageReferences = ( 27AE10B02F10B1FC00E00DBC /* XCRemoteSwiftPackageReference "lottie-spm" */, - 27SPARKLE00000000001 /* XCRemoteSwiftPackageReference "Sparkle" */, ); preferredProjectObjectVersion = 77; productRefGroup = 27A21B3D2F0F69DC0018C4F3 /* Products */; @@ -439,6 +435,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 0.4.0; + OTHER_SWIFT_FLAGS = "-D APPSTORE"; PRODUCT_BUNDLE_IDENTIFIER = com.mikefreno.Gaze; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; @@ -475,6 +472,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 0.4.0; + OTHER_SWIFT_FLAGS = "-D APPSTORE"; PRODUCT_BUNDLE_IDENTIFIER = com.mikefreno.Gaze; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; @@ -617,14 +615,6 @@ minimumVersion = 4.6.0; }; }; - 27SPARKLE00000000001 /* XCRemoteSwiftPackageReference "Sparkle" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/sparkle-project/Sparkle"; - requirement = { - kind = exactVersion; - version = 2.8.1; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ diff --git a/Gaze.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Gaze.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b3cf5c5..726a161 100644 --- a/Gaze.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Gaze.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,24 +1,15 @@ { - "originHash" : "513d974fbede884a919977d3446360023f6e3239ac314f4fbd9657e80aca7560", - "pins" : [ + "originHash": "513d974fbede884a919977d3446360023f6e3239ac314f4fbd9657e80aca7560", + "pins": [ { - "identity" : "lottie-spm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-spm.git", - "state" : { - "revision" : "69faaefa7721fba9e434a52c16adf4329c9084db", - "version" : "4.6.0" - } - }, - { - "identity" : "sparkle", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sparkle-project/Sparkle", - "state" : { - "revision" : "5581748cef2bae787496fe6d61139aebe0a451f6", - "version" : "2.8.1" + "identity": "lottie-spm", + "kind": "remoteSourceControl", + "location": "https://github.com/airbnb/lottie-spm.git", + "state": { + "revision": "69faaefa7721fba9e434a52c16adf4329c9084db", + "version": "4.6.0" } } ], - "version" : 3 -} + "version": 3 +} \ No newline at end of file diff --git a/Gaze/AppDelegate.swift b/Gaze/AppDelegate.swift index 8624b53..8c64d55 100644 --- a/Gaze/AppDelegate.swift +++ b/Gaze/AppDelegate.swift @@ -191,9 +191,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject { window.contentView = NSHostingView(rootView: content) window.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary] - // Allow mouse events for all reminders (needed for dismiss button) - window.acceptsMouseMovedEvents = true - window.ignoresMouseEvents = false + // Allow mouse events only for overlay reminders (they need dismiss button) + // Subtle reminders should be completely transparent to mouse input + window.acceptsMouseMovedEvents = requiresFocus + window.ignoresMouseEvents = !requiresFocus let windowController = NSWindowController(window: window) windowController.showWindow(nil) diff --git a/Gaze/Gaze.entitlements b/Gaze/Gaze.entitlements index 4a6c209..ee95ab7 100644 --- a/Gaze/Gaze.entitlements +++ b/Gaze/Gaze.entitlements @@ -6,10 +6,5 @@ com.apple.security.network.client - com.apple.security.temporary-exception.mach-lookup.global-name - - $(PRODUCT_BUNDLE_IDENTIFIER)-spks - $(PRODUCT_BUNDLE_IDENTIFIER)-spki - diff --git a/Gaze/Info.plist b/Gaze/Info.plist index 3851b18..4b71fcf 100644 --- a/Gaze/Info.plist +++ b/Gaze/Info.plist @@ -22,15 +22,5 @@ $(MARKETING_VERSION) NSHumanReadableCopyright Copyright © 2026 Mike Freno. All rights reserved. - SUPublicEDKey - Z2RmohI1y2bgeGQQUDqO9F0HNF2AzFotOt8CwGB6VJM= - SUFeedURL - https://freno.me/api/Gaze/appcast.xml - SUEnableAutomaticChecks - - SUScheduledCheckInterval - 86400 - SUEnableInstallerLauncherService - diff --git a/Gaze/Views/Setup/GeneralSetupView.swift b/Gaze/Views/Setup/GeneralSetupView.swift index 9077aab..604b315 100644 --- a/Gaze/Views/Setup/GeneralSetupView.swift +++ b/Gaze/Views/Setup/GeneralSetupView.swift @@ -57,7 +57,6 @@ struct GeneralSetupView: View { .padding() .glassEffectIfAvailable(GlassStyle.regular, in: .rect(cornerRadius: 12)) - // Software Updates Section #if !APPSTORE HStack { VStack(alignment: .leading, spacing: 4) { diff --git a/Gaze/Views/Setup/UserTimersView.swift b/Gaze/Views/Setup/UserTimersView.swift index 228d220..0c5b37c 100644 --- a/Gaze/Views/Setup/UserTimersView.swift +++ b/Gaze/Views/Setup/UserTimersView.swift @@ -42,21 +42,25 @@ struct UserTimersView: View { GlassStyle.regular.tint(.purple), in: .rect(cornerRadius: 8)) VStack(alignment: .leading, spacing: 12) { - #if APPSTORE - HStack { - Text("Active Timers (\(userTimers.count)/3)") - .font(.headline) - Spacer() - if userTimers.count < 3 { - Button(action: { - showingAddTimer = true - }) { - Label("Add Timer", systemImage: "plus.circle.fill") - } - .buttonStyle(.borderedProminent) + /*#if APPSTORE || DEBUG*/ + // we will add these back in when payment method is established - and checked + // for + HStack { + Text("Active Timers (\(userTimers.count)/3)") + .font(.headline) + Spacer() + if userTimers.count < 3 { + Button(action: { + showingAddTimer = true + }) { + Label("Add Timer", systemImage: "plus.circle.fill") } + .buttonStyle(.borderedProminent) } - #endif + } + /*#else*/ + /*Text("Custom Timers avilable in App Store version only")*/ + /*#endif*/ if userTimers.isEmpty { VStack(spacing: 12) {