From 95de03f8b1bea48aac27f98d840d7df7f17adba8 Mon Sep 17 00:00:00 2001 From: Fredrik Burmester Date: Sat, 5 Oct 2024 13:15:33 +0200 Subject: [PATCH] chore --- .../(home,libraries,search)/items/page.tsx | 2 -- .../(home,libraries,search)/livetv/_layout.tsx | 4 ++-- .../(home,libraries,search)/livetv/channels.tsx | 16 ++++++++-------- .../(home,libraries,search)/livetv/guide.tsx | 6 +----- components/livetv/LiveTVGuideRow.tsx | 5 ++--- components/stacks/NestedTabPageStack.tsx | 2 -- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/app/(auth)/(tabs)/(home,libraries,search)/items/page.tsx b/app/(auth)/(tabs)/(home,libraries,search)/items/page.tsx index d01acb29..071d9127 100644 --- a/app/(auth)/(tabs)/(home,libraries,search)/items/page.tsx +++ b/app/(auth)/(tabs)/(home,libraries,search)/items/page.tsx @@ -1,6 +1,5 @@ import { Text } from "@/components/common/Text"; import { ItemContent } from "@/components/ItemContent"; -import { Loader } from "@/components/Loader"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData"; import { useQuery } from "@tanstack/react-query"; @@ -14,7 +13,6 @@ import Animated, { useSharedValue, withTiming, } from "react-native-reanimated"; -import { opacity } from "react-native-reanimated/lib/typescript/Colors"; const Page: React.FC = () => { const [api] = useAtom(apiAtom); diff --git a/app/(auth)/(tabs)/(home,libraries,search)/livetv/_layout.tsx b/app/(auth)/(tabs)/(home,libraries,search)/livetv/_layout.tsx index 5b3f0fd5..7225e677 100644 --- a/app/(auth)/(tabs)/(home,libraries,search)/livetv/_layout.tsx +++ b/app/(auth)/(tabs)/(home,libraries,search)/livetv/_layout.tsx @@ -1,8 +1,8 @@ -import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs"; import type { - MaterialTopTabNavigationOptions, MaterialTopTabNavigationEventMap, + MaterialTopTabNavigationOptions, } from "@react-navigation/material-top-tabs"; +import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs"; import { ParamListBase, TabNavigationState } from "@react-navigation/native"; import { Stack, withLayoutContext } from "expo-router"; import React from "react"; diff --git a/app/(auth)/(tabs)/(home,libraries,search)/livetv/channels.tsx b/app/(auth)/(tabs)/(home,libraries,search)/livetv/channels.tsx index f2a73887..dd1c1f85 100644 --- a/app/(auth)/(tabs)/(home,libraries,search)/livetv/channels.tsx +++ b/app/(auth)/(tabs)/(home,libraries,search)/livetv/channels.tsx @@ -1,11 +1,9 @@ import { ItemImage } from "@/components/common/ItemImage"; import { Text } from "@/components/common/Text"; -import { ItemPoster } from "@/components/posters/ItemPoster"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api"; import { FlashList } from "@shopify/flash-list"; import { useQuery } from "@tanstack/react-query"; -import { Image } from "expo-image"; import { useAtom } from "jotai"; import React from "react"; import { View } from "react-native"; @@ -19,21 +17,23 @@ export default function page() { const { data: channels } = useQuery({ queryKey: ["livetv", "channels"], queryFn: async () => { - if (!api) return []; - const res = await getLiveTvApi(api).getLiveTvChannels({ + const res = await getLiveTvApi(api!).getLiveTvChannels({ startIndex: 0, - fields: ["PrimaryImageAspectRatio"], - limit: 100, + limit: 500, + enableFavoriteSorting: true, userId: user?.Id, + addCurrentProgram: false, + enableUserData: false, + enableImageTypes: ["Primary"], }); - return res.data.Items; + return res.data; }, }); return ( ( diff --git a/app/(auth)/(tabs)/(home,libraries,search)/livetv/guide.tsx b/app/(auth)/(tabs)/(home,libraries,search)/livetv/guide.tsx index 75d3d2b1..d8092001 100644 --- a/app/(auth)/(tabs)/(home,libraries,search)/livetv/guide.tsx +++ b/app/(auth)/(tabs)/(home,libraries,search)/livetv/guide.tsx @@ -1,13 +1,8 @@ import { ItemImage } from "@/components/common/ItemImage"; -import { Text } from "@/components/common/Text"; import { HourHeader } from "@/components/livetv/HourHeader"; import { LiveTVGuideRow } from "@/components/livetv/LiveTVGuideRow"; import { TAB_HEIGHT } from "@/constants/Values"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; -import { - BaseItemDto, - BaseItemDtoQueryResult, -} from "@jellyfin/sdk/lib/generated-client"; import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api"; import { useQuery } from "@tanstack/react-query"; import { useAtom } from "jotai"; @@ -30,6 +25,7 @@ export default function page() { return res.data; }, }); + const { data: channels } = useQuery({ queryKey: ["livetv", "channels"], queryFn: async () => { diff --git a/components/livetv/LiveTVGuideRow.tsx b/components/livetv/LiveTVGuideRow.tsx index 2993b2c2..96c58481 100644 --- a/components/livetv/LiveTVGuideRow.tsx +++ b/components/livetv/LiveTVGuideRow.tsx @@ -1,8 +1,7 @@ import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; -import { View, ScrollView, Dimensions } from "react-native"; -import { ItemImage } from "../common/ItemImage"; +import { useMemo, useRef } from "react"; +import { Dimensions, View } from "react-native"; import { Text } from "../common/Text"; -import { useCallback, useMemo, useRef, useState } from "react"; import { TouchableItemRouter } from "../common/TouchableItemRouter"; export const LiveTVGuideRow = ({ diff --git a/components/stacks/NestedTabPageStack.tsx b/components/stacks/NestedTabPageStack.tsx index d67f224a..12409ab0 100644 --- a/components/stacks/NestedTabPageStack.tsx +++ b/components/stacks/NestedTabPageStack.tsx @@ -1,5 +1,3 @@ -import { Stack } from "expo-router"; -import { Chromecast } from "../Chromecast"; import { HeaderBackButton } from "../common/HeaderBackButton"; const commonScreenOptions = {