Merge pull request #73 from BeamlakAschalew/dev

Merge dev to main
BeamlakAschalew · Oct 1, 2024 · 0e7dbf0 · 0e7dbf0
2 parents 5e589a6 + 6e02c2c
commit 0e7dbf0
Show file tree

Hide file tree

Showing 84 changed files with 2,709 additions and 2,186 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -22,8 +22,12 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
+    avoid_print: true
+    prefer_single_quotes: true
+    prefer_interpolation_to_compose_strings: true
+    sort_pub_dependencies: true
+    prefer_final_in_for_each: true
+    prefer_final_parameters: false
+    curly_braces_in_flow_control_structures: true
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -48,7 +48,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.beamlak.flixquest_v2"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -66,6 +66,11 @@ android {
    buildTypes {
        release {
            signingConfig signingConfigs.release
+           packagingOptions {
+            jniLibs {
+            useLegacyPackaging true
+            }
+           }
        }
    }
 }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,14 +1,23 @@
+ext.kotlin_version = '2.0.20'
+
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
+ext {
+    compileSdkVersion   = 34
+    targetSdkVersion    = 33
+    appCompatVersion    = "1.7.0"
+}
+
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
     project.evaluationDependsOn(':app')
+    ext.kotlin_version = '2.0.20'
 }
 
 tasks.register("clean", Delete) {

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
     id "com.google.gms.google-services" version "4.3.8" apply false
 }
 

diff --git a/lib/api/endpoints.dart b/lib/api/endpoints.dart
@@ -77,19 +77,19 @@ class Endpoints {
   }
 
   static String movieSearchUrl(String query, bool includeAdult, String l) {
-    return "$TMDB_API_BASE_URL/search/movie?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY";
+    return '$TMDB_API_BASE_URL/search/movie?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY';
   }
 
   static String personSearchUrl(String query, bool includeAdult, String l) {
-    return "$TMDB_API_BASE_URL/search/person?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY";
+    return '$TMDB_API_BASE_URL/search/person?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY';
   }
 
   static String tvSearchUrl(String query, bool includeAdult, String l) {
-    return "$TMDB_API_BASE_URL/search/tv?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY";
+    return '$TMDB_API_BASE_URL/search/tv?query=$query&include_adult=$includeAdult&language=$l&api_key=$TMDB_API_KEY';
   }
 
   static getPerson(int personId, String l) {
-    return "$TMDB_API_BASE_URL/person/$personId?api_key=$TMDB_API_KEY&language=$l&append_to_response=movie_credits";
+    return '$TMDB_API_BASE_URL/person/$personId?api_key=$TMDB_API_KEY&language=$l&append_to_response=movie_credits';
   }
 
   static watchProvidersMovies(int providerId, int page, String l) {
@@ -416,5 +416,5 @@ class Endpoints {
 
   static String getIPTVEndpoint(String baseUrl) {
     return '$baseUrl' 'daddylive/live';
-  } 
+  }
 }
diff --git a/lib/constants/api_constants.dart b/lib/constants/api_constants.dart
@@ -3,7 +3,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 const String TMDB_API_BASE_URL = 'https://api.themoviedb.org/3';
-const String opensubtitlesBaseUrl = "https://api.opensubtitles.com/api/v1";
+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']!;
@@ -23,6 +23,6 @@ const String FLIXQUEST_UPDATE_URL =
 String CONSUMET_API = dotenv.env['CONSUMET_URL']!;
 String CONSUMET_INFO_API = dotenv.env['CONSUMET_URL']!;
 String flixquestApiUrl = dotenv.env['FLIXQUEST_API_URL']!;
-const String STREAMING_SERVER_FLIXHQ = "vidcloud";
-const String STREAMING_SERVER_DCVA = "asianload";
-const String STREAMING_SERVER_ZORO = "vidcloud";
+const String STREAMING_SERVER_FLIXHQ = 'vidcloud';
+const String STREAMING_SERVER_DCVA = 'asianload';
+const String STREAMING_SERVER_ZORO = 'vidcloud';
diff --git a/lib/constants/app_constants.dart b/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.7.0';
+const String currentAppVersion = '2.7.1';
 
 final client = HttpClient();
 const retryOptions = RetryOptions(
@@ -69,7 +69,9 @@ final List<String> appNames = [
   'flixquest-v2.5.0-4.apk',
   'flixquest-v2.5.0-5.apk',
   'flixquest-v2.5.0-6.apk',
-  'flixquest-v2.6.0.apk'
+  'flixquest-v2.6.0.apk',
+  'flixquest-v2.7.0.apk',
+  'flixquest-v2.7.1.apk'
 ];
 
 CacheManager cacheProp() {