#156 - iOS 26 update (#157)

* updated colors

* fixed widget background

* minor design updates with liquid glass

* new TabView for iOS 26

* fixed next class location button

* added last synced status

* added special event text

* updated news item sheet

* added new localization strings

* updated feedback email

* conversations resolved

* moved tabbar items in account

* Add 'buy me a coffee' link and remove github link from Settings.

* Bump version 3.9.1 -> 4.0.0

---------

Co-authored-by: Adis Veletanlic <[email protected]>

Author: ramz1t

App/Extensions/Presentation/View/UIApplicationExtension.swift

@@ -14,20 +14,20 @@ extension UIApplication {
     private var keyWindow: UIWindow? {
         /// Get connected scenes
         return UIApplication.shared.connectedScenes
-            /// Keep only active scenes, onscreen and visible to the user
+        /// Keep only active scenes, onscreen and visible to the user
             .filter { $0.activationState == .foregroundActive }
-            /// Keep only the first `UIWindowScene`
+        /// Keep only the first `UIWindowScene`
             .first(where: { $0 is UIWindowScene })
-            /// Get its associated windows
+        /// Get its associated windows
             .flatMap { $0 as? UIWindowScene }?.windows
-            /// Finally, keep only the key window
+        /// Finally, keep only the key window
             .first(where: \.isKeyWindow)
     }
 
     /// Opens the default mail application on users
     /// phones and allows them to send an email to support
     func shareFeedback() {
-        if let url = URL(string: "mailto:tumbleapps.studios@gmail.com") {
+        if let url = URL(string: "mailto:support@tumbleforkronox.com") {
             UIApplication.shared.open(url)
         }
     }
@@ -44,6 +44,12 @@ extension UIApplication {
         }
     }
 
+    func openBuyMeACoffee() {
+        if let url = URL(string: "https://buymeacoffee.com/defaultdino") {
+            UIApplication.shared.open(url)
+        }
+    }
+    
     /// Opens the App Store application with the review
     /// sheet already opened
     func openAppStoreForReview() {

App/Extensions/Presentation/View/ViewExtensions.swift

@@ -33,8 +33,15 @@ extension View {
 
     func searchBox() -> some View {
         padding(10)
-            .background(Color.gray.opacity(0.2))
-            .cornerRadius(10)
+            .apply {
+                if #available(iOS 26.0, *) {
+                    $0.glassEffect(.regular.interactive())
+                } else {
+                    $0
+                        .background(Color.gray.opacity(0.15))
+                        .cornerRadius(10)
+                }
+            }
     }
 
     func getRect() -> CGRect {
@@ -46,4 +53,8 @@ extension View {
             .foregroundColor(.onBackground)
             .padding(.top, 5)
     }
+    
+    func apply<V: View>(@ViewBuilder _ block: (Self) -> V) -> V {
+        block(self)
+    }
 }

App/Presentation/Styles/ButtonStyles/Bookmarks/ToTopButtonStyle.swift

@@ -11,10 +11,17 @@ import SwiftUI
 struct ToTopButtonStyle: ButtonStyle {
     func makeBody(configuration: Self.Configuration) -> some View {
         configuration.label
-            .background(Color.primary)
-            .clipShape(Circle())
-            .cornerRadius(40)
-            .scaleEffect(configuration.isPressed ? 0.9 : 1)
-            .animation(.easeOut(duration: 0.2), value: configuration.isPressed)
+            .apply {
+                if #available(iOS 26.0, *) {
+                    $0.glassEffect(.regular.interactive().tint(.primary))
+                } else {
+                    $0
+                        .background(Color.primary)
+                        .clipShape(Circle())
+                        .cornerRadius(40)
+                        .scaleEffect(configuration.isPressed ? 0.9 : 1)
+                        .animation(.easeOut(duration: 0.2), value: configuration.isPressed)
+                }
+            }
     }
 }

App/Presentation/Styles/ButtonStyles/CloseButtonStyle.swift

@@ -13,7 +13,13 @@ struct CloseButtonStyle: ButtonStyle {
     func makeBody(configuration: Self.Configuration) -> some View {
         configuration.label
             .padding(10)
-            .background(Color.surface)
+            .apply {
+                if #available(iOS 26.0, *) {
+                    $0.glassEffect()
+                } else {
+                    $0.background(Color.surface)
+                }
+            }
             .cornerRadius(25)
             .scaleEffect(configuration.isPressed ? 0.9 : 1)
             .animation(.easeOut(duration: 0.2), value: configuration.isPressed)

App/Presentation/Styles/ButtonStyles/SearchMenuActionStyle.swift

@@ -12,9 +12,16 @@ struct SearchMenuActionStyle: ButtonStyle {
     func makeBody(configuration: Self.Configuration) -> some View {
         configuration.label
             .padding(10)
-            .background(Color.primary)
-            .cornerRadius(15)
-            .scaleEffect(configuration.isPressed ? 0.9 : 1)
-            .animation(.easeOut(duration: 0.2), value: configuration.isPressed)
+            .apply {
+                if #available(iOS 26.0, *) {
+                    $0.glassEffect(.regular.interactive().tint(.primary))
+                } else {
+                    $0
+                        .background(Color.primary)
+                        .cornerRadius(15)
+                        .scaleEffect(configuration.isPressed ? 0.9 : 1)
+                        .animation(.easeOut(duration: 0.2), value: configuration.isPressed)
+                }
+            }
     }
 }

App/Presentation/Types/Types.swift

@@ -9,7 +9,7 @@ import Foundation
 import SwiftUI
 
 /// Bottom tab bar
-enum TabbarTabType: String {
+enum TabbarTabType: String, Identifiable {
     case home = "house"
     case bookmarks = "bookmark"
     case account = "graduationcap"
@@ -29,6 +29,8 @@ enum TabbarTabType: String {
             return NSLocalizedString("Search", comment: "")
         }
     }
+    
+    var id: String { rawValue }
 }
 
 /// Bookmarks page switcher options
@@ -62,3 +64,4 @@ enum ViewType {
     }
 
 }
