From feef432d5a1d2716d205dd3b9840de67ce4ac71d Mon Sep 17 00:00:00 2001
From: Violet Caulfield <violet@cosmonautical.cloud>
Date: Sun, 9 Feb 2025 13:12:44 -0600
Subject: [PATCH] fix issue where details modal wouldn't show up

---
 components/Discover/stack.tsx  |  9 --------
 components/Favorites/stack.tsx | 41 +++++++++++++++++-----------------
 components/Home/stack.tsx      |  9 ++++++++
 components/Settings/stack.tsx  | 11 ++++++++-
 components/navigation.tsx      |  1 +
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/components/Discover/stack.tsx b/components/Discover/stack.tsx
index 6b397453..e64ac1a6 100644
--- a/components/Discover/stack.tsx
+++ b/components/Discover/stack.tsx
@@ -26,14 +26,6 @@ export function Discover(): React.JSX.Element {
             />
             
             <DiscoverStack.Group screenOptions={{ presentation: "modal"}}>
-                <DiscoverStack.Screen
-                    name="Player" 
-                    component={Player} 
-                    options={{
-                    headerShown: false
-                    }}
-                />
-
                 <DiscoverStack.Screen
                     name="Details"
                     component={DetailsScreen}
@@ -42,7 +34,6 @@ export function Discover(): React.JSX.Element {
                     }}
                 />
             </DiscoverStack.Group>
-
         </DiscoverStack.Navigator>
     )
 }
\ No newline at end of file
diff --git a/components/Favorites/stack.tsx b/components/Favorites/stack.tsx
index e8f3b0da..6a91ce5a 100644
--- a/components/Favorites/stack.tsx
+++ b/components/Favorites/stack.tsx
@@ -11,14 +11,14 @@ import TracksScreen from "../Tracks/screen";
 import DetailsScreen from "../ItemDetail/screen";
 import PlaylistsScreen from "../Playlists/screen";
 
-const LibraryStack = createNativeStackNavigator<StackParamList>();
+const FavoritesStack = createNativeStackNavigator<StackParamList>();
 
-export default function Library(): React.JSX.Element {
+export default function Favorites(): React.JSX.Element {
     return (
-        <LibraryStack.Navigator
+        <FavoritesStack.Navigator
             initialRouteName="Favorites"
         >
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Favorites"
                 component={FavoritesScreen}
                 options={{
@@ -29,7 +29,7 @@ export default function Library(): React.JSX.Element {
                 }}
             />
 
-            <LibraryStack.Screen 
+            <FavoritesStack.Screen 
                 name="Artist" 
                 component={ArtistScreen} 
                 options={({ route }) => ({
@@ -41,7 +41,7 @@ export default function Library(): React.JSX.Element {
                 })}
             />
 
-            <LibraryStack.Screen 
+            <FavoritesStack.Screen 
                 name="Artists" 
                 component={ArtistsScreen} 
                 options={({ route }) => ({
@@ -52,7 +52,7 @@ export default function Library(): React.JSX.Element {
                 })}
             />
 
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Album"
                 component={AlbumScreen}
                 options={({ route }) => ({
@@ -61,7 +61,7 @@ export default function Library(): React.JSX.Element {
                 })}
             />
 
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Albums"
                 component={AlbumsScreen}
                 options={{
@@ -72,7 +72,7 @@ export default function Library(): React.JSX.Element {
                 }}
             />
 
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Tracks"
                 component={TracksScreen}
                 options={{
@@ -83,7 +83,7 @@ export default function Library(): React.JSX.Element {
                 }}
             />
 
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Playlists"
                 component={PlaylistsScreen}
                 options={{
@@ -94,7 +94,7 @@ export default function Library(): React.JSX.Element {
                 }}
             />
 
-            <LibraryStack.Screen
+            <FavoritesStack.Screen
                 name="Playlist"
                 component={PlaylistScreen}
                 options={({ route }) => ({
@@ -103,14 +103,15 @@ export default function Library(): React.JSX.Element {
                 })}
             />
 
-            <LibraryStack.Screen
-                name="Details"
-                component={DetailsScreen}
-                options={{
-                    headerShown: false,
-                    presentation: "modal"
-                }}
-            />
-        </LibraryStack.Navigator>
+            <FavoritesStack.Group screenOptions={{ presentation: 'modal' }}>
+                <FavoritesStack.Screen
+                    name="Details"
+                    component={DetailsScreen}
+                    options={{
+                        headerShown: false,
+                    }}
+                />
+            </FavoritesStack.Group>
+        </FavoritesStack.Navigator>
     )
 }
\ No newline at end of file
diff --git a/components/Home/stack.tsx b/components/Home/stack.tsx
index 0ed567d7..fed31b32 100644
--- a/components/Home/stack.tsx
+++ b/components/Home/stack.tsx
@@ -63,6 +63,15 @@ export default function Home(): React.JSX.Element {
                     />
 
                 </HomeStack.Group>
+                <HomeStack.Group screenOptions={{ presentation: 'modal' }}>
+                    <HomeStack.Screen
+                        name="Details"
+                        component={DetailsScreen}
+                        options={{
+                            headerShown: false,
+                        }}
+                    />
+                </HomeStack.Group>
             </HomeStack.Navigator>
         </HomeProvider>
     );
diff --git a/components/Settings/stack.tsx b/components/Settings/stack.tsx
index 10970342..985ab5fd 100644
--- a/components/Settings/stack.tsx
+++ b/components/Settings/stack.tsx
@@ -3,7 +3,6 @@ import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import Root from "./component";
 import AccountDetails from "./screens/account-details";
 import DevToolsScreen from "./screens/dev-tools";
-import Player from "../Player/stack";
 import DetailsScreen from "../ItemDetail/screen";
 import { StackParamList } from "../types";
 
@@ -46,6 +45,16 @@ export default function Settings(): React.JSX.Element {
                     }    
                 }}
             />
+
+            <SettingsStack.Group screenOptions={{ presentation: 'modal'}}>
+                <SettingsStack.Screen
+                    name="Details"
+                    component={DetailsScreen}
+                    options={{
+                        headerShown: false
+                    }}
+                />
+            </SettingsStack.Group>
         </SettingsStack.Navigator>
     )
 }
\ No newline at end of file
diff --git a/components/navigation.tsx b/components/navigation.tsx
index 4ab0ecd2..18f44346 100644
--- a/components/navigation.tsx
+++ b/components/navigation.tsx
@@ -2,6 +2,7 @@ import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import Player from "./Player/stack";
 import { Tabs } from "./tabs";
 import { StackParamList } from "./types";
+import DetailsScreen from "./ItemDetail/screen";
 
 export default function Navigation(): React.JSX.Element {