From 73f940f8184a045c6f40813f5248ae7da0689faa Mon Sep 17 00:00:00 2001
From: Francesco <100066266+cranci1@users.noreply.github.com>
Date: Sat, 31 May 2025 18:30:11 +0200
Subject: [PATCH] yes

---
 .../CustomPlayer/CustomPlayer.swift           |  6 ++-
 Sora/Views/SearchView/SearchView.swift        |  2 +-
 .../SearchView/SearchViewComponents.swift     | 40 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
index bbcee2c..a91fc3f 100644
--- a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
+++ b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
@@ -1701,7 +1701,11 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
     }
     
     @objc func dismissTapped() {
-        dismiss(animated: true, completion: nil)
+        if let presentingViewController = self.presentingViewController {
+            presentingViewController.dismiss(animated: true, completion: nil)
+        } else {
+            dismiss(animated: true, completion: nil)
+        }
     }
     
     @objc func watchNextTapped() {
diff --git a/Sora/Views/SearchView/SearchView.swift b/Sora/Views/SearchView/SearchView.swift
index 7748dae..e94e7f4 100644
--- a/Sora/Views/SearchView/SearchView.swift
+++ b/Sora/Views/SearchView/SearchView.swift
@@ -96,7 +96,7 @@ struct SearchView: View {
                 .padding(.top, 20)
                 
                 ScrollView {
-                    SearchContent(
+                    SearchContentView(
                         selectedModule: selectedModule,
                         searchQuery: searchQuery,
                         searchHistory: searchHistory,
diff --git a/Sora/Views/SearchView/SearchViewComponents.swift b/Sora/Views/SearchView/SearchViewComponents.swift
index 148e394..2209d24 100644
--- a/Sora/Views/SearchView/SearchViewComponents.swift
+++ b/Sora/Views/SearchView/SearchViewComponents.swift
@@ -105,6 +105,43 @@ struct ModuleSelectorMenu: View {
     }
 }
 
+struct SearchContentView: View {
+    let selectedModule: ScrapingModule?
+    let searchQuery: String
+    let searchHistory: [String]
+    let searchItems: [SearchItem]
+    let isSearching: Bool
+    let hasNoResults: Bool
+    let columns: [GridItem]
+    let columnsCount: Int
+    let cellWidth: CGFloat
+    let onHistoryItemSelected: (String) -> Void
+    let onHistoryItemDeleted: (Int) -> Void
+    let onClearHistory: () -> Void
+    
+    var body: some View {
+        NavigationView {
+            SearchContent(
+                selectedModule: selectedModule,
+                searchQuery: searchQuery,
+                searchHistory: searchHistory,
+                searchItems: searchItems,
+                isSearching: isSearching,
+                hasNoResults: hasNoResults,
+                columns: columns,
+                columnsCount: columnsCount,
+                cellWidth: cellWidth,
+                onHistoryItemSelected: onHistoryItemSelected,
+                onHistoryItemDeleted: onHistoryItemDeleted,
+                onClearHistory: onClearHistory
+            )
+            .navigationTitle("Search")
+            .navigationBarTitleDisplayMode(.large)
+        }
+        .navigationViewStyle(.stack)
+    }
+}
+
 struct SearchContent: View {
     let selectedModule: ScrapingModule?
     let searchQuery: String
@@ -188,6 +225,5 @@ struct SearchContent: View {
                 }
             }
         }
-        .navigationViewStyle(StackNavigationViewStyle())
     }
-} 
+}