Migrate BrowserSelector to Observable

iosApp/Source/App/CompactView.swift

@@ -14,9 +14,7 @@ import Reeeed
 struct CompactView: View {
 
  @Environment(AppState.self) private var appState
-
- @EnvironmentObject private var browserSelector: BrowserSelector
-
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(\.openURL) private var openURL
 
  @Binding var selectedDrawerItem: DrawerItem?

iosApp/Source/App/ContentView.swift

@@ -4,11 +4,10 @@ import FeedFlowKit
 struct ContentView: View {
 
  @Environment(AppState.self) private var appState
- @EnvironmentObject var browserSelector: BrowserSelector
-
  @Environment(\.scenePhase) private var scenePhase: ScenePhase
  @Environment(\.horizontalSizeClass) private var horizontalSizeClass: UserInterfaceSizeClass?
 
+ @State var browserSelector: BrowserSelector = BrowserSelector()
  @StateObject private var vmStoreOwner = VMStoreOwner<HomeViewModel>(Deps.shared.getHomeViewModel())
 
  @State private var isAppInBackground: Bool = false
@@ -23,14 +22,14 @@ struct ContentView: View {
  indexHolder: HomeListIndexHolder(homeViewModel: vmStoreOwner.instance),
  homeViewModel: vmStoreOwner.instance
  )
- .environmentObject(browserSelector)
+ .environment(browserSelector)
  } else {
  RegularView(
  selectedDrawerItem: $selectedDrawerItem,
  indexHolder: HomeListIndexHolder(homeViewModel: vmStoreOwner.instance),
  homeViewModel: vmStoreOwner.instance
  )
- .environmentObject(browserSelector)
+ .environment(browserSelector)
  }
 
  @Bindable var appState = appState

iosApp/Source/App/FeedFlowApp.swift

@@ -11,7 +11,6 @@ struct FeedFlowApp: App {
  @Environment(\.scenePhase) private var scenePhase: ScenePhase
 
  @State private var appState: AppState = AppState()
- @StateObject private var browserSelector: BrowserSelector = BrowserSelector()
 
  private var feedSyncTimer: FeedSyncTimer = FeedSyncTimer()
 
@@ -34,7 +33,6 @@ struct FeedFlowApp: App {
  WindowGroup {
  ContentView()
  .environment(appState)
- .environmentObject(browserSelector)
  .onOpenURL(perform: { url in
  Deps.shared.getDropboxDataSource().handleOAuthResponse {
  DropboxDataSourceIos.handleOAuthResponse(

iosApp/Source/App/RegularView.swift

@@ -13,8 +13,7 @@ import Reeeed
 
 struct RegularView: View {
  @Environment(AppState.self) private var appState
- @EnvironmentObject private var browserSelector: BrowserSelector
-
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(\.openURL) private var openURL
 
  @Binding var selectedDrawerItem: DrawerItem?

iosApp/Source/Home/Components/FeedListView.swift

@@ -13,10 +13,8 @@ import Reeeed
 
 struct FeedListView: View {
  @Environment(\.openURL) private var openURL
-
  @Environment(HomeListIndexHolder.self) private var indexHolder
- @EnvironmentObject private var browserSelector: BrowserSelector
-
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(AppState.self) private var appState
 
  @State private var browserToOpen: BrowserToPresent?

iosApp/Source/Home/HomeScreen.swift

@@ -12,10 +12,7 @@ import FeedFlowKit
 struct HomeScreen: View {
 
  @Environment(AppState.self) private var appState
-
- @EnvironmentObject
- private var browserSelector: BrowserSelector
-
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(HomeListIndexHolder.self) private var indexHolder
  @Environment(\.scenePhase) private var scenePhase
  @Environment(\.openURL) private var openURL

iosApp/Source/Home/HomeScreenContent.swift

@@ -262,7 +262,7 @@ fileprivate extension FeedFilter {
  )
  .environment(HomeListIndexHolder(fakeHomeViewModel: true))
  .environment(AppState())
- .environmentObject(BrowserSelector())
+ .environment(BrowserSelector())
 }
 
 #Preview("HomeContentLoaded") {
@@ -293,7 +293,7 @@ fileprivate extension FeedFilter {
  )
  .environment(HomeListIndexHolder(fakeHomeViewModel: true))
  .environment(AppState())
- .environmentObject(BrowserSelector())
+ .environment(BrowserSelector())
 }
 
 #Preview("HomeContentSettings") {
@@ -324,5 +324,5 @@ fileprivate extension FeedFilter {
  )
  .environment(HomeListIndexHolder(fakeHomeViewModel: true))
  .environment(AppState())
- .environmentObject(BrowserSelector())
+ .environment(BrowserSelector())
 }

iosApp/Source/Search/SearchScreenContent.swift

@@ -4,8 +4,7 @@ import FeedFlowKit
 
 struct SearchScreenContent: View {
  @Environment(\.openURL) private var openURL
-
- @EnvironmentObject private var browserSelector: BrowserSelector
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(AppState.self) private var appState
 
  @Binding var searchText: String

iosApp/Source/Settings/BrowserSelector.swift

@@ -10,7 +10,7 @@ import Foundation
 import FeedFlowKit
 import UIKit
 
-class BrowserSelector: ObservableObject {
+@Observable class BrowserSelector {
 
  private let supportedBrowsers = [
  Browser(
@@ -53,8 +53,8 @@ class BrowserSelector: ObservableObject {
  private let browserSettingsRepository = Deps.shared.getBrowserSettingsRepository()
  private let settingsRepository = Deps.shared.getSettingsRepository()
 
- @Published var browsers: [Browser] = []
- @Published var selectedBrowser: Browser? {
+ var browsers: [Browser] = []
+ var selectedBrowser: Browser? {
  didSet {
  browserSettingsRepository.setFavouriteBrowser(browser: selectedBrowser!)
  }

iosApp/Source/Settings/SettingsScreen.swift

@@ -12,8 +12,7 @@ import FeedFlowKit
 struct SettingsScreen: View {
 
  @Environment(AppState.self) private var appState
- @EnvironmentObject private var browserSelector: BrowserSelector
-
+ @Environment(BrowserSelector.self) private var browserSelector
  @Environment(\.dismiss) private var dismiss
  @Environment(\.openURL) private var openURL
 
@@ -99,6 +98,7 @@ struct SettingsScreen: View {
  @ViewBuilder
  private var behaviourSection: some View {
  Section(feedFlowStrings.settingsBehaviourTitle) {
+ @Bindable var browserSelector = browserSelector
  Picker(
  selection: $browserSelector.selectedBrowser,
  content: {
@@ -169,5 +169,5 @@ struct SettingsScreen: View {
 
 #Preview {
  SettingsScreen()
- .environmentObject(BrowserSelector())
+ .environment(BrowserSelector())
 }