From 3690a9e4d257dad7eb60b103207ec0d786660f03 Mon Sep 17 00:00:00 2001
From: neon443 <69979447+neon443@users.noreply.github.com>
Date: Thu, 19 Jun 2025 10:23:17 +0100
Subject: [PATCH] fix stuff for GM seed building (cant use xcode beta to sumbit
 to appstore smh) and bump version

---
 Config.xcconfig            |  2 +-
 Shared/ViewModifiers.swift | 44 +++++++++++++-------------------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/Config.xcconfig b/Config.xcconfig
index b3278ca..3f9e6f6 100644
--- a/Config.xcconfig
+++ b/Config.xcconfig
@@ -14,4 +14,4 @@ BUNDLE_ID_WIDGETS = com.neon443.NearFuture.widgets
 GROUP_ID  = group.NearFuture
 VERSION = 5
 NAME = Near Future
-BUILD_NUMBER = 1
+BUILD_NUMBER = 18
diff --git a/Shared/ViewModifiers.swift b/Shared/ViewModifiers.swift
index caa1ae9..eec7ec5 100644
--- a/Shared/ViewModifiers.swift
+++ b/Shared/ViewModifiers.swift
@@ -8,51 +8,37 @@
 import Foundation
 import SwiftUI
 
-struct hapticHeavy: ViewModifier {
-	var trigger: any Equatable
-	
-	init(trigger: any Equatable) {
-		self.trigger = trigger
-	}
-	
-	func body(content: Content) -> some View {
+extension View {
+	func hapticHeavy(trigger: any Equatable) -> some View {
 		if #available(iOS 17, *) {
-			content
-				.sensoryFeedback(.impact(weight: .heavy, intensity: 1), trigger: trigger)
+			self.modifier(sensoryFeedback(.impact(weight: .heavy, intensity: 1), trigger: trigger)) as! Self
 		} else {
-			content
+			self
 		}
 	}
 }
 
 struct glassButton: ViewModifier {
 	func body(content: Content) -> some View {
-		if #available(iOS 19, macOS 16, *) {
-			content.buttonStyle(.glass)
-		} else {
-			content.buttonStyle(.borderedProminent)
-				.clipShape(RoundedRectangle(cornerRadius: 15))
-				.tint(.two)
-		}
+#if swift(>=6.2)
+		content.buttonStyle(.glass)
+#else
+		content.buttonStyle(.borderedProminent)
+			.clipShape(RoundedRectangle(cornerRadius: 15))
+			.tint(.two)
+#endif
 	}
 }
 
-struct hapticSuccess: ViewModifier {
-	var trigger: any Equatable
-	
-	init(trigger: any Equatable) {
-		self.trigger = trigger
-	}
-	
-	func body(content: Content) -> some View {
+extension View {
+	func hapticSucess(trigger: any Equatable) -> some View {
 		if #available(iOS 17, *) {
-			content.sensoryFeedback(.success, trigger: trigger)
+			self.modifier(sensoryFeedback(.success, trigger: trigger)) as! Self
 		} else {
-			content
+			self
 		}
 	}
 }
-
 struct navigationInlineLarge: ViewModifier {
 	func body(content: Content) -> some View {
 #if os(macOS)