Merge pull request #92 from himanshu8443/feature

update 2.4.0

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
         applicationId "com.vega"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 51
-        versionName "2.3.1"
+        versionCode 53
+        versionName "2.4.0" 
     }
     signingConfigs {
         release {

android/app/src/main/AndroidManifest.xml

@@ -24,7 +24,9 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:requestLegacyExternalStorage="true"
+      >
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -10,7 +10,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@8man/react-native-media-console": "^2.2.4-alpha.2",
+    "@8man/react-native-media-console": "^2.2.4-alpha.5",
     "@dominicvonk/react-native-apk-installer": "^2.2.2",
     "@notifee/react-native": "^7.8.2",
     "@react-navigation/bottom-tabs": "^6.5.20",
@@ -45,7 +45,7 @@
     "react-native-safe-area-context": "^4.10.1",
     "react-native-screens": "^3.31.1",
     "react-native-svg": "15.2.0",
-    "react-native-video": "^6.4.3",
+    "react-native-video": "^6.4.5",
     "react-native-webview": "13.8.6",
     "zustand": "^4.5.2"
   },

src/App.tsx

@@ -22,6 +22,8 @@ import {MMKV} from './lib/Mmkv';
 import BootSplash from 'react-native-bootsplash';
 import {enableFreeze, enableScreens} from 'react-native-screens';
 import Preferences from './screens/settings/Preference';
+import useThemeStore from './lib/zustand/themeStore';
+import {LogBox} from 'react-native';
 
 enableScreens(true);
 enableFreeze(true);
@@ -65,11 +67,13 @@ export type SettingsStackParamList = {
 };
 const Tab = createBottomTabNavigator();
 const App = () => {
+  LogBox.ignoreLogs(['You have passed a style to FlashList']);
   const HomeStack = createNativeStackNavigator<HomeStackParamList>();
   const Stack = createNativeStackNavigator<RootStackParamList>();
   const SearchStack = createNativeStackNavigator<SearchStackParamList>();
   const WatchListStack = createNativeStackNavigator<WatchListStackParamList>();
   const SettingsStack = createNativeStackNavigator<SettingsStackParamList>();
+  const {primary} = useThemeStore(state => state);
 
   SystemUI.setBackgroundColorAsync('black');
 
@@ -148,7 +152,7 @@ const App = () => {
         detachInactiveScreens={true}
         screenOptions={{
           headerShown: false,
-          tabBarActiveTintColor: 'tomato',
+          tabBarActiveTintColor: primary,
           tabBarInactiveTintColor: 'gray',
           tabBarStyle: {backgroundColor: 'black'},
           tabBarHideOnKeyboard: true,
@@ -223,17 +227,17 @@ const App = () => {
         colors: {
           background: 'black',
           card: 'black',
-          primary: 'tomato',
+          primary: primary,
           text: 'white',
           border: 'black',
-          notification: 'tomato',
+          notification: primary,
         },
       }}>
       <Stack.Navigator
         screenOptions={{
           headerShown: false,
           headerBlurEffect: 'light',
-          headerTintColor: 'tomato',
+          headerTintColor: primary,
           headerStyle: {backgroundColor: '#171717'},
         }}>
         <Stack.Screen name="TabStack" component={TabStack} />

src/app.json

@@ -1,5 +1,34 @@
 {
   "name": "Vega",
   "displayName": "Vega",
-  "backgroundColor": "#000000"
+  "expo": {
+    "name": "Vega",
+    "displayName": "Vega",
+    "autolinking": {
+      "exclude": ["expo-splash-screen"]
+    },
+    "plugins": [
+      "@react-native-tvos/config-tv",
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "extraMavenRepos": [
+              "../../node_modules/@notifee/react-native/android/libs"
+            ]
+          },
+          "ios": {}
+        }
+      ]
+    ],
+    "slug": "vega",
+    "version": "2.4.0",
+    "sdkVersion": "51.0.0",
+    "android": {
+      "minSdkVersion": 24,
+      "package": "com.vega",
+      "versionCode": 53
+    },
+    "platforms": ["ios", "android"]
+  }
 }

src/components/Downloader.tsx

@@ -23,6 +23,7 @@ import {downloadManager} from '../lib/downloader';
 import {FFmpegKit} from 'ffmpeg-kit-react-native';
 import RNFS from 'react-native-fs';
 import {downloadFolder} from '../lib/constants';
+import useThemeStore from '../lib/zustand/themeStore';
 
 const DownloadComponent = ({
   link,
@@ -37,6 +38,7 @@ const DownloadComponent = ({
   providerValue: string;
   title: string;
 }) => {
+  const {primary} = useThemeStore(state => state);
   const {provider} = useContentStore(state => state);
   const [alreadyDownloaded, setAlreadyDownloaded] = useState<string | boolean>(
     false,
@@ -140,7 +142,7 @@ const DownloadComponent = ({
                 setCancelModal(prev => !prev);
                 console.log('pressed');
               }}>
-              <MaterialIcons name="downloading" size={27} color="tomato" />
+              <MaterialIcons name="downloading" size={27} color={primary} />
             </TouchableOpacity>
           </MotiView>
         ) : alreadyDownloaded ? (
@@ -176,14 +178,16 @@ const DownloadComponent = ({
                 <View className="flex-row items-center justify-evenly w-full my-5">
                   <TouchableOpacity
                     onPress={deleteDownload}
-                    className="bg-primary p-2 rounded-md m-1 px-3">
+                    className="p-2 rounded-md m-1 px-3"
+                    style={{backgroundColor: primary}}>
                     <Text className="text-white font-semibold text-base rounded-md capitalize px-1">
                       Yes
                     </Text>
                   </TouchableOpacity>
                   <TouchableOpacity
                     onPress={() => setDeleteModal(false)}
-                    className="bg-primary p-2 px-4 rounded-md m-1">
+                    className="p-2 px-4 rounded-md m-1"
+                    style={{backgroundColor: primary}}>
                     <Text className="text-white font-semibold text-base rounded-md capitalize px-1">
                       No
                     </Text>
@@ -236,7 +240,8 @@ const DownloadComponent = ({
                               ToastAndroid.SHORT,
                             );
                           }}
-                          className="bg-primary p-2 rounded-md m-1">
+                          className="p-2 rounded-md m-1"
+                          style={{backgroundColor: primary}}>
                           <Text className="text-white text-xs rounded-md capitalize px-1">
                             {server.server}
                           </Text>
@@ -301,7 +306,8 @@ const DownloadComponent = ({
                             setLongPressModal(false);
                             longPressDownload(server.link);
                           }}
-                          className="bg-primary p-2 rounded-md m-1">
+                          className="p-2 rounded-md m-1"
+                          style={{backgroundColor: primary}}>
                           <Text className="text-white text-xs rounded-md capitalize px-1">
                             {server.server}
                           </Text>

src/components/SeasonList.tsx

@@ -24,6 +24,7 @@ import {manifest} from '../lib/Manifest';
 import RNReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import Feather from '@expo/vector-icons/Feather';
 import useWatchHistoryStore from '../lib/zustand/watchHistrory';
+import useThemeStore from '../lib/zustand/themeStore';
 
 const SeasonList = ({
   LinkList,
@@ -44,6 +45,7 @@ const SeasonList = ({
     poster?: string;
   }>;
 }) => {
+  const {primary} = useThemeStore(state => state);
   const navigation =
     useNavigation<NativeStackNavigationProp<RootStackParamList>>();
   // const {provider} = useContentStore(state => state);
@@ -169,7 +171,7 @@ const SeasonList = ({
   return (
     <View>
       <Dropdown
-        selectedTextStyle={{color: 'tomato', overflow: 'hidden', height: 22}}
+        selectedTextStyle={{color: primary, overflow: 'hidden', height: 22}}
         labelField={'title'}
         valueField={
           LinkList[0]?.movieLinks
@@ -225,7 +227,7 @@ const SeasonList = ({
                 onLongPress={() =>
                   onLongPressHandler(true, ActiveSeason.movieLinks, 'movie')
                 }>
-                <Ionicons name="play-circle" size={28} color="tomato" />
+                <Ionicons name="play-circle" size={28} color={primary} />
                 <Text className="text-white">Play</Text>
               </TouchableOpacity>
               <Downloader
@@ -276,7 +278,7 @@ const SeasonList = ({
                     onLongPress={() =>
                       onLongPressHandler(true, item.link, 'series')
                     }>
-                    <Ionicons name="play-circle" size={28} color="tomato" />
+                    <Ionicons name="play-circle" size={28} color={primary} />
                     <Text className="text-white">
                       {item.title.length > 30
                         ? item.title.slice(0, 30) + '...'
@@ -339,7 +341,7 @@ const SeasonList = ({
                       onLongPress={() =>
                         onLongPressHandler(true, item.link, 'series')
                       }>
-                      <Ionicons name="play-circle" size={28} color="tomato" />
+                      <Ionicons name="play-circle" size={28} color={primary} />
                       <Text className="text-white">
                         {ActiveSeason?.directLinks?.length &&
                         ActiveSeason?.directLinks?.length > 1
@@ -411,7 +413,7 @@ const SeasonList = ({
               loop: true,
               repeatReverse: false,
             }}>
-            <MaterialCommunityIcons name="vlc" size={70} color="tomato" />
+            <MaterialCommunityIcons name="vlc" size={70} color={primary} />
           </MotiView>
           <Text className="text-white text-lg font-semibold mt-2">
             Opening in External Player
@@ -444,7 +446,7 @@ const SeasonList = ({
                     }
                   }}>
                   <Text className="text-white">Marked as Unwatched</Text>
-                  <Ionicons name="checkmark-done" size={30} color="tomato" />
+                  <Ionicons name="checkmark-done" size={30} color={primary} />
                 </TouchableOpacity>
               ) : (
                 <TouchableOpacity
@@ -462,7 +464,7 @@ const SeasonList = ({
                     }
                   }}>
                   <Text className="text-white">Mark as Watched</Text>
-                  <Ionicons name="checkmark" size={25} color="tomato" />
+                  <Ionicons name="checkmark" size={25} color={primary} />
                 </TouchableOpacity>
               )}
               {/* open in external player */}
@@ -478,7 +480,7 @@ const SeasonList = ({
                 <Text className="text-white font-bold text-base">
                   External Player
                 </Text>
-                <Feather name="external-link" size={20} color="tomato" />
+                <Feather name="external-link" size={20} color={primary} />
               </TouchableOpacity>
             </View>
           </View>

src/components/Slider.tsx

@@ -10,6 +10,7 @@ import SkeletonLoader from './Skeleton';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import AntDesign from '@expo/vector-icons/AntDesign';
 import useWatchHistoryStore from '../lib/zustand/watchHistrory';
+import useThemeStore from '../lib/zustand/themeStore';
 
 export default function Slider({
   isLoading,
@@ -25,6 +26,7 @@ export default function Slider({
   providerValue?: string;
 }): JSX.Element {
   const {provider} = useContentStore(state => state);
+  const {primary} = useThemeStore(state => state);
   const navigation =
     useNavigation<NativeStackNavigationProp<HomeStackParamList>>();
   const [isSelected, setSelected] = React.useState('');
@@ -33,7 +35,9 @@ export default function Slider({
   return (
     <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>
+        <Text className="text-2xl font-semibold" style={{color: primary}}>
+          {title}
+        </Text>
         {filter !== 'recent' && (
           <TouchableOpacity
             onPress={() =>

src/components/StreamModal.tsx

@@ -4,6 +4,7 @@ import {Modal, TouchableOpacity} from 'react-native';
 import MaterialIcons from '@expo/vector-icons/MaterialIcons';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import {Skeleton} from 'moti/skeleton';
+import useThemeStore from '../lib/zustand/themeStore';
 
 const StreamModal = ({
   downloadModal,
@@ -18,6 +19,7 @@ const StreamModal = ({
   serverLoading: boolean;
   downloadFile: (link: string) => void;
 }) => {
+  const {primary} = useThemeStore(state => state);
   return (
     <Modal animationType="fade" visible={downloadModal} transparent={true}>
       <View className="flex-1 bg-black/10 justify-center items-center p-4">
@@ -45,7 +47,8 @@ const StreamModal = ({
                         ToastAndroid.SHORT,
                       );
                     }}
-                    className="bg-primary p-2 rounded-md m-1">
+                    className="p-2 rounded-md m-1"
+                    style={{backgroundColor: primary}}>
                     <Text className="text-white text-xs rounded-md capitalize px-1">
                       {server.server}
                     </Text>