Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 3302d62

Browse files
danielbareladanielbarela
committed
remove unused navstate
1 parent 42b095e commit 3302d62

File tree

10 files changed

+2
-38
lines changed

10 files changed

+2
-38
lines changed

‎Marlin/Marlin/BottomSheet/BottomSheetView.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ struct MarlinDataBottomSheet: View {
6666
}
6767

6868
struct MarlinBottomSheet: View {
69-
@StateObject var navState = NavState()
7069
@ObservedObject var itemList: BottomSheetItemList
7170
@State var selectedItem: Int = 0
7271

@@ -155,7 +154,6 @@ struct MarlinBottomSheet: View {
155154
if let dataSource = item.item as? DataSourceViewBuilder {
156155
dataSource.summaryView(showMoreDetails: true, showSectionHeader: true, mapName: item.mapName, showTitle: true)
157156
.transition(.opacity)
158-
.environmentObject(navState)
159157
}
160158
}
161159

‎Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningAreasView.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ struct CurrentNavigationalWarningSection: View {
3333
}
3434

3535
struct NavigationalWarningAreasView: View {
36-
@EnvironmentObject var navState: NavState
3736
@ObservedObject var generalLocation = GeneralLocation.shared
3837
@State var navArea: String?
3938
var mapName: String?
@@ -74,7 +73,6 @@ struct NavigationalWarningAreasView: View {
7473
if showUnparsedNavigationalWarnings {
7574
NavigationLink {
7675
NavigationalWarningNavAreaListView(warnings: Array<NavigationalWarning>(noParsedLocationNavigationalWarnings), navArea: "Unknown", mapName: mapName)
77-
.environmentObject(navState)
7876
} label: {
7977
HStack {
8078
VStack(alignment: .leading) {

‎Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningDetailView.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import SwiftUI
99
import MapKit
1010

1111
struct NavigationalWarningDetailView: View {
12-
@EnvironmentObject var navState: NavState
1312
@ObservedObject var navigationalWarning: NavigationalWarning
1413

1514
@State var mappedLocation: MappedLocation?
@@ -41,7 +40,7 @@ struct NavigationalWarningDetailView: View {
4140
if let cancelNavArea = navigationalWarning.cancelNavArea, let navAreaEnum = NavigationalWarningNavArea.fromId(id: cancelNavArea){
4241
Property(property: "Cancelled By", value: "\(navAreaEnum.display) \(navigationalWarning.cancelMsgNumber)/\(navigationalWarning.cancelMsgYear)")
4342
}
44-
NavigationalWarningActionBar(navigationalWarning: navigationalWarning, showMoreDetails: false, mapName: navState.mapName)
43+
NavigationalWarningActionBar(navigationalWarning: navigationalWarning, showMoreDetails: false, mapName: "Navigational Warning Detail Map")
4544
.padding(.bottom, 16)
4645
}.padding([.leading, .trailing], 16)
4746
}

‎Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningNavAreaListView.swift‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import SwiftUI
99
import Combine
1010

1111
struct NavigationalWarningNavAreaListView: View {
12-
@EnvironmentObject var navState: NavState
1312
@AppStorage<String> var lastSeen: String
1413
@State var lastSavedDate: Date = Date(timeIntervalSince1970: 0)
1514
@State var scrollingTo: ObjectIdentifier?
@@ -37,11 +36,9 @@ struct NavigationalWarningNavAreaListView: View {
3736
ForEach(dataSource.items) { navigationalWarning in
3837
NavigationLink {
3938
navigationalWarning.detailView
40-
.environmentObject(navState)
4139
} label: {
4240
HStack {
4341
navigationalWarning.summaryView(mapName: mapName)
44-
.environmentObject(navState)
4542
.padding(.all, 16)
4643
}
4744
.card()
@@ -153,8 +150,6 @@ struct NavigationalWarningNavAreaListView: View {
153150
}
154151
.navigationTitle(NavigationalWarningNavArea.fromId(id: navArea)?.display ?? "Navigational Warnings")
155152
.navigationBarTitleDisplayMode(.inline)
156-
157-
.environmentObject(navState)
158153
}
159154
}
160155

‎Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningOverview.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import SwiftUI
99
import MapKit
1010

1111
struct NavigationalWarningsOverview: View {
12-
@StateObject var navState = NavState()
1312
@ObservedObject var generalLocation: GeneralLocation = GeneralLocation.shared
1413

1514
let MAP_NAME = "Navigational Warning List View Map"
@@ -27,7 +26,6 @@ struct NavigationalWarningsOverview: View {
2726
NavigationLink(tag: "detail", selection: $selection) {
2827
if let data = itemWrapper.dataSource as? DataSourceViewBuilder {
2928
data.detailView
30-
.environmentObject(navState)
3129
}
3230
} label: {
3331
EmptyView()
@@ -43,7 +41,6 @@ struct NavigationalWarningsOverview: View {
4341
.edgesIgnoringSafeArea([.leading, .trailing])
4442
NavigationalWarningAreasView(mapName: MAP_NAME)
4543
.currentNavArea(generalLocation.currentNavArea?.name)
46-
.environmentObject(navState)
4744
}
4845
}
4946
.navigationTitle(NavigationalWarning.fullDataSourceName)
@@ -52,8 +49,6 @@ struct NavigationalWarningsOverview: View {
5249
.onAppear {
5350
Metrics.shared.appRoute([NavigationalWarning.metricsKey, "group"])
5451
Metrics.shared.dataSourceList(dataSource: NavigationalWarning.self)
55-
navState.navGroupName = "\(NavigationalWarning.key)List"
56-
navState.mapName = MAP_NAME
5752
}
5853
.onReceive(viewDataSourcePub) { output in
5954
if let dataSource = output.dataSource as? NavigationalWarning, output.mapName == MAP_NAME {
@@ -63,7 +58,6 @@ struct NavigationalWarningsOverview: View {
6358
selection = "detail"
6459
}
6560
}
66-
.id(navState.rootViewId)
6761
}
6862

6963
}

‎Marlin/Marlin/DataSources/NavigationalWarning/Views/NavigationalWarningSectionRow.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
import SwiftUI
99

1010
struct NavigationalWarningSectionRow: View {
11-
@EnvironmentObject var navState: NavState
1211
var section: SectionedFetchResults<String, NavigationalWarning>.Element
1312
var mapName: String?
1413

1514
var body: some View {
1615
NavigationLink {
1716
NavigationalWarningNavAreaListView(warnings: Array<NavigationalWarning>(section), navArea: section.id, mapName: mapName)
18-
.environmentObject(navState)
1917
} label: {
2018

2119
HStack {

‎Marlin/Marlin/MarlinApp.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ struct TestApp: App {
3636
}
3737
}
3838

39-
final class NavState : ObservableObject {
40-
@Published var rootViewId = UUID()
41-
@Published var navGroupName: String?
42-
@Published var mapName: String?
43-
}
44-
4539
class AppState: ObservableObject {
4640
@Published var loadingDataSource: [String : Bool] = [:]
4741
@Published var dataSourceBatchImportNotificationsPending: [String: [DataSourceUpdatedNotification]] = [:]

‎Marlin/Marlin/Views/MapNavigationView.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import SwiftUI
99

1010
struct MapNavigationView: View {
1111
@EnvironmentObject var dataSourceList: DataSourceList
12-
@StateObject var navState: NavState = NavState()
1312
@Binding var filterOpen: Bool
1413
@Binding var selection: String?
1514
@Binding var menuOpen: Bool
@@ -45,7 +44,6 @@ struct MapNavigationView: View {
4544
NavigationLink(tag: "detail", selection: $selection) {
4645
if let data = itemWrapper.dataSource as? DataSourceViewBuilder {
4746
data.detailView
48-
.environmentObject(navState)
4947
}
5048
} label: {
5149
EmptyView()

‎Marlin/MarlinTests/DataSources/NavigationalWarning/NavigationalWarningDetailTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ final class NavigationalWarningDetailTests: XCTestCase {
6464
return
6565
}
6666

67-
let detailView = newItem.detailView.environment(\.managedObjectContext, persistentStore.viewContext).environmentObject(NavState())
67+
let detailView = newItem.detailView.environment(\.managedObjectContext, persistentStore.viewContext)
6868

6969
let controller = UIHostingController(rootView: detailView)
7070
let window = TestHelpers.getKeyWindowVisible()

‎Marlin/MarlinTests/DataSources/NavigationalWarning/NavigationalWarningNavAreaListViewTests.swift‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
9898
struct Container: View {
9999

100100
@ObservedObject var passThrough: PassThrough
101-
@ObservedObject var navState = NavState()
102101

103102
init(passThrough: PassThrough) {
104103
self.passThrough = passThrough
@@ -107,7 +106,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
107106
var body: some View {
108107
NavigationView {
109108
NavigationalWarningNavAreaListView(warnings: passThrough.warnings, navArea: passThrough.navArea, mapName: "Navigational Warning List View Map")
110-
.environmentObject(navState)
111109
}
112110
}
113111
}
@@ -168,7 +166,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
168166
struct Container: View {
169167

170168
@ObservedObject var passThrough: PassThrough
171-
@ObservedObject var navState = NavState()
172169

173170
init(passThrough: PassThrough) {
174171
self.passThrough = passThrough
@@ -177,7 +174,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
177174
var body: some View {
178175
NavigationView {
179176
NavigationalWarningNavAreaListView(warnings: passThrough.warnings, navArea: passThrough.navArea, mapName: "Navigational Warning List View Map")
180-
.environmentObject(navState)
181177
}
182178
}
183179
}
@@ -242,7 +238,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
242238
struct Container: View {
243239

244240
@ObservedObject var passThrough: PassThrough
245-
@ObservedObject var navState = NavState()
246241

247242
init(passThrough: PassThrough) {
248243
self.passThrough = passThrough
@@ -251,7 +246,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
251246
var body: some View {
252247
NavigationView {
253248
NavigationalWarningNavAreaListView(warnings: passThrough.warnings, navArea: passThrough.navArea, mapName: "Navigational Warning List View Map")
254-
.environmentObject(navState)
255249
}
256250
}
257251
}
@@ -316,7 +310,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
316310
struct Container: View {
317311

318312
@ObservedObject var passThrough: PassThrough
319-
@ObservedObject var navState = NavState()
320313

321314
init(passThrough: PassThrough) {
322315
self.passThrough = passThrough
@@ -325,7 +318,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
325318
var body: some View {
326319
NavigationView {
327320
NavigationalWarningNavAreaListView(warnings: passThrough.warnings, navArea: passThrough.navArea, mapName: "Navigational Warning List View Map")
328-
.environmentObject(navState)
329321
}
330322
}
331323
}
@@ -393,7 +385,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
393385
struct Container: View {
394386

395387
@ObservedObject var passThrough: PassThrough
396-
@ObservedObject var navState = NavState()
397388

398389
init(passThrough: PassThrough) {
399390
self.passThrough = passThrough
@@ -402,7 +393,6 @@ final class NavigationalWarningNavAreaListViewTests: XCTestCase {
402393
var body: some View {
403394
NavigationView {
404395
NavigationalWarningNavAreaListView(warnings: passThrough.warnings, navArea: passThrough.navArea, mapName: "Navigational Warning List View Map")
405-
.environmentObject(navState)
406396
}
407397
}
408398
}

0 commit comments

Comments
 (0)