Try to use the NaivgationStackView (https://github.com/biobeats/swift…

…ui-navigation-stack/blob/master/Sources/NavigationStack/NavigationStack.swift) to manage the back stack. Let's see if this works
HymnalDreamTeam · Jul 10, 2020 · ea069a1 · ea069a1
1 parent e77547c
commit ea069a1
Show file tree

Hide file tree

Showing 11 changed files with 367 additions and 17 deletions.
diff --git a/Hymns.xcodeproj/project.pbxproj b/Hymns.xcodeproj/project.pbxproj
@@ -130,6 +130,7 @@
 		3B90969B245F7F14000229A2 /* HymnEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B90969A245F7F14000229A2 /* HymnEntity.swift */; };
 		3B9ED1BE2486272600BD004E /* BrowseResultsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B9ED1BD2486272600BD004E /* BrowseResultsListView.swift */; };
 		3B9ED1C02486296000BD004E /* BrowseResultsListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B9ED1BF2486296000BD004E /* BrowseResultsListViewModel.swift */; };
+		3B9EE5C424B1B5C900976DC6 /* NavigationStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B9EE5C324B1B5C900976DC6 /* NavigationStack.swift */; };
 		3BA4612524771C460068F269 /* SongInfoViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA4612424771C460068F269 /* SongInfoViewModel.swift */; };
 		3BA4612724771EAD0068F269 /* SongInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA4612624771EAD0068F269 /* SongInfoView.swift */; };
 		3BA4612B24772B250068F269 /* SongInfoDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA4612A24772B250068F269 /* SongInfoDialogView.swift */; };
@@ -389,6 +390,7 @@
 		3B9AE08D245902920027C571 /* classic40.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = classic40.json; sourceTree = "<group>"; };
 		3B9ED1BD2486272600BD004E /* BrowseResultsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowseResultsListView.swift; sourceTree = "<group>"; };
 		3B9ED1BF2486296000BD004E /* BrowseResultsListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowseResultsListViewModel.swift; sourceTree = "<group>"; };
+		3B9EE5C324B1B5C900976DC6 /* NavigationStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationStack.swift; sourceTree = "<group>"; };
 		3BA4612424771C460068F269 /* SongInfoViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongInfoViewModel.swift; sourceTree = "<group>"; };
 		3BA4612624771EAD0068F269 /* SongInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongInfoView.swift; sourceTree = "<group>"; };
 		3BA4612A24772B250068F269 /* SongInfoDialogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongInfoDialogView.swift; sourceTree = "<group>"; };
@@ -765,6 +767,7 @@
 				3B20368D248C0E8200D90DF5 /* ErrorView.swift */,
 				3B369CEB246D07580068A29C /* PDFViewer.swift */,
 				3B3DF63C24A280D100E60ED9 /* IconSizeConstants.swift */,
+				3B9EE5C324B1B5C900976DC6 /* NavigationStack.swift */,
 				3BB1DCB4244D55770011169D /* SearchBar.swift */,
 				B5A00F5E245277E300F7E3E1 /* ActivityIndicator.swift */,
 				3B369CEF246D0D570068A29C /* WebView.swift */,
@@ -1678,6 +1681,7 @@
 				3B04D2FE2489819A008C7E5E /* TagStore.swift in Sources */,
 				3B2E84B5246FA88800EA4329 /* SongResultEntity.swift in Sources */,
 				3B25C0EA24503B7E00C435E1 /* HistoryStore.swift in Sources */,
+				3B9EE5C424B1B5C900976DC6 /* NavigationStack.swift in Sources */,
 				3B5935A424357CA000E6993C /* HymnType.swift in Sources */,
 				3B203688248B864E00D90DF5 /* ScriptureResult.swift in Sources */,
 				3B9ED1C02486296000BD004E /* BrowseResultsListViewModel.swift in Sources */,

diff --git a/Hymns/Browse/BrowseResultsListView.swift b/Hymns/Browse/BrowseResultsListView.swift
@@ -12,19 +12,22 @@ struct BrowseResultsListView: View {
     var body: some View {
         VStack {
             HStack {
-                Button(action: {
-                    self.presentationMode.wrappedValue.dismiss()
-                }, label: {
+                PopView {
                     Image(systemName: "chevron.left").accentColor(.primary)
-                }).padding()
+                }.padding()
+//                Button(action: {
+//                    self.presentationMode.wrappedValue.dismiss()
+//                }, label: {
+//                    Image(systemName: "chevron.left").accentColor(.primary)
+//                }).padding()
                 Text(viewModel.title).font(.body).fontWeight(.bold)
                 Spacer()
             }
             if viewModel.songResults.isEmpty {
                 ErrorView().maxSize()
             } else {
                 List(viewModel.songResults) { songResult in
-                    NavigationLink(destination: songResult.destinationView) {
+                    PushView(destination: songResult.destinationView) {
                         SongResultView(viewModel: songResult)
                     }
                 }

diff --git a/Hymns/Browse/CategoryView.swift b/Hymns/Browse/CategoryView.swift
@@ -18,7 +18,7 @@ struct CategoryView: View {
             if isExpanded {
                 List {
                     ForEach(viewModel.subcategories, id: \.self) { subcategory in
-                        NavigationLink(destination: BrowseResultsListView(viewModel: BrowseResultsListViewModel(category: self.viewModel.category, subcategory: subcategory.subcategory, hymnType: self.viewModel.hymnType))) {
+                        PushView(destination: BrowseResultsListView(viewModel: BrowseResultsListViewModel(category: self.viewModel.category, subcategory: subcategory.subcategory, hymnType: self.viewModel.hymnType))) {
                             SubcategoryView(viewModel: subcategory)
                         }
                     }

diff --git a/Hymns/Browse/ScriptureView.swift b/Hymns/Browse/ScriptureView.swift
@@ -17,7 +17,7 @@ struct ScriptureView: View {
             }.foregroundColor(isExpanded ? .accentColor : .primary)
             if isExpanded {
                 List(viewModel.scriptureSongs, id: \.self) { scriptureSong in
-                    NavigationLink(destination: DisplayHymnView(viewModel: DisplayHymnViewModel(hymnToDisplay: scriptureSong.hymnIdentifier))) {
+                    PushView(destination: DisplayHymnView(viewModel: DisplayHymnViewModel(hymnToDisplay: scriptureSong.hymnIdentifier))) {
                         ScriptureSongView(viewModel: scriptureSong)
                     }
                 }.frame(height: CGFloat(viewModel.scriptureSongs.count * 45))

diff --git a/Hymns/Browse/TagListView.swift b/Hymns/Browse/TagListView.swift
@@ -31,7 +31,7 @@ struct TagListView: View {
                 }.eraseToAnyView()
             }
             return List(tags, id: \.self) { tag in
-                NavigationLink(destination: BrowseResultsListView(viewModel: BrowseResultsListViewModel(tag: tag))) {
+                PushView(destination: BrowseResultsListView(viewModel: BrowseResultsListViewModel(tag: tag))) {
                     Text(tag.title).tagPill(backgroundColor: tag.color.background, foregroundColor: tag.color.foreground)
                 }
             }.padding(.top).eraseToAnyView()