Revert "Merge branch 'develop' into chore/expo-52"

This reverts commit 933f3f2f7c, reversing
changes made to f92fee4158.

components/home/Favorites.tsx

@@ -5,7 +5,6 @@ import { View } from "react-native";
 import { ScrollingCollectionList } from "./ScrollingCollectionList";
 import { useCallback } from "react";
 import { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
-import { t } from "i18next";
 
 export const Favorites = () => {
   const [api] = useAtom(apiAtom);
@@ -55,44 +54,64 @@ export const Favorites = () => {
     () => fetchFavoritesByType("Playlist"),
     [fetchFavoritesByType]
   );
+  const fetchFavoriteMusicAlbum = useCallback(
+    () => fetchFavoritesByType("MusicAlbum"),
+    [fetchFavoritesByType]
+  );
+  const fetchFavoriteAudio = useCallback(
+    () => fetchFavoritesByType("Audio"),
+    [fetchFavoritesByType]
+  );
 
   return (
     <View className="flex flex-co gap-y-4">
       <ScrollingCollectionList
         queryFn={fetchFavoriteSeries}
         queryKey={["home", "favorites", "series"]}
-        title={t("favorites.series")}
+        title="Series"
         hideIfEmpty
       />
       <ScrollingCollectionList
         queryFn={fetchFavoriteMovies}
         queryKey={["home", "favorites", "movies"]}
-        title={t("favorites.movies")}
+        title="Movies"
         hideIfEmpty
         orientation="vertical"
       />
       <ScrollingCollectionList
         queryFn={fetchFavoriteEpisodes}
         queryKey={["home", "favorites", "episodes"]}
-        title={t("favorites.episodes")}
+        title="Episodes"
         hideIfEmpty
       />
       <ScrollingCollectionList
         queryFn={fetchFavoriteVideos}
         queryKey={["home", "favorites", "videos"]}
-        title={t("favorites.videos")}
+        title="Videos"
         hideIfEmpty
       />
       <ScrollingCollectionList
         queryFn={fetchFavoriteBoxsets}
         queryKey={["home", "favorites", "boxsets"]}
-        title={t("favorites.boxsets")}
+        title="Boxsets"
         hideIfEmpty
       />
       <ScrollingCollectionList
         queryFn={fetchFavoritePlaylists}
         queryKey={["home", "favorites", "playlists"]}
-        title={t("favorites.playlists")}
+        title="Playlists"
+        hideIfEmpty
+      />
+      <ScrollingCollectionList
+        queryFn={fetchFavoriteMusicAlbum}
+        queryKey={["home", "favorites", "musicAlbums"]}
+        title="Music Albums"
+        hideIfEmpty
+      />
+      <ScrollingCollectionList
+        queryFn={fetchFavoriteAudio}
+        queryKey={["home", "favorites", "audio"]}
+        title="Audio"
         hideIfEmpty
       />
     </View>

components/home/LargeMovieCarousel.tsx

@@ -1,4 +1,3 @@
-import { useHaptic } from "@/hooks/useHaptic";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
@@ -7,11 +6,9 @@ import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
-import { useRouter, useSegments } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useCallback, useMemo } from "react";
-import { Dimensions, View, ViewProps } from "react-native";
-import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { Dimensions, TouchableOpacity, View, ViewProps } from "react-native";
 import Animated, {
   runOnJS,
   useSharedValue,
@@ -21,7 +18,11 @@ import Carousel, {
   ICarouselInstance,
   Pagination,
 } from "react-native-reanimated-carousel";
-import { itemRouter } from "../common/TouchableItemRouter";
+import { itemRouter, TouchableItemRouter } from "../common/TouchableItemRouter";
+import { Loader } from "../Loader";
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { useRouter, useSegments } from "expo-router";
+import * as Haptics from "expo-haptics";
 
 interface Props extends ViewProps {}
 
@@ -127,7 +128,6 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
   const [api] = useAtom(apiAtom);
   const router = useRouter();
   const screenWidth = Dimensions.get("screen").width;
-  const lightHapticFeedback = useHaptic("light");
 
   const uri = useMemo(() => {
     if (!api) return null;
@@ -153,7 +153,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
   const handleRoute = useCallback(() => {
     if (!from) return;
     const url = itemRouter(item, from);
-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
     // @ts-ignore
     if (url) router.push(url);
   }, [item, from]);
@@ -161,7 +161,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
   const tap = Gesture.Tap()
     .maxDuration(2000)
     .onBegin(() => {
-      opacity.value = withTiming(0.8, { duration: 100 });
+      opacity.value = withTiming(0.5, { duration: 100 });
     })
     .onEnd(() => {
       runOnJS(handleRoute)();

components/home/ScrollingCollectionList.tsx

@@ -11,7 +11,6 @@ import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { ItemCardText } from "../ItemCardText";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
 import SeriesPoster from "../posters/SeriesPoster";
-import { useTranslation } from "react-i18next";
 
 interface Props extends ViewProps {
   title?: string | null;
@@ -40,10 +39,9 @@ export const ScrollingCollectionList: React.FC<Props> = ({
     refetchOnReconnect: true,
   });
 
-  const { t } = useTranslation();
+  if (disabled || !title) return null;
 
   if (hideIfEmpty === true && data?.length === 0) return null;
-  if (disabled || !title) return null;
 
   return (
     <View {...props}>
@@ -52,7 +50,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
       </Text>
       {isLoading === false && data?.length === 0 && (
         <View className="px-4">
-          <Text className="text-neutral-500">{t("home.no_items")}</Text>
+          <Text className="text-neutral-500">No items</Text>
         </View>
       )}
       {isLoading ? (
@@ -106,12 +104,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
                 {item.Type === "Movie" && orientation === "vertical" && (
                   <MoviePoster item={item} />
                 )}
-                {item.Type === "Series" && orientation === "vertical" && (
-                  <SeriesPoster item={item} />
-                )}
-                {item.Type === "Series" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster item={item} />
-                )}
+                {item.Type === "Series" && <SeriesPoster item={item} />}
                 {item.Type === "Program" && (
                   <ContinueWatchingPoster item={item} />
                 )}