Merge pull request #62 from himanshu8443/main

update 2.2.3

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
         applicationId "com.vega"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 45
-        versionName "2.2.2"
+        versionCode 46
+        versionName "2.2.3"
     }
     signingConfigs {
         release {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

src/App.tsx

@@ -21,6 +21,7 @@ import About, {checkForUpdate} from './screens/settings/About';
 import {MMKV} from './lib/Mmkv';
 import BootSplash from 'react-native-bootsplash';
 import {enableFreeze, enableScreens} from 'react-native-screens';
+import Preferences from './screens/settings/Preference';
 
 enableScreens(true);
 enableFreeze(true);
@@ -60,6 +61,7 @@ export type SettingsStackParamList = {
   Settings: undefined;
   DisableProviders: undefined;
   About: undefined;
+  Preferences: undefined;
 };
 const Tab = createBottomTabNavigator();
 const App = () => {
@@ -135,6 +137,7 @@ const App = () => {
           component={DisableProviders}
         />
         <SettingsStack.Screen name="About" component={About} />
+        <SettingsStack.Screen name="Preferences" component={Preferences} />
       </SettingsStack.Navigator>
     );
   }
@@ -208,7 +211,7 @@ const App = () => {
 
   useEffect(() => {
     if (MMKV.getBool('autoCheckUpdate') !== false) {
-      checkForUpdate(() => {}, MMKV.getBool('autoDownload') || false);
+      checkForUpdate(() => {}, MMKV.getBool('autoDownload') || false, false);
     }
   }, []);
 

src/components/Hero.tsx

@@ -76,17 +76,24 @@ function Hero() {
           <MotiView
             from={{opacity: 0, scale: 0.5}}
             animate={{opacity: 1, scale: 1}}
+            //@ts-ignore
             transition={{type: 'timing', duration: 300}}
             className="w-full items-center justify-center">
             <TextInput
               onBlur={() => setSearchActive(false)}
               autoFocus={true}
               onSubmitEditing={e => {
-                searchNavigation.navigate('ScrollList', {
-                  providerValue: provider.value,
-                  filter: 'query' + e.nativeEvent.text,
-                  title: `${provider.name}`,
-                });
+                if (e.nativeEvent.text.includes('https://')) {
+                  navigation.navigate('Info', {
+                    link: e.nativeEvent.text,
+                  });
+                } else {
+                  searchNavigation.navigate('ScrollList', {
+                    providerValue: provider.value,
+                    filter: 'query' + e.nativeEvent.text,
+                    title: `${provider.name}`,
+                  });
+                }
               }}
               placeholder={`Search in ${provider.name}`}
               className="w-[95%] px-4 h-10 rounded-full border-white border"

src/components/SeasonList.tsx

@@ -25,19 +25,26 @@ import {manifest} from '../lib/Manifest';
 import SharedGroupPreferences from 'react-native-shared-group-preferences';
 import RNReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import Feather from '@expo/vector-icons/Feather';
+import useWatchHistoryStore from '../lib/zustand/watchHistrory';
 
 const SeasonList = ({
   LinkList,
   poster,
   metaTitle,
   providerValue,
   refreshing,
+  routeParams,
 }: {
   LinkList: Link[];
   poster: string;
   metaTitle: string;
   providerValue: string;
   refreshing?: boolean;
+  routeParams: Readonly<{
+    link: string;
+    provider?: string;
+    poster?: string;
+  }>;
 }) => {
   const navigation =
     useNavigation<NativeStackNavigationProp<RootStackParamList>>();
@@ -57,6 +64,8 @@ const SeasonList = ({
       LinkList[0],
   );
 
+  const {addItem} = useWatchHistoryStore(state => state);
+
   useEffect(() => {
     const fetchList = async () => {
       if (!ActiveSeason?.episodesLink) {
@@ -158,7 +167,14 @@ const SeasonList = ({
       return;
     }
   };
+
   const playHandler = async ({link, type, title, file}: playHandlerProps) => {
+    addItem({
+      link: routeParams.link,
+      title: metaTitle,
+      image: routeParams.poster!,
+      provider: providerValue,
+    });
     const externalPlayer = MMKV.getString('externalPlayer');
     const downloaded = await ifExists(file);
     if (externalPlayer && !downloaded) {

src/components/Slider.tsx

@@ -1,13 +1,15 @@
-import {Image, Text, TouchableOpacity, View} from 'react-native';
+import {Image, Pressable, Text, TouchableOpacity, View} from 'react-native';
 import React from 'react';
 import type {Post} from '../lib/providers/types';
 import {NativeStackNavigationProp} from '@react-navigation/native-stack';
 import {useNavigation} from '@react-navigation/native';
 import {HomeStackParamList} from '../App';
-import {Skeleton} from 'moti/skeleton';
 import useContentStore from '../lib/zustand/contentStore';
 import {FlashList} from '@shopify/flash-list';
 import SkeletonLoader from './Skeleton';
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
+import AntDesign from '@expo/vector-icons/AntDesign';
+import useWatchHistoryStore from '../lib/zustand/watchHistrory';
 
 export default function Slider({
   isLoading,
@@ -25,21 +27,25 @@ export default function Slider({
   const {provider} = useContentStore(state => state);
   const navigation =
     useNavigation<NativeStackNavigationProp<HomeStackParamList>>();
+  const [isSelected, setSelected] = React.useState('');
+  const {removeItem} = useWatchHistoryStore(state => state);
 
   return (
-    <View className="gap-3 mt-7">
+    <Pressable onPress={() => setSelected('')} className="gap-3 mt-7">
       <View className="flex flex-row items-center justify-between px-2">
         <Text className="text-2xl text-primary font-semibold">{title}</Text>
-        <TouchableOpacity
-          onPress={() =>
-            navigation.navigate('ScrollList', {
-              title: title,
-              filter: filter,
-              providerValue: providerValue,
-            })
-          }>
-          <Text className="text-white text-sm">more</Text>
-        </TouchableOpacity>
+        {filter && (
+          <TouchableOpacity
+            onPress={() =>
+              navigation.navigate('ScrollList', {
+                title: title,
+                filter: filter,
+                providerValue: providerValue,
+              })
+            }>
+            <Text className="text-white text-sm">more</Text>
+          </TouchableOpacity>
+        )}
       </View>
       {isLoading ? (
         <View className="flex flex-row gap-2 overflow-hidden">
@@ -57,18 +63,29 @@ export default function Slider({
           estimatedItemSize={30}
           showsHorizontalScrollIndicator={false}
           data={posts}
+          extraData={isSelected}
           horizontal
           contentContainerStyle={{paddingHorizontal: 3, paddingTop: 7}}
           renderItem={({item}) => (
             <View className="flex flex-col mx-2">
               <TouchableOpacity
-                onPress={() =>
+                onLongPress={e => {
+                  e.stopPropagation();
+                  ReactNativeHapticFeedback.trigger('effectClick', {
+                    enableVibrateFallback: true,
+                    ignoreAndroidSystemSettings: false,
+                  });
+                  setSelected(item.link);
+                }}
+                onPress={e => {
+                  e.stopPropagation();
+                  setSelected('');
                   navigation.navigate('Info', {
                     link: item.link,
-                    provider: providerValue || provider?.value,
+                    provider: item.provider || providerValue || provider?.value,
                     poster: item?.image,
-                  })
-                }>
+                  });
+                }}>
                 <Image
                   className="rounded-md"
                   source={{
@@ -78,6 +95,20 @@ export default function Slider({
                   }}
                   style={{width: 100, height: 150}}
                 />
+                {isSelected === item.link && (
+                  <View className="absolute top-0 left-0 w-full h-full bg-black/50 flex justify-center items-center z-50">
+                    <AntDesign
+                      name="delete"
+                      size={24}
+                      color="white"
+                      onPress={() => {
+                        console.log('remove', item);
+                        setSelected('');
+                        removeItem(item);
+                      }}
+                    />
+                  </View>
+                )}
               </TouchableOpacity>
               <Text className="text-white text-center truncate w-24 text-xs">
                 {item.title.length > 24
@@ -98,6 +129,6 @@ export default function Slider({
           keyExtractor={item => item.link}
         />
       )}
-    </View>
+    </Pressable>
   );
 }

src/lib/Manifest.ts

@@ -16,7 +16,7 @@ import {modGetEpisodeLinks} from './providers/mod/modGetEpisodesList';
 import {modGetStream} from './providers/mod/modGetStream';
 
 /// uhd
-import {uhdCatalogList} from './providers/uhd/uhCtatalog';
+import {uhdCatalogList, uhdGenresList} from './providers/uhd/uhCtatalog';
 import {uhdGetPosts} from './providers/uhd/uhdGetPosts';
 import getUhdInfo from './providers/uhd/getUhdInfo';
 import {uhdGetStream} from './providers/uhd/uhdGetStream';
@@ -150,7 +150,7 @@ export const manifest: Manifest = {
   },
   uhd: {
     catalog: uhdCatalogList,
-    genres: [],
+    genres: uhdGenresList,
     blurImage: true,
     nonStreamableServer: ['Gdrive-Instant'],
     getStream: uhdGetStream,

src/lib/getHomepagedata.ts

@@ -1,11 +1,6 @@
 import {Content} from './zustand/contentStore';
 import {manifest} from './Manifest';
-
-export interface Post {
-  title: string;
-  link: string;
-  image: string;
-}
+import {Post} from './providers/types';
 
 export interface HomePageData {
   title: string;

src/lib/providers/dramacool/dcGetPosts.ts

@@ -12,10 +12,11 @@ export const dcGetPosts = async function (
 ): Promise<Post[]> {
   try {
     const urlRes = await axios.get(
-      'https://consumet8.vercel.app/movies/dramacool/info?id=drama-detail/shogun',
+      'https://himanshu8443.github.io/providers/modflix.json',
     );
-    const resData = urlRes.data.episodes[0].url;
-    const baseUrl = resData.split('/').slice(0, 3).join('/');
+    const dataRes = urlRes.data;
+    // console.log(dataRes.hdhub.url);
+    const baseUrl = dataRes?.dc?.url;
     console.log('dcBaseUrl', baseUrl);
     const url = filter.includes('query')
       ? `${baseUrl}/search?type=movies&keyword=${filter.replace(

src/lib/providers/mod/catalog.ts

@@ -18,6 +18,22 @@ export const catalogList = [
 ];
 
 export const modGenresList = [
+  {
+    title: 'Apple TV+',
+    filter: '/ott/apple-tv',
+  },
+  {
+    title: 'Disney+',
+    filter: '/ott/disney-plus',
+  },
+  {
+    title: 'Hulu',
+    filter: '/ott/hulu',
+  },
+  {
+    title: 'Crunchyroll',
+    filter: '/ott/crunchyroll',
+  },
   {
     title: 'Action',
     filter: '/movies-by-genre/action/',

src/lib/providers/mod/header.ts

@@ -10,7 +10,8 @@ export const headers = {
   'sec-ch-ua-platform': '"Windows"',
   'Sec-Fetch-Dest': 'document',
   'Sec-Fetch-Mode': 'navigate',
-  Referer: 'https://moviesmod.live/',
+  Referer: 'https://moviesmod.band/',
+  Cookie: 'popads_user_id=6ba8fe60a481387a3249f05aa058822d',
   'Sec-Fetch-Site': 'none',
   'Sec-Fetch-User': '?1',
   'Upgrade-Insecure-Requests': '1',