From cf7620613f44258061e19b92e9ba8adebae6f23c Mon Sep 17 00:00:00 2001
From: CLARATION <claration@riseup.net>
Date: Sat, 9 May 2026 01:22:00 -0700
Subject: [PATCH 1/3] refactor: uikit tabbar

---
 Feather/{FeatherApp.swift => Entry.swift} | 235 ++++++++++------------
 Feather/Views/TabController.swift         |  73 +++++++
 2 files changed, 175 insertions(+), 133 deletions(-)
 rename Feather/{FeatherApp.swift => Entry.swift} (65%)
 create mode 100644 Feather/Views/TabController.swift

diff --git a/Feather/FeatherApp.swift b/Feather/Entry.swift
similarity index 65%
rename from Feather/FeatherApp.swift
rename to Feather/Entry.swift
index 63ed30db7..eb496dd4f 100644
--- a/Feather/FeatherApp.swift
+++ b/Feather/Entry.swift
@@ -10,140 +10,17 @@ import Nuke
 import IDeviceSwift
 import OSLog
 
-@main
-struct FeatherApp: App {
-	@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-	
-	let heartbeat = HeartbeatManager.shared
-	
-	@StateObject var downloadManager = DownloadManager.shared
-	let storage = Storage.shared
-	
-	var body: some Scene {
-		WindowGroup {
-			VStack {
-				DownloadHeaderView(downloadManager: downloadManager)
-					.transition(.move(edge: .top).combined(with: .opacity))
-				VariedTabbarView()
-					.environment(\.managedObjectContext, storage.context)
-					.onOpenURL(perform: _handleURL)
-					.transition(.move(edge: .top).combined(with: .opacity))
-			}
-			.animation(.smooth, value: downloadManager.manualDownloads.description)
-			.onReceive(NotificationCenter.default.publisher(for: .heartbeatInvalidHost)) { _ in
-				DispatchQueue.main.async {
-					UIAlertController.showAlertWithOk(
-						title: "InvalidHostID",
-						message: .localized("Your pairing file is invalid and is incompatible with your device, please import a valid pairing file.")
-					)
-				}
-			}
-			// dear god help me
-			.onAppear {
-				if let style = UIUserInterfaceStyle(rawValue: UserDefaults.standard.integer(forKey: "Feather.userInterfaceStyle")) {
-					UIApplication.topViewController()?.view.window?.overrideUserInterfaceStyle = style
-				}
-				
-				UIApplication.topViewController()?.view.window?.tintColor = UIColor(Color(hex: UserDefaults.standard.string(forKey: "Feather.userTintColor") ?? "#848ef9"))
-			}
-		}
-	}
-	
-	private func _handleURL(_ url: URL) {
-		if url.scheme == "feather" {
-			/// feather://import-certificate?p12=<base64>&mobileprovision=<base64>&password=<base64>
-			if url.host == "import-certificate" {
-				guard
-					let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
-					let queryItems = components.queryItems
-				else {
-					return
-				}
-				
-				func queryValue(_ name: String) -> String? {
-					queryItems.first(where: { $0.name == name })?.value?.removingPercentEncoding
-				}
-				
-				guard
-					let p12Base64 = queryValue("p12"),
-					let provisionBase64 = queryValue("mobileprovision"),
-					let passwordBase64 = queryValue("password"),
-					let passwordData = Data(base64Encoded: passwordBase64),
-					let password = String(data: passwordData, encoding: .utf8)
-				else {
-					return
-				}
-				
-				let generator = UINotificationFeedbackGenerator()
-				generator.prepare()
-				
-				guard
-					let p12URL = FileManager.default.decodeAndWrite(base64: p12Base64, pathComponent: ".p12"),
-					let provisionURL = FileManager.default.decodeAndWrite(base64: provisionBase64, pathComponent: ".mobileprovision"),
-					FR.checkPasswordForCertificate(for: p12URL, with: password, using: provisionURL)
-				else {
-					generator.notificationOccurred(.error)
-					return
-				}
-				
-				FR.handleCertificateFiles(
-					p12URL: p12URL,
-					provisionURL: provisionURL,
-					p12Password: password
-				) { error in
-					if let error = error {
-						UIAlertController.showAlertWithOk(title: .localized("Error"), message: error.localizedDescription)
-					} else {
-						generator.notificationOccurred(.success)
-					}
-				}
-				
-				return
-			}
-			/// feather://export-certificate?callback_template=<template>
-			/// ?callback_template=: This is how we callback to the application requesting the certificate, this will be a url scheme
-			/// 	example: livecontainer%3A%2F%2Fcertificate%3Fcert%3D%24%28BASE64_CERT%29%26password%3D%24%28PASSWORD%29
-			/// 	decoded: livecontainer://certificate?cert=$(BASE64_CERT)&password=$(PASSWORD)
-			/// $(BASE64_CERT) and $(PASSWORD) must be presenting in the callback template so we can replace them with the proper content
-			if url.host == "export-certificate" {
-				guard
-					let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
-				else {
-					return
-				}
-				
-				let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
-				guard let callbackTemplate = queryItems["callback_template"]?.removingPercentEncoding else { return }
-				
-				FR.exportCertificateAndOpenUrl(using: callbackTemplate)
-			}
-			/// feather://source/<url>
-			if let fullPath = url.validatedScheme(after: "/source/") {
-				FR.handleSource(fullPath) { }
-			}
-			/// feather://install/<url.ipa>
-			if
-				let fullPath = url.validatedScheme(after: "/install/"),
-				let downloadURL = URL(string: fullPath)
-			{
-				_ = DownloadManager.shared.startDownload(from: downloadURL)
-			}
-		} else {
-			if url.pathExtension == "ipa" || url.pathExtension == "tipa" {
-				if FileManager.default.isFileFromFileProvider(at: url) {
-					guard url.startAccessingSecurityScopedResource() else { return }
-					FR.handlePackageFile(url) { _ in }
-				} else {
-					FR.handlePackageFile(url) { _ in }
-				}
-				
-				return
-			}
-		}
+@main enum Entry {
+	static func main() {
+		let delegate = AppDelegate()
+		UIApplication.shared.delegate = delegate
+		_ = UIApplicationMain(CommandLine.argc, CommandLine.unsafeArgv, nil, NSStringFromClass(AppDelegate.self))
 	}
 }
 
-class AppDelegate: NSObject, UIApplicationDelegate {
+final class AppDelegate: UIResponder, UIApplicationDelegate {
+	var window: UIWindow?
+	
 	func application(
 		_ application: UIApplication,
 		didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
@@ -152,6 +29,17 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 		_createDocumentsDirectories()
 		ResetView.clearWorkCache()
 		_addDefaultCertificates()
+		
+		let tc = TabController()
+		window = UIWindow(frame: UIScreen.main.bounds)
+		window?.rootViewController = tc
+		window?.makeKeyAndVisible()
+		
+		DispatchQueue.main.async {
+			self.window!.tintColor = UIColor(Color(hex: UserDefaults.standard.string(forKey: "Feather.userTintColor") ?? "#848ef9"))
+			self.window!.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: UserDefaults.standard.integer(forKey: "Feather.userInterfaceStyle")) ?? .unspecified
+		}
+		
 		return true
 	}
 	
@@ -164,10 +52,13 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 				config.urlCache = nil
 				return DataLoader(configuration: config)
 			}()
-			let dataCache = try? DataCache(name: "thewonderofyou.Feather.datacache") // disk cache
-			let imageCache = Nuke.ImageCache() // memory cache
+			
+			let dataCache = try? DataCache(name: "\(Bundle.main.bundleIdentifier!).datacache")
+			let imageCache = Nuke.ImageCache()
+			
 			dataCache?.sizeLimit = 500 * 1024 * 1024
 			imageCache.costLimit = 100 * 1024 * 1024
+			
 			$0.dataCache = dataCache
 			$0.imageCache = imageCache
 			$0.dataLoader = dataLoader
@@ -243,5 +134,83 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 			Logger.misc.error("Failed to list signing-assets: \(error)")
 		}
 	}
