Merge pull request #67 from BeamlakAschalew/dev

Finished v2.6.2

android/app/build.gradle

@@ -50,7 +50,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "dev.beamlak.flixquest"
+        applicationId "dev.beamlak.flixquest_v2"
         minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()

android/app/google-services.json

@@ -120,6 +120,35 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:489547233921:android:a0f4d1ec925f4a9c36eb80",
+        "android_client_info": {
+          "package_name": "dev.beamlak.flixquest_v2"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "489547233921-95jlokbhv2rns93ab2cn911nsn7akp5i.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC8ruDaKGPWmJrZK3Gv8PCJKW9B2JFK4s4"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "489547233921-95jlokbhv2rns93ab2cn911nsn7akp5i.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.beamlak.flixquest">
+    package="dev.beamlak.flixquest_v2">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.beamlak.flixquest">
+    package="dev.beamlak.flixquest_v2">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

android/app/src/main/kotlin/cf/beamlakaschalew/cinemax/MainActivity.kt

@@ -1,4 +1,4 @@
-package dev.beamlak.flixquest
+package dev.beamlak.flixquest_v2
 
 import io.flutter.embedding.android.FlutterActivity
 

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.beamlak.flixquest">
+    package="dev.beamlak.flixquest_v2">
     <queries>
   <!-- If your app opens https URLs -->
   <intent>

assets/translations/ar.json

@@ -510,6 +510,15 @@
 	"episode_may_not_be_available": "قد لا تكون الحلقة التلفزيونية التي تريد بثها متاحة بعد.",
 	"player_time_display": "عرض وقت اللاعب",
 	"elapsed_total": "المنقضي / الإجمالي",
-    "elapsed_remaining": "المنقضي / المتبقي"
+    "elapsed_remaining": "المنقضي / المتبقي",
+	"channels_fetch_failed": "فشل في تحميل القنوات",
+	"use_proxy": "استخدام وكيل لـ TMDB",
+	"enable_warning": "مفيد فقط إذا لم يقم التطبيق بتحميل المحتوى في البداية",
+	"use_proxy_title": "هل تستخدم وكيلًا؟",
+	"use_proxy_detail": "سيؤدي تمكين هذا الخيار إلى زيادة تحميل الخادم على التطبيق. يرجى استخدام هذا فقط إذا لم يقم التطبيق بتحميل معلومات الأفلام والبرامج التلفزيونية في البداية",
+	"enable": "تمكين",
+	"bold": "عريض",
+    "regular": "عادي",
+	"text_weight": "وزن النص"
 }
 

assets/translations/en.json

@@ -510,5 +510,14 @@
     "episode_may_not_be_available": "The TV episode you are looking to stream might not be available yet.",
     "player_time_display": "Player time display",
     "elapsed_total": "Elapsed / Total",
-    "elapsed_remaining": "Elapsed / Remaining"
+    "elapsed_remaining": "Elapsed / Remaining",
+    "channels_fetch_failed": "Failed to load channels",
+    "use_proxy": "Use proxy for TMDB fetch",
+    "enable_warning": "Only useful if the app doesn't load content initially",
+    "use_proxy_title": "Use proxy?",
+    "use_proxy_detail": "Enabling this option will result in more server load to the app, please only use this if the app doesn't load movies and TV show information initially",
+    "enable": "Enable",
+    "bold": "Bold",
+    "regular": "Regular",
+    "text_weight": "Text weight"
 }

assets/translations/es.json

@@ -510,5 +510,14 @@
     "episode_may_not_be_available": "Es posible que el episodio de TV que deseas transmitir aún no esté disponible.",
     "player_time_display": "Visualización del tiempo del jugador",
     "elapsed_total": "Transcurrido / Total",
-    "elapsed_remaining": "Transcurrida / Restante"
+    "elapsed_remaining": "Transcurrida / Restante",
+    "channels_fetch_failed": "No se pudieron cargar los canales",
+    "use_proxy": "Usar proxy para la búsqueda de TMDB",
+    "enable_warning": "Solo útil si la aplicación no carga contenido inicialmente",
+    "use_proxy_title": "¿Usar proxy?",
+    "use_proxy_detail": "Habilitar esta opción aumentará la carga del servidor para la aplicación. Por favor, úsala solo si la aplicación no carga la información de películas y programas de televisión inicialmente",
+    "enable": "Habilitar",
+    "bold": "Negrita",
+    "regular": "Regular",
+    "text_weight": "Peso del texto"
 }

assets/translations/hi.json

@@ -510,5 +510,14 @@
     "episode_may_not_be_available": "जिस टीवी एपिसोड को आप स्ट्रीम करना चाह रहे हैं वह अभी तक उपलब्ध नहीं हो सकता है।",
     "player_time_display": "खिलाड़ी का समय प्रदर्शन",
     "elapsed_total": "बीता हुआ / कुल",
