added flixhq movies from another api

lib/api/endpoints.dart

@@ -414,4 +414,14 @@ class Endpoints {
       String baseUrl, String episodeId, String server) {
     return '$baseUrl' 'anime/zoro/watch?episodeId=$episodeId&server=$server';
   }
+
+  static String getMovieLinksFlixHQFQ(String baseUrl, int tmdbId) {
+    return '$baseUrl' 'flixhq/watch-movie?tmdbId=$tmdbId';
+  }
+
+  static String getTVLinksFlixHQFQ(
+      String baseUrl, int episode, int season, int tmdbId) {
+    return '$baseUrl'
+        'flixhq/watch-tv?tmdbId=$tmdbId&season=$season&episode=$episode';
+  }
 }

lib/constants/app_constants.dart

@@ -42,7 +42,7 @@ const kTextSmallAboutBodyStyle = TextStyle(
 const kTableLeftStyle =
     TextStyle(overflow: TextOverflow.ellipsis, fontWeight: FontWeight.bold);
 
-const String currentAppVersion = '2.5.0-2';
+const String currentAppVersion = '2.5.0-3';
 
 final client = HttpClient();
 const retryOptions = RetryOptions(
@@ -58,7 +58,8 @@ final List<String> appNames = [
   'flixquest-v2.4.3.apk',
   'flixquest-v2.4.4.apk',
   'flixquest-v2.5.0.apk',
-  'flixquest-v2.5.0-2.apk'
+  'flixquest-v2.5.0-2.apk',
+  'flixquest-v2.5.0-3.apk'
 ];
 
 CacheManager cacheProp() {
@@ -80,6 +81,6 @@ class MyHttpOverrides extends HttpOverrides {
 }
 
 const providerPreference =
-    'superstream-Superstream flixhq-FlixHQ viewasian-ViewAsian dramacool-Dramacool zoro-Zoro ';
+    'flixhqS2-FlixHQ_S2 superstream-Superstream flixhq-FlixHQ viewasian-ViewAsian dramacool-Dramacool zoro-Zoro ';
 
 late SharedPreferences sharedPrefsSingleton;

lib/functions/network.dart

@@ -7,6 +7,7 @@ import 'package:flixquest/video_providers/flixhq.dart';
 import '../models/external_subtitles.dart';
 import '../constants/app_constants.dart';
 import '../video_providers/dramacool.dart';
+import '../video_providers/flixhq_flixquest.dart';
 import '../video_providers/superstream.dart';
 import '../video_providers/zoro.dart';
 import '/models/update.dart';
@@ -738,3 +739,29 @@ Future<ZoroStreamSources> getMovieTVStreamLinksAndSubsZoro(String api) async {
   }
   return zoroVideoSources;
 }
+
+Future<FlixHQFlixQuestSources> getFlixHQFlixQuestLinks(String api) async {
+  FlixHQFlixQuestSources fqstreamSources;
+  int tries = 5;
+  dynamic decodeRes;
+  try {
+    dynamic res;
+    while (tries > 0) {
+      res = await retryOptions.retry(
+        (() => http.get(Uri.parse(api)).timeout(timeOut)),
+        retryIf: (e) => e is SocketException || e is TimeoutException,
+      );
+      decodeRes = jsonDecode(res.body);
+      if (decodeRes.containsKey('message')) {
+        --tries;
+      } else {
+        break;
+      }
+    }
+
+    fqstreamSources = FlixHQFlixQuestSources.fromJson(decodeRes);
+  } finally {
+    client.close();
+  }
+  return fqstreamSources;
+}

lib/models/setting_preferences.dart

@@ -203,7 +203,7 @@ class AppColorPreferences {
 }
 
 class ProviderPrecedencePreference {
-  static const PROVIDER_PRECEDENCE = "providerPrecedence-v2";
+  static const PROVIDER_PRECEDENCE = "providerPrecedence-v3";
 
   setProviderPrecedence(String pre) async {
     sharedPrefsSingleton.setString(PROVIDER_PRECEDENCE, pre);

lib/screens/common/server_status_screen.dart

@@ -120,6 +120,16 @@ class _ServerStatusScreenState extends State<ServerStatusScreen> {
             videoLinks = zoroStreamSources!.videoLinks;
           }
         });
+      } else if (videoProviders[i].codeName == 'flixhqS2') {
+        start = DateTime.now();
+        await getSuperstreamStreamingLinks(
+                "${appDependency.flixquestAPIURL}flixhq/watch-movie?tmdbId=455980")
+            .then((value) {
+          if (mounted) {
+            superstreamVideoSources = value;
+            videoLinks = superstreamVideoSources!.videoLinks;
+          }
+        });
       }
 
       end = DateTime.now();

lib/screens/movie/movie_video_loader.dart

@@ -6,6 +6,7 @@ import 'package:startapp_sdk/startapp.dart';
 import '../../controllers/recently_watched_database_controller.dart';
 import '../../provider/recently_watched_provider.dart';
 import '../../video_providers/common.dart';
+import '../../video_providers/flixhq_flixquest.dart';
 import '../../video_providers/names.dart';
 import '../../video_providers/zoro.dart';
 import '/api/endpoints.dart';
@@ -53,6 +54,7 @@ class _MovieVideoLoaderState extends State<MovieVideoLoader> {
 
   FlixHQStreamSources? fqMovieVideoSources;
   SuperstreamStreamSources? superstreamVideoSources;
+  FlixHQFlixQuestSources? flixHQFlixQuestStreamSources;
   DCVAStreamSources? dramacoolVideoSources;
   DCVAStreamSources? viewasianVideoSources;
   ZoroStreamSources? zoroVideoSources;
@@ -184,6 +186,15 @@ class _MovieVideoLoaderState extends State<MovieVideoLoader> {
           if (movieVideoLinks != null && movieVideoLinks!.isNotEmpty) {
             break;
           }
+        } else if (videoProviders[i].codeName == 'flixhqS2') {
+          await loadFlixHQFlixQuestApi();
+          if (movieVideoSubs != null && movieVideoSubs!.isNotEmpty) {
+            await subtitleParserFetcher(movieVideoSubs!);
+            break;
+          }
+          if (movieVideoLinks != null && movieVideoLinks!.isNotEmpty) {
+            break;
+          }
         }
       }
 
@@ -831,4 +842,33 @@ class _MovieVideoLoaderState extends State<MovieVideoLoader> {
       });
     }
   }