+	
+	func application(_: UIApplication, open url: URL, options _: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+		if url.scheme == "feather" {
+			/// feather://import-certificate?p12=<base64>&mobileprovision=<base64>&password=<base64>
+			if url.host == "import-certificate" {
+				guard
+					let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+					let queryItems = components.queryItems
+				else {
+					return false
+				}
+				
+				func queryValue(_ name: String) -> String? {
+					queryItems.first(where: { $0.name == name })?.value?.removingPercentEncoding
+				}
+				
+				guard
+					let p12Base64 = queryValue("p12"),
+					let provisionBase64 = queryValue("mobileprovision"),
+					let passwordBase64 = queryValue("password"),
+					let passwordData = Data(base64Encoded: passwordBase64),
+					let password = String(data: passwordData, encoding: .utf8)
+				else {
+					return false
+				}
+				
+				let generator = UINotificationFeedbackGenerator()
+				generator.prepare()
+				
+				guard
+					let p12URL = FileManager.default.decodeAndWrite(base64: p12Base64, pathComponent: ".p12"),
+					let provisionURL = FileManager.default.decodeAndWrite(base64: provisionBase64, pathComponent: ".mobileprovision"),
+					FR.checkPasswordForCertificate(for: p12URL, with: password, using: provisionURL)
+				else {
+					generator.notificationOccurred(.error)
+					return false
+				}
+				
+				FR.handleCertificateFiles(
+					p12URL: p12URL,
+					provisionURL: provisionURL,
+					p12Password: password
+				) { error in
+					if let error = error {
+						UIAlertController.showAlertWithOk(title: .localized("Error"), message: error.localizedDescription)
+					} else {
+						generator.notificationOccurred(.success)
+					}
+				}
+				
+				return true
+			}
+			/// feather://source/<url>
+			if let fullPath = url.validatedScheme(after: "/source/") {
+				FR.handleSource(fullPath) { }
+			}
+			/// feather://install/<url.ipa>
+			if
+				let fullPath = url.validatedScheme(after: "/install/"),
+				let downloadURL = URL(string: fullPath)
+			{
+				_ = DownloadManager.shared.startDownload(from: downloadURL)
+			}
+		} else {
+			if url.pathExtension == "ipa" || url.pathExtension == "tipa" {
+				if FileManager.default.isFileFromFileProvider(at: url) {
+					guard url.startAccessingSecurityScopedResource() else { return false }
+					FR.handlePackageFile(url) { _ in }
+				} else {
+					FR.handlePackageFile(url) { _ in }
+				}
+				
+				return true
+			}
+		}
+		
+		return false
+	}
 
 }