-    "elapsed_remaining": "बीत गया / शेष"
+    "elapsed_remaining": "बीत गया / शेष",
+    "channels_fetch_failed": "चैनल लोड करने में विफल",
+    "use_proxy": "टीएमडीबी लाने के लिए प्रॉक्सी का उपयोग करें",
+    "enable_warning": "केवल उपयोगी है अगर ऐप शुरू में सामग्री नहीं लोड करता है",
+    "use_proxy_title": "प्रॉक्सी का उपयोग करें?",
+    "use_proxy_detail": "इस विकल्प को सक्षम करने से ऐप पर अधिक सर्वर लोड आएगा, कृपया इसका उपयोग केवल इस स्थिति में ही करें जब ऐप शुरू में फिल्मों और टीवी शो जानकारी नहीं लोड करता है",
+    "enable": "सक्षम करें",
+    "bold": "बोल्ड",
+    "regular": "नियमित",
+    "text_weight": "पाठ का वजन"
 }

lib/api/endpoints.dart

@@ -413,4 +413,8 @@ class Endpoints {
     return '$baseUrl'
         '$provider/watch-tv?tmdbId=$tmdbId&season=$season&episode=$episode&server=$server';
   }
+
+  static String getIPTVEndpoint(String baseUrl) {
+    return '$baseUrl' 'daddylive/live';
+  } 
 }

lib/constants/api_constants.dart

@@ -7,7 +7,7 @@ const String opensubtitlesBaseUrl = "https://api.opensubtitles.com/api/v1";
 String TMDB_API_KEY = dotenv.env['TMDB_API_KEY']!;
 String mixpanelKey = dotenv.env['MIXPANEL_API_KEY']!;
 String openSubtitlesKey = dotenv.env['OPENSUBTITLES_API_KEY']!;
-const String TMDB_BASE_IMAGE_URL = 'https://image.tmdb.org/t/p/';
+const TMDB_BASE_IMAGE_URL = 'https://image.tmdb.org/t/p/';
 const String EMBED_BASE_MOVIE_URL =
     'https://www.2embed.to/embed/tmdb/movie?id=';
 const String EMBED_BASE_TV_URL = 'https://www.2embed.to/embed/tmdb/tv?id=';

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.6.1';
+const String currentAppVersion = '2.6.2';
 
 final client = HttpClient();
 const retryOptions = RetryOptions(
@@ -91,7 +91,7 @@ class MyHttpOverrides extends HttpOverrides {
 }
 
 const providerPreference =
-    'gomovies-GoMovies flixhqS2-FlixHQ_S2 flixhq-FlixHQ showbox-ShowBox vidsrcto-VidSrcTo zoe-Zoechip zoro-Zoro vidsrc-VidSrc dramacool-Dramacool viewasian-ViewAsian';
+    'flixhq-FlixHQ showbox-ShowBox vidsrcto-VidSrcTo vidsrc-VidSrc gomovies-GoMovies flixhqS2-FlixHQ_S2 zoe-Zoechip zoro-Zoro dramacool-Dramacool viewasian-ViewAsian';
 
 late SharedPreferences sharedPrefsSingleton;
 

lib/flixquest_main.dart

@@ -93,6 +93,7 @@ class _FlixQuestState extends State<FlixQuest>
           _remoteConfig.getString("vidsrc_server");
       appDependencyProvider.vidSrcToServer =
           _remoteConfig.getString("vidsrcto_server");
+      appDependencyProvider.tmdbProxy = _remoteConfig.getString("tmdb_proxy");
     }
     await requestNotificationPermissions();
   }
@@ -161,7 +162,6 @@ class _FlixQuestState extends State<FlixQuest>
                       supportedLocales: context.supportedLocales,
                       locale: context.locale,
                       debugShowCheckedModeBanner: true,
-                      title: tr("cinemax"),
                       theme: Styles.themeData(
                           appThemeMode: settingsProvider.appTheme,
                           isM3Enabled: settingsProvider.isMaterial3Enabled,
@@ -242,6 +242,7 @@ class _FlixQuestHomePageState extends State<FlixQuestHomePage>
       appDep.goMoviesServer = remoteConfig.getString("gomovies_server");
       appDep.vidSrcServer = remoteConfig.getString("vidsrc_server");
       appDep.vidSrcToServer = remoteConfig.getString("vidsrcto_server");
+      appDep.tmdbProxy = remoteConfig.getString("tmdb_proxy");
     }
   }
 

lib/functions/function.dart

@@ -171,3 +171,12 @@ bool isReleased(String target) {
 int createUniqueId() {
   return DateTime.now().millisecondsSinceEpoch.remainder(100000);
 }
+
+String buildImageUrl(String baseImage, String proxyUrl, bool isProxyEnabled, BuildContext context) {
+  String concatenated = baseImage;
+  if (isProxyEnabled && proxyUrl.isNotEmpty) {
+    concatenated = "$proxyUrl?destination=$baseImage";
+  }
+
+  return concatenated;
+}