fixed catalogscreen infinite loop

src/components/player/AndroidVideoPlayer.tsx

@@ -1272,8 +1272,10 @@ const AndroidVideoPlayer: React.FC = () => {
   };
 
   const cycleAspectRatio = () => {
-    // Android: cycle through native resize modes
+    // Cycle through allowed resize modes per platform
-    const resizeModes: ResizeModeType[] = ['contain', 'cover', 'fill', 'none'];
+    const resizeModes: ResizeModeType[] = Platform.OS === 'ios'
+      ? ['cover', 'fill']
+      : ['contain', 'cover', 'fill', 'none'];
     const currentIndex = resizeModes.indexOf(resizeMode);
     const nextIndex = (currentIndex + 1) % resizeModes.length;
     setResizeMode(resizeModes[nextIndex]);

src/components/player/VideoPlayer.tsx

@@ -1552,6 +1552,22 @@ const VideoPlayer: React.FC = () => {
     }
   };
 
+  // Ensure native VLC text tracks are disabled when using custom (addon) subtitles
+  // and re-applied when switching back to built-in tracks. This prevents double-rendering.
+  useEffect(() => {
+    try {
+      if (!vlcRef.current) return;
+      if (useCustomSubtitles) {
+        // -1 disables native subtitle rendering in VLC
+        vlcRef.current.setNativeProps && vlcRef.current.setNativeProps({ textTrack: -1 });
+      } else if (typeof selectedTextTrack === 'number' && selectedTextTrack >= 0) {
+        vlcRef.current.setNativeProps && vlcRef.current.setNativeProps({ textTrack: selectedTextTrack });
+      }
+    } catch (e) {
+      // no-op: defensive guard in case ref methods are unavailable momentarily
+    }
+  }, [useCustomSubtitles, selectedTextTrack]);
+
   const loadSubtitleSize = async () => {
     try {
       // Prefer scoped subtitle settings

src/screens/CatalogScreen.tsx

@@ -23,6 +23,7 @@ import { logger } from '../utils/logger';
 import { useCustomCatalogNames } from '../hooks/useCustomCatalogNames';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { catalogService, DataSource, StreamingContent } from '../services/catalogService';
+import { tmdbService } from '../services/tmdbService';
 
 type CatalogScreenProps = {
   route: RouteProp<RootStackParamList, 'Catalog'>;
@@ -145,10 +146,6 @@ const createStyles = (colors: any) => StyleSheet.create({
     backgroundColor: colors.elevation3,
   },
   // removed bottom text container; keep spacing via item margin only
-  footer: {
-    padding: SPACING.lg,
-    alignItems: 'center',
-  },
   button: {
     marginTop: SPACING.md,
     paddingVertical: SPACING.md,
@@ -190,6 +187,22 @@ const createStyles = (colors: any) => StyleSheet.create({
     color: colors.white,
     fontSize: 16,
     marginTop: SPACING.lg,
+  },
+  badgeContainer: {
+    position: 'absolute',
+    top: 10,
+    right: 10,
+    backgroundColor: 'rgba(0,0,0,0.7)',
+    borderRadius: 0,
+    paddingHorizontal: 10,
+    paddingVertical: 6,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  badgeText: {
+    fontSize: 11,
+    fontWeight: '600',
+    color: colors.white,
   }
 });
 
@@ -197,10 +210,7 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
   const { addonId, type, id, name: originalName, genreFilter } = route.params;
   const [items, setItems] = useState<Meta[]>([]);
   const [loading, setLoading] = useState(true);
-  const [paginating, setPaginating] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
-  const [page, setPage] = useState(1);
-  const [hasMore, setHasMore] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [dataSource, setDataSource] = useState<DataSource>(DataSource.STREMIO_ADDONS);
   const [actualCatalogName, setActualCatalogName] = useState<string | null>(null);
@@ -212,11 +222,11 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
     };
   });
   const [mobileColumnsPref, setMobileColumnsPref] = useState<'auto' | 2 | 3>('auto');
+  const [nowPlayingMovies, setNowPlayingMovies] = useState<Set<string>>(new Set());
   const { currentTheme } = useTheme();
   const colors = currentTheme.colors;
   const styles = createStyles(colors);
   const isDarkMode = true;
-  const isInitialRender = React.useRef(true);
 
   // Load mobile columns preference (phones only)
   useEffect(() => {
@@ -298,17 +308,36 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
       const preference = await catalogService.getDataSourcePreference();
       setDataSource(preference);
     };
-    
+
     getDataSourcePreference();
   }, []);
 
-  const loadItems = useCallback(async (pageNum: number, shouldRefresh: boolean = false) => {
+  // Load now playing movies for theater chip (only for movie catalogs)
+  useEffect(() => {
+    const loadNowPlayingMovies = async () => {
+      if (type === 'movie') {
+        try {
+          // Get first page of now playing movies (typically shows most recent/current)
+          const nowPlaying = await tmdbService.getNowPlaying(1, 'US');
+          const movieIds = new Set(nowPlaying.map(movie =>
+            movie.external_ids?.imdb_id || movie.id.toString()
+          ).filter(Boolean));
+          setNowPlayingMovies(movieIds);
+        } catch (error) {
+          logger.error('Failed to load now playing movies:', error);
+          // Set empty set on error to avoid repeated attempts
+          setNowPlayingMovies(new Set());
+        }
+      }
+    };
+
+    loadNowPlayingMovies();
+  }, [type]);
+
+  const loadItems = useCallback(async (shouldRefresh: boolean = false) => {
     try {
       if (shouldRefresh) {
         setRefreshing(true);
-        setHasMore(true); // Reset hasMore on refresh
-      } else if (pageNum > 1) {
-        setPaginating(true);
       } else {
         setLoading(true);
       }
@@ -399,21 +428,13 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
         
         // Create filters array for genre filtering if provided
         const filters = effectiveGenreFilter ? [{ title: 'genre', value: effectiveGenreFilter }] : [];
-        
+
         // Load items from the catalog
-        const newItems = await stremioService.getCatalog(addon, type, id, pageNum, filters);
+        const catalogItems = await stremioService.getCatalog(addon, type, id, 1, filters);
-        
+
-        if (newItems.length === 0) {
+        if (catalogItems.length > 0) {
-          setHasMore(false);
-        } else {
           foundItems = true;
-          setHasMore(true); // Ensure hasMore is true if we found items
+          setItems(catalogItems);
-        }
-        
-        if (shouldRefresh || pageNum === 1) {
-          setItems(newItems);
-        } else {
-          setItems(prev => [...prev, ...newItems]);
         }
       } else if (effectiveGenreFilter) {
         // Get all addons that have catalogs of the specified type
@@ -438,7 +459,7 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
                 // Debug logging for each catalog request
                 logger.log(`Requesting from ${manifest.name}, catalog ${catalog.id} with genre "${effectiveGenreFilter}"`);
                 
-                const catalogItems = await stremioService.getCatalog(manifest, type, catalog.id, pageNum, filters);
+                const catalogItems = await stremioService.getCatalog(manifest, type, catalog.id, 1, filters);
                 
                 if (catalogItems && catalogItems.length > 0) {
                   // Log first few items' genres to debug
@@ -489,23 +510,10 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
         const uniqueItems = allItems.filter((item, index, self) =>
           index === self.findIndex((t) => t.id === item.id)
         );
-        
+
-        if (uniqueItems.length === 0 && allItems.length === 0) {
+        if (uniqueItems.length > 0) {
-          setHasMore(false);
-        } else {
           foundItems = true;
-          setHasMore(true); // Ensure hasMore is true if we found items
-        }
-        
-        if (shouldRefresh || pageNum === 1) {
           setItems(uniqueItems);
-        } else {
-          // Add new items while avoiding duplicates
-          setItems(prev => {
-            const prevIds = new Set(prev.map(item => item.id));
-            const newItems = uniqueItems.filter(item => !prevIds.has(item.id));
-            return [...prev, ...newItems];
-          });
         }
       }
       
@@ -518,31 +526,18 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
     } finally {
       setLoading(false);
       setRefreshing(false);
-      setPaginating(false);
     }
   }, [addonId, type, id, genreFilter, dataSource]);
 
   useEffect(() => {
-    loadItems(1, true);
+    loadItems(true);
   }, [loadItems]);
 
   const handleRefresh = useCallback(() => {
-    setPage(1);
     setItems([]); // Clear items on refresh
-    loadItems(1, true);
+    loadItems(true);
   }, [loadItems]);
 
-  const handleLoadMore = useCallback(() => {
-    if (isInitialRender.current) {
-      isInitialRender.current = false;
-      return;
-    }
-    if (!loading && !paginating && hasMore && !refreshing) {
-      const nextPage = page + 1;
-      setPage(nextPage);
-      loadItems(nextPage);
-    }
-  }, [loading, paginating, hasMore, page, loadItems, refreshing]);
 
   const effectiveNumColumns = React.useMemo(() => {
     const isPhone = screenData.width < 600; // basic breakpoint; tablets generally above this
@@ -587,9 +582,21 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
           transition={0}
           allowDownscaling
         />
+
+        {type === 'movie' && nowPlayingMovies.has(item.id) && (
+          <View style={styles.badgeContainer}>
+            <MaterialIcons
+              name="theaters"
+              size={12}
+              color={colors.white}
+              style={{ marginRight: 4 }}
+            />
+            <Text style={styles.badgeText}>In Theaters</Text>
+          </View>
+        )}
       </TouchableOpacity>
     );
-  }, [navigation, styles, effectiveNumColumns, effectiveItemWidth]);
+  }, [navigation, styles, effectiveNumColumns, effectiveItemWidth, type, nowPlayingMovies]);
 
   const renderEmptyState = () => (
     <View style={styles.centered}>
@@ -697,15 +704,6 @@ const CatalogScreen: React.FC<CatalogScreenProps> = ({ route, navigation }) => {
               tintColor={colors.primary}
             />
           }
-          onEndReached={handleLoadMore}
-          onEndReachedThreshold={0.5}
-          ListFooterComponent={
-            paginating ? (
-              <View style={styles.footer}>
-                <ActivityIndicator size="small" color={colors.primary} />
-              </View>
-            ) : null
-          }
           contentContainerStyle={styles.list}
           showsVerticalScrollIndicator={false}
           estimatedItemSize={effectiveItemWidth * 1.5 + SPACING.lg}

src/screens/LibraryScreen.tsx

@@ -126,13 +126,6 @@ const TraktItem = React.memo(({ item, width, navigation, currentTheme }: { item:
               <ActivityIndicator color={currentTheme.colors.primary} />
             </View>
           )}
-
-          <View style={[styles.badgeContainer, { backgroundColor: 'rgba(45,55,72,0.9)' }]}>
-            <TraktIcon width={12} height={12} style={{ marginRight: 4 }} />
-            <Text style={[styles.badgeText, { color: currentTheme.colors.white }]}>
-              {item.type === 'movie' ? 'Movie' : 'Series'}
-            </Text>
-          </View>
         </View>
         <Text style={[styles.cardTitle, { color: currentTheme.colors.white }]}>
           {item.name}
@@ -376,17 +369,6 @@ const LibraryScreen = () => {
               />
             </View>
           )}
-          {item.type === 'series' && (
-            <View style={styles.badgeContainer}>
-              <MaterialIcons
-                name="live-tv"
-                size={14}
-                color={currentTheme.colors.white}
-                style={{ marginRight: 4 }}
-              />
-              <Text style={[styles.badgeText, { color: currentTheme.colors.white }]}>Series</Text>
-            </View>
-          )}
         </View>
         <Text style={[styles.cardTitle, { color: currentTheme.colors.white }]}>
           {item.name}

src/services/tmdbService.ts

@@ -995,6 +995,50 @@ export class TMDBService {
     }
   }
 
+  /**
+   * Get now playing movies (currently in theaters)
+   * @param page Page number for pagination
+   * @param region ISO 3166-1 country code (e.g., 'US', 'GB')
+   */
+  async getNowPlaying(page: number = 1, region: string = 'US'): Promise<TMDBTrendingResult[]> {
+    try {
+      const response = await axios.get(`${BASE_URL}/movie/now_playing`, {
+        headers: await this.getHeaders(),
+        params: await this.getParams({
+          language: 'en-US',
+          page,
+          region, // Filter by region to get accurate theater availability
+        }),
+      });
+
+      // Get external IDs for each now playing movie
+      const results = response.data.results || [];
+      const resultsWithExternalIds = await Promise.all(
+        results.map(async (item: TMDBTrendingResult) => {
+          try {
+            const externalIdsResponse = await axios.get(
+              `${BASE_URL}/movie/${item.id}/external_ids`,
+              {
+                headers: await this.getHeaders(),
+                params: await this.getParams(),
+              }
+            );
+            return {
+              ...item,
+              external_ids: externalIdsResponse.data
+            };
+          } catch (error) {
+            return item;
+          }
+        })
+      );
+
+      return resultsWithExternalIds;
+    } catch (error) {
+      return [];
+    }
+  }
+
   /**
    * Get the list of official movie genres from TMDB
    */