diff --git a/Feather/Views/TabController.swift b/Feather/Views/TabController.swift
new file mode 100644
index 000000000..7fa7a7ec6
--- /dev/null
+++ b/Feather/Views/TabController.swift
@@ -0,0 +1,73 @@
+//
+//  TabbarController.swift
+//  Feather
+//
+//  Created by samsam on 5/8/26.
+//
+
+import UIKit
+import SwiftUI
+
+final class TabController: UITabBarController {
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		_setupTabs()
+	}
+	
+	private func _setupTabs() {
+		let files = _createNavigation(
+			with: .localized("Files"),
+			using: UIImage(systemName: "folder.fill"),
+			controller: UIViewController()
+		)
+		
+		let sources = _createNavigation(
+			with: .localized("Sources"),
+			using: UIImage(systemName: "globe.desk.fill"),
+			controller: UIHostingController(rootView: SourcesView()),
+			withNavigation: false,
+		)
+		
+		let library = _createNavigation(
+			with: .localized("Apps"),
+			using: UIImage(systemName: "square.grid.2x2.fill"),
+			controller: UIHostingController(rootView: LibraryView()),
+			withNavigation: false,
+		)
+		
+		let settings = _createNavigation(
+			with: .localized("Settings"),
+			using: UIImage(systemName: "gearshape.2.fill"),
+			controller: UIHostingController(rootView: SettingsView()),
+			withNavigation: false,
+		)
+		
+		self.setViewControllers([
+			files,
+			sources,
+			library,
+			settings,
+		], animated: false)
+	}
+	
+	#warning("remove swiftui remnants")
+	private func _createNavigation(
+		with title: String,
+		using image: UIImage?,
+		controller: UIViewController,
+		withNavigation: Bool = true
+	) -> UIViewController {
+		if withNavigation {
+			let nav = UINavigationController(rootViewController: controller)
+			nav.tabBarItem.title = title
+			nav.tabBarItem.image = image
+			nav.viewControllers.first?.navigationItem.title = title
+			return nav
+		} else {
+			controller.tabBarItem.title = title
+			controller.tabBarItem.image = image
+			controller.navigationItem.title = title
+			return controller
+		}
+	}
+}

