Mike/Gaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: subtle reminders consuming and remaining on click

Browse Source
This commit is contained in:
Michael Freno
2026-01-13 16:21:08 -05:00
parent a33b671be3
commit b1f587dd4b
7 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Gaze.xcodeproj/project.pbxproj
View File

@@ -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 */

27
Gaze.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -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
}

7
Gaze/AppDelegate.swift
View File

@@ -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)

5
Gaze/Gaze.entitlements
View File

@@ -6,10 +6,5 @@
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
</array>
</dict>
</plist>

10
Gaze/Info.plist
View File

@@ -22,15 +22,5 @@
<string>$(MARKETING_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2026 Mike Freno. All rights reserved.</string>
<key>SUPublicEDKey</key>
<string>Z2RmohI1y2bgeGQQUDqO9F0HNF2AzFotOt8CwGB6VJM=</string>
<key>SUFeedURL</key>
<string>https://freno.me/api/Gaze/appcast.xml</string>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SUScheduledCheckInterval</key>
<integer>86400</integer>
<key>SUEnableInstallerLauncherService</key>
<true/>
</dict>
</plist>

1
Gaze/Views/Setup/GeneralSetupView.swift
View File

@@ -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) {

30
Gaze/Views/Setup/UserTimersView.swift
View File

@@ -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) {