+
+  Future<void> loadFlixHQFlixQuestApi() async {
+    if (mounted) {
+      await getFlixHQFlixQuestLinks(Endpoints.getMovieLinksFlixHQFQ(
+              appDep.flixquestAPIURL, widget.metadata.movieId!))
+          .then((value) {
+        if (mounted) {
+          if (value.messageExists == null &&
+              value.videoLinks != null &&
+              value.videoLinks!.isNotEmpty) {
+            setState(() {
+              flixHQFlixQuestStreamSources = value;
+            });
+          } else if (value.messageExists != null ||
+              value.videoLinks == null ||
+              value.videoLinks!.isEmpty) {
+            return;
+          }
+        }
+        if (mounted) {
+          movieVideoLinks = flixHQFlixQuestStreamSources!.videoLinks;
+          movieVideoSubs = flixHQFlixQuestStreamSources!.videoSubtitles;
+          if (movieVideoLinks != null && movieVideoLinks!.isNotEmpty) {
+            convertVideoLinks(movieVideoLinks!);
+          }
+        }
+      });
+    }
+  }
 }

lib/screens/tv/tv_video_loader.dart

@@ -7,6 +7,7 @@ import '../../controllers/recently_watched_database_controller.dart';
 import '../../provider/recently_watched_provider.dart';
 import '../../video_providers/common.dart';
 import '../../video_providers/flixhq.dart';