From 1c9cdefd58d6a27cccfee6692317515a2481a27b Mon Sep 17 00:00:00 2001
From: CLARATION <claration@riseup.net>
Date: Sat, 9 May 2026 01:24:17 -0700
Subject: [PATCH 2/3] chore: remove swiftui tabview

---
 .../TabView/Bars/ExtendedTabbarView.swift     | 107 ------------------
 Feather/Views/TabView/Bars/TabbarView.swift   |  24 ----
 Feather/Views/TabView/TabEnum.swift           |  58 ----------
 Feather/Views/TabView/VariedTabbarView.swift  |  20 ----
 4 files changed, 209 deletions(-)
 delete mode 100644 Feather/Views/TabView/Bars/ExtendedTabbarView.swift
 delete mode 100644 Feather/Views/TabView/Bars/TabbarView.swift
 delete mode 100644 Feather/Views/TabView/TabEnum.swift
 delete mode 100644 Feather/Views/TabView/VariedTabbarView.swift

diff --git a/Feather/Views/TabView/Bars/ExtendedTabbarView.swift b/Feather/Views/TabView/Bars/ExtendedTabbarView.swift
deleted file mode 100644
index 7dd029003..000000000
--- a/Feather/Views/TabView/Bars/ExtendedTabbarView.swift
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//  TabbarController.swift
-//  feather
-//
-//  Created by samara on 5/17/24.
-//  Copyright (c) 2024 Samara M (khcrysalis)
-//
-
-import SwiftUI
-import NukeUI
-
-@available(iOS 18, *)
-struct ExtendedTabbarView: View {
-	@Environment(\.horizontalSizeClass) var horizontalSizeClass
-	@AppStorage("Feather.tabCustomization") var customization = TabViewCustomization()
-	@StateObject var viewModel = SourcesViewModel.shared
-	
-	@State private var _isAddingPresenting = false
-	
-	@FetchRequest(
-		entity: AltSource.entity(),
-		sortDescriptors: [NSSortDescriptor(keyPath: \AltSource.name, ascending: true)],
-		animation: .snappy
-	) private var _sources: FetchedResults<AltSource>
-		
-	var body: some View {
-		TabView {
-			ForEach(TabEnum.defaultTabs, id: \.hashValue) { tab in
-				Tab(tab.title, systemImage: tab.icon) {
-					TabEnum.view(for: tab)
-				}
-			}
-			
-			ForEach(TabEnum.customizableTabs, id: \.hashValue) { tab in
-				Tab(tab.title, systemImage: tab.icon) {
-					TabEnum.view(for: tab)
-				}
-				.customizationID("tab.\(tab.rawValue)")
-				.defaultVisibility(.hidden, for: .tabBar)
-				.customizationBehavior(.reorderable, for: .tabBar, .sidebar)
-				.hidden(horizontalSizeClass == .compact)
-			}
-			
-			TabSection("Sources") {
-				Tab(.localized("All Repositories"), systemImage: "globe.desk") {
-					NavigationStack {
-						SourceAppsView(object: Array(_sources), viewModel: viewModel)
-					}
-				}
-				
-				ForEach(_sources, id: \.identifier) { source in
-					Tab {
-						NavigationStack {
-							SourceAppsView(object: [source], viewModel: viewModel)
-						}
-					} label: {
-						_icon(source.name ?? .localized("Unknown"), iconUrl: source.iconURL)
-					}
-					.swipeActions {
-						Button(.localized("Delete"), systemImage: "trash", role: .destructive) {
-							Storage.shared.deleteSource(for: source)
-						}
-					}
-				}
-			}
-			.sectionActions {
-				Button(.localized("Add Source"), systemImage: "plus") {
-					_isAddingPresenting = true
-				}
-			}
-			.defaultVisibility(.hidden, for: .tabBar)
-			.hidden(horizontalSizeClass == .compact)
-		}
-		.tabViewStyle(.sidebarAdaptable)
-		.tabViewCustomization($customization)
-		.sheet(isPresented: $_isAddingPresenting) {
-			SourcesAddView()
-				.presentationDetents([.medium])
-		}
-	}
-	
-	@ViewBuilder
-	private func _icon(_ title: String, iconUrl: URL?) -> some View {
-		Label {
-			Text(title)
-		} icon: {
-			if let iconURL = iconUrl {
-				LazyImage(url: iconURL) { state in
-					if let image = state.image {
-						image
-					} else {
-						standardIcon
-					}
-				}
-				.processors([.resize(width: 14), .circle()])
-			} else {
-				standardIcon
-			}
-		}
-	}
-
-	
-	var standardIcon: some View {
-		Image(systemName: "app.dashed")
-	}
-}
-
diff --git a/Feather/Views/TabView/Bars/TabbarView.swift b/Feather/Views/TabView/Bars/TabbarView.swift
deleted file mode 100644
index 064d9893a..000000000
--- a/Feather/Views/TabView/Bars/TabbarView.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  TabbarView.swift
-//  feather
-//
-//  Created by samara on 23.03.2025.
-//
-
-import SwiftUI
-
-struct TabbarView: View {
-	@State private var selectedTab: TabEnum = .sources
-
-	var body: some View {
-		TabView(selection: $selectedTab) {
-			ForEach(TabEnum.defaultTabs, id: \.hashValue) { tab in
-				TabEnum.view(for: tab)
-					.tabItem {
-						Label(tab.title, systemImage: tab.icon)
-					}
-					.tag(tab)
-			}
-		}
-	}
-}
diff --git a/Feather/Views/TabView/TabEnum.swift b/Feather/Views/TabView/TabEnum.swift
deleted file mode 100644
index 91c17fc7e..000000000
--- a/Feather/Views/TabView/TabEnum.swift
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  TabEnum.swift
-//  feather
-//
-//  Created by samara on 22.03.2025.
-//
-
-import SwiftUI
-import NimbleViews
-
-enum TabEnum: String, CaseIterable, Hashable {
-	case sources
-	case library
-	case settings
-	case certificates
-	
-	var title: String {
-		switch self {
-		case .sources:     	return .localized("Sources")
-		case .library: 		return .localized("Library")
-		case .settings: 	return .localized("Settings")
-		case .certificates:	return .localized("Certificates")
-		}
-	}
-	
-	var icon: String {
-		switch self {
-		case .sources: 		return "globe.desk"
-		case .library: 		return "square.grid.2x2"
-		case .settings: 	return "gearshape.2"
-		case .certificates: return "person.text.rectangle"
-		}
-	}
-	
-	@ViewBuilder
-	static func view(for tab: TabEnum) -> some View {
-		switch tab {
-		case .sources: SourcesView()
-		case .library: LibraryView()
-		case .settings: SettingsView()
-		case .certificates: NBNavigationView(.localized("Certificates")) { CertificatesView() }
-		}
-	}
-	
-	static var defaultTabs: [TabEnum] {
-		return [
-			.sources,
-			.library,
-			.settings
-		]
-	}
-	
-	static var customizableTabs: [TabEnum] {
-		return [
-			.certificates
-		]
-	}
-}
diff --git a/Feather/Views/TabView/VariedTabbarView.swift b/Feather/Views/TabView/VariedTabbarView.swift
deleted file mode 100644
index a857f77dd..000000000
--- a/Feather/Views/TabView/VariedTabbarView.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  VariedTabbarView.swift
-//  Feather
-//
-//  Created by samara on 11.04.2025.
-//
-
-import SwiftUI
-
-struct VariedTabbarView: View {
-	init() {}
-	
-	var body: some View {
-		if #available(iOS 18, *) {
-			ExtendedTabbarView()
-		} else {
-			TabbarView()
-		}
-	}
-}

