diff --git a/app/(auth)/(tabs)/(home)/_layout.tsx b/app/(auth)/(tabs)/(home)/_layout.tsx index d2c9988a..298edae5 100644 --- a/app/(auth)/(tabs)/(home)/_layout.tsx +++ b/app/(auth)/(tabs)/(home)/_layout.tsx @@ -61,6 +61,16 @@ export default function IndexLayout() { {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => ( ))} + ); } diff --git a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx index ca1ec02b..ba217686 100644 --- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx +++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx @@ -1,5 +1,9 @@ import { useInfiniteQuery, useQuery } from "@tanstack/react-query"; -import { useFocusEffect, useLocalSearchParams } from "expo-router"; +import { + useFocusEffect, + useLocalSearchParams, + useNavigation, +} from "expo-router"; import * as ScreenOrientation from "expo-screen-orientation"; import { useAtom } from "jotai"; import React, { useCallback, useEffect, useLayoutEffect, useMemo } from "react"; @@ -128,6 +132,13 @@ const Page = () => { staleTime: 60 * 1000, }); + const navigation = useNavigation(); + useEffect(() => { + navigation.setOptions({ + title: library?.Name || "", + }); + }, [library]); + const fetchItems = useCallback( async ({ pageParam, diff --git a/app/(auth)/(tabs)/(libraries)/_layout.tsx b/app/(auth)/(tabs)/(libraries)/_layout.tsx index 4e4f453b..489a20e5 100644 --- a/app/(auth)/(tabs)/(libraries)/_layout.tsx +++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx @@ -195,6 +195,16 @@ export default function IndexLayout() { {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => ( ))} + ); } diff --git a/app/(auth)/(tabs)/(search)/_layout.tsx b/app/(auth)/(tabs)/(search)/_layout.tsx index 9f8a7150..097cc1cc 100644 --- a/app/(auth)/(tabs)/(search)/_layout.tsx +++ b/app/(auth)/(tabs)/(search)/_layout.tsx @@ -19,6 +19,16 @@ export default function SearchLayout() { {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => ( ))} + ); } diff --git a/app/(auth)/(tabs)/(search)/index.tsx b/app/(auth)/(tabs)/(search)/index.tsx index 5975c9e6..ab64ee3c 100644 --- a/app/(auth)/(tabs)/(search)/index.tsx +++ b/app/(auth)/(tabs)/(search)/index.tsx @@ -278,9 +278,9 @@ export default function search() { ( - router.push(`/series/${item.Id}`)} + item={item} className="flex flex-col w-28" > @@ -290,7 +290,7 @@ export default function search() { {item.ProductionYear} - + )} /> )} @@ -302,14 +302,14 @@ export default function search() { ( - router.push(`/items/page?id=${item.Id}`)} className="flex flex-col w-44" > - + )} /> )} @@ -321,16 +321,16 @@ export default function search() { ( - router.push(`/collections/${item.Id}`)} > {item.Name} - + )} /> )} diff --git a/components/common/HeaderBackButton.tsx b/components/common/HeaderBackButton.tsx index 023c1144..a5e0fdd7 100644 --- a/components/common/HeaderBackButton.tsx +++ b/components/common/HeaderBackButton.tsx @@ -1,4 +1,5 @@ import { + Platform, TouchableOpacity, TouchableOpacityProps, View, @@ -21,7 +22,7 @@ export const HeaderBackButton: React.FC = ({ }) => { const router = useRouter(); - if (background === "transparent") + if (background === "transparent" && Platform.OS !== "android") return ( = ({ className="drop-shadow-2xl" name="arrow-back" size={24} - color="#077DF2" + color="white" /> ); diff --git a/components/stacks/NestedTabPageStack.tsx b/components/stacks/NestedTabPageStack.tsx index 32caef76..d67f224a 100644 --- a/components/stacks/NestedTabPageStack.tsx +++ b/components/stacks/NestedTabPageStack.tsx @@ -15,7 +15,6 @@ const routes = [ "albums/[albumId]", "artists/index", "artists/[artistId]", - "collections/[collectionId]", "items/page", "series/[id]", ];