Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions App/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<key>LSMinimumSystemVersion</key>
<string>11.0</string>
<key>LSUIElement</key>
<true/>
<false/>
<key>LSArchitecturePriority</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2024 ProduktEntdecker. All rights reserved.</string>
<string>Copyright © 2024-2026 ProduktEntdecker. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string></string>
<key>NSPrincipalClass</key>
Expand Down
6 changes: 3 additions & 3 deletions App/Sources/AnalyticsService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class AnalyticsService: ObservableObject {
"success": success,
"model_series": anonymizedModel,
"timestamp": ISO8601DateFormatter().string(from: Date()),
"app_version": "1.3.0",
"app_version": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0",
// NO personal identifiers, IP is not stored server-side
]

Expand All @@ -94,7 +94,7 @@ class AnalyticsService: ObservableObject {
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.setValue("TouchBarFix/1.3.0", forHTTPHeaderField: "User-Agent")
request.setValue("TouchBarFix/\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")", forHTTPHeaderField: "User-Agent")

request.httpBody = try JSONSerialization.data(withJSONObject: data)

Expand Down Expand Up @@ -132,7 +132,7 @@ class AnalyticsService: ObservableObject {

do {
var request = URLRequest(url: url)
request.setValue("TouchBarFix/1.3.0", forHTTPHeaderField: "User-Agent")
request.setValue("TouchBarFix/\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")", forHTTPHeaderField: "User-Agent")
request.timeoutInterval = 15

let (data, response) = try await session.data(for: request)
Expand Down
2 changes: 1 addition & 1 deletion App/Sources/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ struct ContentView: View {
Spacer()

// Version footer
Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0") • Jan 2026")
Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0")")
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Inconsistent fallback version string.

The fallback value "1.0" differs from other files in this PR which use "1.5.0" (AnalyticsService, SharingManager, TouchBarManager). Consider aligning for consistency.

Suggested fix
-            Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0")")
+            Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")")
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0")")
Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")")
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@App/Sources/ContentView.swift` at line 175, The displayed app version
fallback in ContentView's
Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ??
"1.0")") is inconsistent with other files; update the fallback string from "1.0"
to "1.5.0" so ContentView matches AnalyticsService, SharingManager, and
TouchBarManager and consistently shows "v{version}" when
CFBundleShortVersionString is missing.

.font(.system(size: 8))
.foregroundColor(.secondary)
}
Expand Down
2 changes: 1 addition & 1 deletion App/Sources/OnboardingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct OnboardingView: View {

private let pages = [
OnboardingPage(
title: "Welcome to TouchBarFix 1.3!",
title: "Welcome to TouchBarFix!",
subtitle: "New features to help you and other MacBook users",
icon: "sparkles",
color: .blue,
Expand Down
13 changes: 4 additions & 9 deletions App/Sources/ReviewRequestManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,13 @@ class ReviewRequestManager: ObservableObject {
recordReviewRequest()
}

/// Fallback: Direct App Store review page
/// Fallback: Direct to Gumroad product page for reviews
private func requestReviewFallback() {
// This will need to be updated with actual App Store ID when published
let appStoreReviewURL = "https://apps.apple.com/app/id[TOUCHBARFIX_APP_ID]?action=write-review"
// TouchBarFix is sold via Gumroad, not the App Store
let reviewURL = "https://produktentdecker.gumroad.com/l/touchbarfix"

if let url = URL(string: appStoreReviewURL) {
if let url = URL(string: reviewURL) {
NSWorkspace.shared.open(url)
} else {
// Ultimate fallback: open TouchBarFix website
if let fallbackURL = URL(string: "https://touchbarfix.com/review") {
NSWorkspace.shared.open(fallbackURL)
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions App/Sources/SharingManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class SharingManager: ObservableObject {
"event": "user_share",
"platform": platform.rawValue,
"timestamp": ISO8601DateFormatter().string(from: Date()),
"app_version": "1.3.0"
"app_version": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0"
]

// Submit to analytics (non-blocking)
Expand All @@ -155,7 +155,7 @@ class SharingManager: ObservableObject {
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.setValue("TouchBarFix/1.3.0", forHTTPHeaderField: "User-Agent")
request.setValue("TouchBarFix/\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")", forHTTPHeaderField: "User-Agent")
request.timeoutInterval = 10

request.httpBody = try JSONSerialization.data(withJSONObject: data)
Expand Down
2 changes: 1 addition & 1 deletion App/Sources/TouchBarManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class TouchBarManager: ObservableObject {
print(" Timestamp: \(Date())")
print(" Device model: \(getModelIdentifier())")
print(" Has Touch Bar: \(hasTouchBar)")
print(" App: TouchBarFix 1.3.0")
print(" App: TouchBarFix \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.5.0")")
print(String(repeating: "=", count: 60))

// Check if device has Touch Bar
Expand Down