From 1e6da917d4d788d65a28ba9a1a9c331fc5edbb56 Mon Sep 17 00:00:00 2001
From: CLARATION <claration@riseup.net>
Date: Sun, 10 May 2026 16:35:39 -0700
Subject: [PATCH 3/3] refactor: start of settings controller

---
 Feather/Entry.swift                           |  6 ++-
 .../Settings/SettingsViewController.swift     | 53 +++++++++++++++++++
 ...ontroller.swift => TabBarController.swift} | 16 +++---
 3 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 Feather/Views/Settings/SettingsViewController.swift
 rename Feather/Views/{TabController.swift => TabBarController.swift} (77%)

diff --git a/Feather/Entry.swift b/Feather/Entry.swift
index eb496dd4f..640c7ab99 100644
--- a/Feather/Entry.swift
+++ b/Feather/Entry.swift
@@ -12,6 +12,10 @@ import OSLog
 
 @main enum Entry {
 	static func main() {
+		let _ = Storage.shared
+		let _ = DownloadManager.shared
+		let _ = HeartbeatManager.shared
+		
 		let delegate = AppDelegate()
 		UIApplication.shared.delegate = delegate
 		_ = UIApplicationMain(CommandLine.argc, CommandLine.unsafeArgv, nil, NSStringFromClass(AppDelegate.self))
@@ -30,7 +34,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 		ResetView.clearWorkCache()
 		_addDefaultCertificates()
 		
-		let tc = TabController()
+		let tc = TabBarController()
 		window = UIWindow(frame: UIScreen.main.bounds)
 		window?.rootViewController = tc
 		window?.makeKeyAndVisible()
diff --git a/Feather/Views/Settings/SettingsViewController.swift b/Feather/Views/Settings/SettingsViewController.swift
new file mode 100644
index 000000000..3a1faa720
--- /dev/null
+++ b/Feather/Views/Settings/SettingsViewController.swift
@@ -0,0 +1,53 @@
+//
+//  SettingsViewController.swift
+//  Feather
+//
+//  Created by samsam on 5/10/26.
+//
+
+import UIKit
+
+class SettingsViewController: UITableViewController {
+	init() {
+		super.init(style: .insetGrouped)
+	}
+	
+	@available(*, unavailable)
+	required init?(coder: NSCoder) {
+		fatalError("init(coder:) has not been implemented")
+	}
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		self.title = .localized("Settings")
+		self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: "SettingsCell")
+	}
+}
+
+extension SettingsViewController {
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		 1
+	}
+	
+	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		 1
+	}
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(
+			withIdentifier: "SettingsCell",
+			for: indexPath
+		)
+		
+		cell.accessoryType = .disclosureIndicator
+		
+		var content = cell.defaultContentConfiguration()
+		content.text = "hai"
+		cell.contentConfiguration = content
+		
+		return cell
+	}
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		tableView.deselectRow(at: indexPath, animated: true)
+	}
+}
diff --git a/Feather/Views/TabController.swift b/Feather/Views/TabBarController.swift
similarity index 77%
rename from Feather/Views/TabController.swift
rename to Feather/Views/TabBarController.swift
index 7fa7a7ec6..96e67dccf 100644
--- a/Feather/Views/TabController.swift
+++ b/Feather/Views/TabBarController.swift
@@ -8,9 +8,14 @@
 import UIKit
 import SwiftUI
 
