Merge pull request #24 from himanshu8443/with-Expo

Update 2.0.5

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
         applicationId "com.vega"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "2.0.0"
+        versionCode 25
+        versionName "2.0.5"
     }
     signingConfigs {
         release {

app.json

@@ -0,0 +1,12 @@
+{
+  "expo": {
+    "name": "vega",
+    "slug": "vega",
+    "version": "2.0.2",
+    "sdkVersion": "51.0.0",
+    "platforms": [
+      "ios",
+      "android"
+    ]
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega",
-  "version": "2.0.0",
+  "version": "2.0.5",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -18,7 +18,9 @@
     "babel-plugin-module-resolver": "^5.0.2",
     "cheerio": "^1.0.0-rc.12",
     "expo": "^51.0.0",
+    "expo-blur": "~13.0.2",
     "expo-intent-launcher": "~11.0.1",
+    "expo-system-ui": "~3.0.4",
     "moti": "^0.28.1",
     "nativewind": "^2.0.11",
     "react": "18.2.0",

src/App.tsx

@@ -14,11 +14,13 @@ import Entypo from '@expo/vector-icons/Entypo';
 import 'react-native-reanimated';
 import 'react-native-gesture-handler';
 import WebView from './screens/WebView';
+import SearchResults from './screens/SearchResults';
+import * as SystemUI from 'expo-system-ui';
 
 export type HomeStackParamList = {
   Home: undefined;
   Info: {link: string; provider?: string; poster?: string};
-  ScrollList: {filter: string; title?: string};
+  ScrollList: {filter: string; title?: string; providerValue?: string};
   Webview: {link: string};
 };
 
@@ -36,8 +38,9 @@ export type RootStackParamList = {
 
 export type SearchStackParamList = {
   Search: undefined;
-  ScrollList: {filter: string; title?: string};
+  ScrollList: {filter: string; title?: string; providerValue?: string};
   Info: {link: string; provider?: string; poster?: string};
+  SearchResults: {filter: string};
 };
 
 export type WatchListStackParamList = {
@@ -51,6 +54,8 @@ const App = () => {
   const SearchStack = createNativeStackNavigator<SearchStackParamList>();
   const WatchListStack = createNativeStackNavigator<WatchListStackParamList>();
 
+  SystemUI.setBackgroundColorAsync('black');
+
   function HomeStackScreen() {
     return (
       <HomeStack.Navigator
@@ -80,6 +85,7 @@ const App = () => {
         <SearchStack.Screen name="Search" component={Search} />
         <SearchStack.Screen name="ScrollList" component={ScrollList} />
         <SearchStack.Screen name="Info" component={Info} />
+        <SearchStack.Screen name="SearchResults" component={SearchResults} />
       </SearchStack.Navigator>
     );
   }

src/app.json

@@ -1,4 +1,5 @@
 {
   "name": "Vega",
-  "displayName": "Vega"
+  "displayName": "Vega",
+  "backgroundColor": "#000000"
 }

src/components/Downloader.tsx

@@ -24,6 +24,7 @@ import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import {Skeleton} from 'moti/skeleton';
 import useContentStore from '../lib/zustand/contentStore';
 import {manifest} from '../lib/Manifest';
+import * as IntentLauncher from 'expo-intent-launcher';
 
 const DownloadComponent = ({
   link,
@@ -43,6 +44,7 @@ const DownloadComponent = ({
   );
   const [deleteModal, setDeleteModal] = useState(false);
   const [downloadModal, setDownloadModal] = useState(false);
+  const [longPressModal, setLongPressModal] = useState(false);
   const [servers, setServers] = useState<Stream[]>([]);
   const [serverLoading, setServerLoading] = useState(false);
 
@@ -171,9 +173,10 @@ const DownloadComponent = ({
 
   // choose server
   useEffect(() => {
-    if (!downloadModal) {
+    if (!downloadModal && !longPressModal) {
       return;
     }
+
     const getServer = async () => {
       setServerLoading(true);
       const url = await manifest[providerValue || provider.value].getStream(
@@ -184,13 +187,25 @@ const DownloadComponent = ({
       setServers(url);
     };
     getServer();
-  }, [downloadModal]);
+  }, [downloadModal, longPressModal]);
+
+  // on holdPress external downloader
+  const longPressDownload = async (link: string) => {
+    try {
+      await IntentLauncher.startActivityAsync('android.intent.action.VIEW', {
+        data: link,
+        type: 'application/octet-stream',
+      });
+    } catch (error) {
+      console.log(error);
+    }
+  };
 
   return (
     <View className="flex-row items-center mt-1 justify-between rounded-full bg-white/30 p-1">
       {alreadyDownloaded ? (
         <TouchableOpacity onPress={() => setDeleteModal(true)} className="mx-1">
-          <MaterialIcons name="file-download-done" size={27} color="#c1c4c9" />
+          <MaterialIcons name="delete-outline" size={27} color="#c1c4c9" />
         </TouchableOpacity>
       ) : isDownloading ? (
         <MotiView
@@ -210,11 +225,19 @@ const DownloadComponent = ({
           onPress={() => {
             setDownloadModal(true);
           }}
+          onLongPress={() => {
+            ReactNativeHapticFeedback.trigger('effectHeavyClick', {
+              enableVibrateFallback: true,
+              ignoreAndroidSystemSettings: false,
+            });
+            setLongPressModal(true);
+          }}
           className="mx-2">
           <Octicons name="download" size={25} color="#c1c4c9" />
         </TouchableOpacity>
       )}
-      {deleteModal && (
+      {/* delete modal */}
+      {
         <Modal animationType="fade" visible={deleteModal} transparent={true}>
           <View className="flex-1 bg-black/10 justify-center items-center p-4">
             <View className="bg-tertiary p-3 w-80 rounded-md justify-center items-center">
@@ -237,9 +260,9 @@ const DownloadComponent = ({
             </View>
           </View>
         </Modal>
-      )}
+      }
       {/* download modal */}
-      {downloadModal && (
+      {
         <Modal animationType="fade" visible={downloadModal} transparent={true}>
           <View className="flex-1 bg-black/10 justify-center items-center p-4">
             <View className="bg-tertiary p-3 w-full rounded-md justify-center items-center">
@@ -305,7 +328,50 @@ const DownloadComponent = ({
             </View>
           </View>
         </Modal>
-      )}
+      }
+      {/* long press modal */}
+      {
+        <Modal animationType="fade" visible={longPressModal} transparent={true}>
+          <View className="flex-1 bg-black/10 justify-center items-center p-4">
+            <View className="bg-tertiary p-3 w-full rounded-md justify-center items-center">
+              <Text className="text-lg font-semibold my-3 text-white">
+                Select a server to open
+              </Text>
+              <View className="flex-row items-center flex-wrap gap-1 justify-evenly w-full my-5">
+                {!serverLoading
+                  ? servers?.map((server, index) => (
+                      <TouchableOpacity
+                        key={server.server + index}
+                        onPress={() => {
+                          setLongPressModal(false);
+                          longPressDownload(server.link);
+                        }}
+                        className="bg-primary p-2 rounded-md m-1">
+                        <Text className="text-white text-xs rounded-md capitalize px-1">
+                          {server.server}
+                        </Text>
+                      </TouchableOpacity>
+                    ))
+                  : Array.from({length: 3}).map((_, index) => (
+                      <Skeleton
+                        key={index}
+                        show={true}
+                        colorMode="dark"
+                        height={30}
+                        width={90}
+                      />
+                    ))}
+              </View>
+              {/* close modal */}
+              <TouchableOpacity
+                onPress={() => setLongPressModal(false)}
+                className="absolute top-2 right-2">
+                <MaterialIcons name="close" size={20} color="#c1c4c9" />
+              </TouchableOpacity>
+            </View>
+          </View>
+        </Modal>
+      }
     </View>
   );
 };