+

App/Presentation/Views/Account/Account.swift

@@ -30,19 +30,23 @@ struct Account: View {
             .if(viewModel.authStatus == .authorized) { view in
                 view.navigationTitle(NSLocalizedString("Account", comment: ""))
             }
-            .navigationBarItems(trailing: HStack {
-                if viewModel.authStatus == .authorized {
-                    SignOutButton(showConfirmationDialog: {
-                        isSigningOut = true
-                    })
+            .toolbar {
+                ToolbarItem(placement: .topBarLeading) {
+                    if viewModel.authStatus == .authorized {
+                        SignOutButton(showConfirmationDialog: {
+                            isSigningOut = true
+                        })
+                        .confirmationDialog(LocalizedStringKey("Are you sure you want to log out of your account?"), isPresented: $isSigningOut, actions: {
+                            Button(LocalizedStringKey("Yes"), action: logOut)
+                        }, message: {
+                            Text(LocalizedStringKey("Are you sure you want to log out of your account?"))
+                        })
+                    }
                 }
-                SettingsButton()
-            })
-            .confirmationDialog(LocalizedStringKey("Are you sure you want to log out of your account?"), isPresented: $isSigningOut, actions: {
-                Button(LocalizedStringKey("Yes"), action: logOut)
-            }, message: {
-                Text(LocalizedStringKey("Are you sure you want to log out of your account?"))
-            })
+                ToolbarItem(placement: .primaryAction) {
+                    SettingsButton()
+                }
+            }
 
         }
         .tag(TabbarTabType.account)

App/Presentation/Views/Account/Login/PasswordField.swift

@@ -47,7 +47,14 @@ struct PasswordField: View {
             Spacer()
         }
         .padding(Spacing.medium)
-        .background(Color.surface)
-        .cornerRadius(15)
+        .apply {
+            if #available(iOS 26.0, *) {
+                $0.glassEffect(.regular.interactive())
+            } else {
+                $0
+                    .background(Color.surface)
+                    .cornerRadius(15)
+            }
+        }
     }
 }

