From d32e4d3ad07bf30651039ed603f26b045b86c131 Mon Sep 17 00:00:00 2001
From: tapframe <nayifveliya99@gmail.com>
Date: Mon, 30 Jun 2025 14:58:04 +0530
Subject: [PATCH] Remove autoFocus from SearchScreen input and eliminate
 discover data source state management from SettingsScreen to streamline
 functionality and improve code clarity.

---
 src/screens/SearchScreen.tsx   |  1 -
 src/screens/SettingsScreen.tsx | 47 +---------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/src/screens/SearchScreen.tsx b/src/screens/SearchScreen.tsx
index df2027d3..c32d5229 100644
--- a/src/screens/SearchScreen.tsx
+++ b/src/screens/SearchScreen.tsx
@@ -557,7 +557,6 @@ const SearchScreen = () => {
                   onChangeText={setQuery}
                   returnKeyType="search"
                   keyboardAppearance="dark"
-                  autoFocus
                   ref={inputRef}
                 />
                 {query.length > 0 && (
diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index 452714d3..1c2f8075 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -26,7 +26,7 @@ import { stremioService } from '../services/stremioService';
 import { useCatalogContext } from '../contexts/CatalogContext';
 import { useTraktContext } from '../contexts/TraktContext';
 import { useTheme } from '../contexts/ThemeContext';
-import { catalogService, DataSource } from '../services/catalogService';
+import { catalogService } from '../services/catalogService';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import * as Sentry from '@sentry/react-native';
 import Animated, { FadeInDown } from 'react-native-reanimated';
@@ -160,7 +160,6 @@ const SettingsScreen: React.FC = () => {
   const [addonCount, setAddonCount] = useState<number>(0);
   const [catalogCount, setCatalogCount] = useState<number>(0);
   const [mdblistKeySet, setMdblistKeySet] = useState<boolean>(false);
-  const [discoverDataSource, setDiscoverDataSource] = useState<DataSource>(DataSource.STREMIO_ADDONS);
 
   const loadData = useCallback(async () => {
     try {
@@ -195,9 +194,6 @@ const SettingsScreen: React.FC = () => {
       const mdblistKey = await AsyncStorage.getItem('mdblist_api_key');
       setMdblistKeySet(!!mdblistKey);
       
-      // Get discover data source preference
-      const dataSource = await catalogService.getDataSourcePreference();
-      setDiscoverDataSource(dataSource);
     } catch (error) {
       console.error('Error loading settings data:', error);
     }
@@ -277,13 +273,6 @@ const SettingsScreen: React.FC = () => {
     />
   );
 
-  // Handle data source change
-  const handleDiscoverDataSourceChange = useCallback(async (value: string) => {
-    const dataSource = value as DataSource;
-    setDiscoverDataSource(dataSource);
-    await catalogService.setDataSourcePreference(dataSource);
-  }, []);
-
   const headerBaseHeight = Platform.OS === 'android' ? 80 : 60;
   const topSpacing = Platform.OS === 'android' ? (StatusBar.currentHeight || 0) : insets.top;
   const headerHeight = headerBaseHeight + topSpacing;
@@ -350,40 +339,6 @@ const SettingsScreen: React.FC = () => {
                 icon="home"
                 renderControl={ChevronRight}
                 onPress={() => navigation.navigate('HomeScreenSettings')}
-              />
-              <SettingItem
-                title="Discover Source"
-                icon="explore"
-                renderControl={() => (
-                  <View style={styles.segmentedControl}>
-                    <TouchableOpacity
-                      style={[
-                        styles.segment,
-                        discoverDataSource === DataSource.STREMIO_ADDONS && styles.segmentActive
-                      ]}
-                      onPress={() => handleDiscoverDataSourceChange(DataSource.STREMIO_ADDONS)}
-                    >
-                      <Text style={[
-                        styles.segmentText,
-                        discoverDataSource === DataSource.STREMIO_ADDONS && styles.segmentTextActive,
-                        { color: currentTheme.colors.mediumEmphasis }
-                      ]}>Addons</Text>
-                    </TouchableOpacity>
-                    <TouchableOpacity
-                      style={[
-                        styles.segment,
-                        discoverDataSource === DataSource.TMDB && styles.segmentActive
-                      ]}
-                      onPress={() => handleDiscoverDataSourceChange(DataSource.TMDB)}
-                    >
-                      <Text style={[
-                        styles.segmentText,
-                        discoverDataSource === DataSource.TMDB && styles.segmentTextActive,
-                        { color: currentTheme.colors.mediumEmphasis }
-                      ]}>TMDB</Text>
-                    </TouchableOpacity>
-                  </View>
-                )}
                 isLast={true}
               />
             </SettingsCard>