-final class TabController: UITabBarController {
+final class TabBarController: UITabBarController {
 	override func viewDidLoad() {
 		super.viewDidLoad()
+		
+		if #available(iOS 18.0, *) {
+			self.mode = .tabSidebar
+		}
+		
 		_setupTabs()
 	}
 	
@@ -24,22 +29,21 @@ final class TabController: UITabBarController {
 		let sources = _createNavigation(
 			with: .localized("Sources"),
 			using: UIImage(systemName: "globe.desk.fill"),
-			controller: UIHostingController(rootView: SourcesView()),
+			controller: UIHostingController(rootView: SourcesView().environment(\.managedObjectContext, Storage.shared.context)),
 			withNavigation: false,
 		)
 		
 		let library = _createNavigation(
 			with: .localized("Apps"),
 			using: UIImage(systemName: "square.grid.2x2.fill"),
-			controller: UIHostingController(rootView: LibraryView()),
+			controller: UIHostingController(rootView: LibraryView().environment(\.managedObjectContext, Storage.shared.context)),
 			withNavigation: false,
 		)
 		
 		let settings = _createNavigation(
 			with: .localized("Settings"),
 			using: UIImage(systemName: "gearshape.2.fill"),
-			controller: UIHostingController(rootView: SettingsView()),
-			withNavigation: false,
+			controller: SettingsViewController(),
 		)
 		
 		self.setViewControllers([
@@ -61,12 +65,10 @@ final class TabController: UITabBarController {
 			let nav = UINavigationController(rootViewController: controller)
 			nav.tabBarItem.title = title
 			nav.tabBarItem.image = image
-			nav.viewControllers.first?.navigationItem.title = title
 			return nav
 		} else {
 			controller.tabBarItem.title = title
 			controller.tabBarItem.image = image
-			controller.navigationItem.title = title
 			return controller
 		}
 	}