+import '../../video_providers/flixhq_flixquest.dart';
 import '../../video_providers/names.dart';
 import '../../video_providers/zoro.dart';
 import '/api/endpoints.dart';
@@ -53,6 +54,7 @@ class _TVVideoLoaderState extends State<TVVideoLoader> {
 
   FlixHQStreamSources? fqTVVideoSources;
   SuperstreamStreamSources? superstreamVideoSources;
+  FlixHQFlixQuestSources? flixHQFlixQuestStreamSources;
   DCVAStreamSources? dramacoolVideoSources;
   DCVAStreamSources? viewasianVideoSources;
   ZoroStreamSources? zoroVideoSources;
@@ -189,6 +191,15 @@ class _TVVideoLoaderState extends State<TVVideoLoader> {
           if (tvVideoLinks != null && tvVideoLinks!.isNotEmpty) {
             break;
           }
+        } else if (videoProviders[i].codeName == 'flixhqS2') {
+          await loadFlixHQFlixQuestApi();
+          if (tvVideoSubs != null && tvVideoSubs!.isNotEmpty) {
+            await subtitleParserFetcher(tvVideoSubs!);
+            break;
+          }
+          if (tvVideoLinks != null && tvVideoLinks!.isNotEmpty) {
+            break;
+          }
         }
       }
 
@@ -642,6 +653,38 @@ class _TVVideoLoaderState extends State<TVVideoLoader> {
     }
   }
 
+  Future<void> loadFlixHQFlixQuestApi() async {
+    if (mounted) {
+      await getFlixHQFlixQuestLinks(Endpoints.getTVLinksFlixHQFQ(
+              appDep.flixquestAPIURL,
+              widget.metadata.episodeNumber!,
+              widget.metadata.seasonNumber!,
+              widget.metadata.tvId!))
+          .then((value) {
+        if (mounted) {
+          if (value.messageExists == null &&
+              value.videoLinks != null &&
+              value.videoLinks!.isNotEmpty) {
+            setState(() {
+              flixHQFlixQuestStreamSources = value;
+            });
+          } else if (value.messageExists != null ||
+              value.videoLinks == null ||
+              value.videoLinks!.isEmpty) {
+            return;
+          }
+        }
+        if (mounted) {
+          tvVideoLinks = flixHQFlixQuestStreamSources!.videoLinks;
+          tvVideoSubs = flixHQFlixQuestStreamSources!.videoSubtitles;
+          if (tvVideoLinks != null && tvVideoLinks!.isNotEmpty) {
+            convertVideoLinks(tvVideoLinks!);
+          }
+        }
+      });
+    }
+  }
+
   void getAppLanguage() {
     for (int i = 0; i < supportedLanguages.length; i++) {
       if (supportedLanguages[i].languageCode ==

lib/video_providers/flixhq_flixquest.dart

@@ -0,0 +1,16 @@
+import 'package:flixquest/video_providers/superstream.dart';
+
+class FlixHQFlixQuestSources extends SuperstreamStreamSources {
+  FlixHQFlixQuestSources.fromJson(Map<String, dynamic> json)
+      : super.fromJson(json);
+}
+
+class FlixHQFlixQUestVideoLinks extends SuperstreamVideoLinks {
+  FlixHQFlixQUestVideoLinks.fromJson(Map<String, dynamic> json)
+      : super.fromJson(json);
+}
+
+class FlixHQFlixQUestSubLinks extends SuperstreamSubLinks {
+  FlixHQFlixQUestSubLinks.fromJson(Map<String, dynamic> json)
+      : super.fromJson(json);
+}

pubspec.yaml

@@ -3,7 +3,7 @@ description: A Flutter movie app.
 
 publish_to: "none"
 
-version: 2.5.0+2
+version: 2.5.0+3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"