mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-01-26 04:58:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

navigation changes

Browse Source
This commit is contained in:
Violet Caulfield
2025-01-24 05:10:27 -06:00
parent 2cc50496ed
commit 97883d606f
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/ItemDetail/component.tsx
View File

@@ -11,10 +11,12 @@ import FavoriteButton from "../Global/components/favorite-button";
export default function ItemDetail({
item,
navigation
navigation,
onNavigate
} : {
item: BaseItemDto,
navigation: NativeStackNavigationProp<StackParamList>
navigation: NativeStackNavigationProp<StackParamList>,
onNavigate?: () => void | undefined
}) : React.JSX.Element {
let options: React.JSX.Element | undefined = undefined;
@@ -23,7 +25,7 @@ export default function ItemDetail({
switch (item.Type) {
case "Audio": {
options = TrackOptions({ item, navigation });
options = TrackOptions({ item, navigation, onNavigate });
break;
}
@@ -69,7 +71,11 @@ export default function ItemDetail({
color={Colors.Primary}
onPress={() => {
if (item.ArtistItems) {
navigation.goBack(); // Dismiss modal if exists
if (onNavigate)
onNavigate();
navigation.goBack();
navigation.push("Artist", {
artist: item.ArtistItems[0]
});

3
components/ItemDetail/helpers/TrackOptions.tsx
View File

@@ -10,7 +10,8 @@ export default function TrackOptions({
navigation
} : {
item: BaseItemDto,
navigation: NativeStackNavigationProp<StackParamList>
navigation: NativeStackNavigationProp<StackParamList>,
onNavigate?: () => void | undefined
}) : React.JSX.Element {
const { data: album, isSuccess } = useItem(item.AlbumId ?? "")

5
components/ItemDetail/screen.tsx
View File

@@ -6,15 +6,18 @@ import React from "react";
export default function DetailsScreen({
route,
navigation
navigation,
onNavigate,
} : {
route: RouteProp<StackParamList, "Details">,
navigation: NativeStackNavigationProp<StackParamList>
onNavigate?: () => void | undefined
}) : React.JSX.Element {
return (
<ItemDetail
item={route.params.item}
navigation={navigation}
onNavigate={onNavigate}
/>
)
}

5
components/Player/screens/index.tsx
View File

@@ -132,7 +132,10 @@ export default function PlayerScreen({ navigation }: { navigation: NativeStackNa
name="dots-horizontal-circle-outline"
onPress={() => {
navigation.navigate("Details", {
item: nowPlaying!.item
item: nowPlaying!.item,
onNavigate: () => {
navigation.goBack();
}
});
}}
/>

3
components/types.tsx
View File

@@ -34,7 +34,8 @@ export type StackParamList = {
playlist: BaseItemDto
};
Details: {
item: BaseItemDto
item: BaseItemDto,
onNavigate?: () => void | undefined
}
}