App/Presentation/Views/Account/Login/UsernameField.swift

@@ -25,8 +25,15 @@ struct UsernameField: View {
             Spacer()
         }
         .padding(Spacing.medium)
-        .background(Color.surface)
-        .cornerRadius(15)
+        .apply {
+            if #available(iOS 26.0, *) {
+                $0.glassEffect(.regular.interactive())
+            } else {
+                $0
+                    .background(Color.surface)
+                    .cornerRadius(15)
+            }
+        }
         .padding(.bottom, Spacing.small)
     }
 }

App/Presentation/Views/AppParent.swift

@@ -22,7 +22,7 @@ struct AppParent: View {
 
     init(viewModel: ParentViewModel) {
         navigationBarAppearance.titleTextAttributes = [.font: navigationBarFont()]
-        navigationBarAppearance.titleTextAttributes = [.foregroundColor: UIColor(named: "OnSurface")!]
+        navigationBarAppearance.titleTextAttributes = [.foregroundColor: UIColor(named: "OnBackground")!]
 
         self.viewModel = viewModel
         self.homeView = Home(
@@ -35,28 +35,49 @@ struct AppParent: View {
         self.searchView = Search(viewModel: viewModel.searchViewModel).eraseToAnyView()
     }
 
+    @ViewBuilder
+    private func getView(for tab: TabbarTabType) -> some View {
+        switch tab {
+        case .home: homeView
+        case .bookmarks: bookmarkView
+        case .account: accountView
+        case .search: searchView
+        }
+    }
 
     var body: some View {
         VStack (spacing: 0) {
-            ZStack {
-                homeView
-                    .opacity(appController.selectedAppTab == .home ? 1 : 0)
-                bookmarkView
-                    .opacity(appController.selectedAppTab == .bookmarks ? 1 : 0)
-                searchView
-                    .opacity(appController.selectedAppTab == .search ? 1 : 0)
-                accountView
-                    .opacity(appController.selectedAppTab == .account ? 1 : 0)
+            if #available(iOS 26.0, *) {
+                TabView {
+                    ForEach(TabbarTabType.allValues) { tab in
+                        Tab("", systemImage: tab.rawValue) {
+                            getView(for: tab)
+                        }
+                    }
+                }
+                .onChange(of: appController.selectedAppTab) { oldValue, newValue in
+                    HapticsController.triggerHapticLight()
+                }
+            } else {
+                ZStack {
+                    homeView
+                        .opacity(appController.selectedAppTab == .home ? 1 : 0)
+                    bookmarkView
+                        .opacity(appController.selectedAppTab == .bookmarks ? 1 : 0)
+                    searchView
+                        .opacity(appController.selectedAppTab == .search ? 1 : 0)
+                    accountView
+                        .opacity(appController.selectedAppTab == .account ? 1 : 0)
+                }
+                CustomTabBar(selectedTab: $appController.selectedAppTab)
             }
-            CustomTabBar(selectedTab: $appController.selectedAppTab)
         }
         .ignoresSafeArea(.keyboard)
         .fullScreenCover(isPresented: $viewModel.userNotOnBoarded, content: {
             OnBoarding(finishOnBoarding: viewModel.finishOnboarding)
         })
         .navigationViewStyle(StackNavigationViewStyle())
         .onOpenURL(perform: { url in
-            /// To be changed to user preference
             if PreferenceManager().openEventFromWidget {
                 guard let event = RealmManager().getEventByEventId(eventId: url.absoluteString) else { return }
                 AppController.shared.eventSheet = EventDetailsSheetModel(event: event)