Merge branch 'master' into flood2

CCExtractor · Jun 29, 2023 · e567b98 · e567b98
2 parents 4588e32 + 82ebc96
commit e567b98
Show file tree

Hide file tree

Showing 175 changed files with 9,937 additions and 8,829 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -17,10 +17,10 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.7.11'
+          flutter-version: '3.10.5'
       - run: flutter pub get
       - run: flutter analyze
-      - run: flutter format -n --set-exit-if-changed .
+      - run: dart format --output=none --set-exit-if-changed .
       - run: flutter test
       - run: flutter build apk
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/lib/Api/auth_api.dart b/lib/Api/auth_api.dart
@@ -1,23 +1,22 @@
 import 'dart:convert';
-
 import 'package:dio/dio.dart';
+import 'package:flood_mobile/Constants/api_endpoints.dart';
 import 'package:flood_mobile/Model/register_user_model.dart';
-import 'package:flood_mobile/Provider/user_detail_provider.dart';
 import 'package:flood_mobile/Model/current_user_detail_model.dart';
+import 'package:flood_mobile/Blocs/api_bloc/api_bloc.dart';
+import 'package:flood_mobile/Blocs/user_detail_bloc/user_detail_bloc.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../Provider/api_provider.dart';
-
 class AuthApi {
   static Future<bool> loginUser(
       {required String username,
       required String password,
       required BuildContext context}) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.authenticateUrl;
+      String url = BlocProvider.of<ApiBloc>(context).state.baseUrl +
+          ApiEndpoints.authenticateUrl;
       print('---LOGIN USER---');
       print(url);
       Response response;
@@ -46,17 +45,17 @@ class AuthApi {
           SharedPreferences prefs = await SharedPreferences.getInstance();
           await prefs.setString('floodToken', token);
           await prefs.setString('floodUsername', username);
-          Provider.of<UserDetailProvider>(context, listen: false)
-              .setUserDetails(token, username);
+          BlocProvider.of<UserDetailBloc>(context, listen: false)
+              .add(SetUserDetailsEvent(token: token, username: username));
           return true;
         }
         return false;
       } else {
         return false;
       }
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+    } catch (error) {
+      print('--ERROR IN LOGIN USER--');
+      print(error.toString());
       return false;
     }
   }
@@ -66,8 +65,9 @@ class AuthApi {
     required BuildContext context,
   }) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.registerUser;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.registerUser;
       print('---REGISTER USER---');
       print(url);
       Response response;
@@ -77,7 +77,7 @@ class AuthApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       Map<String, dynamic> mp = model.toJson();
       String rawBody = json.encode(mp);
       print(rawBody);
@@ -86,17 +86,18 @@ class AuthApi {
       if (response.statusCode == 200) {
         print(response);
         getUsersList(context);
-      } else {}
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+      }
+    } catch (error) {
+      print('--ERROR IN REGISTER USER--');
+      print(error.toString());
     }
   }
 
   static getUsersList(BuildContext context) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.getUsersList;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.getUsersList;
       print('---GET USERS LIST---');
       print(url);
       Response response;
@@ -106,7 +107,7 @@ class AuthApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       response = await dio.get(
         url,
       );
@@ -115,23 +116,24 @@ class AuthApi {
         for (final user in response.data) {
           usersList.add(CurrentUserDetailModel.fromJson(user));
         }
-        Provider.of<UserDetailProvider>(context, listen: false)
-            .setUsersList(usersList);
+        BlocProvider.of<UserDetailBloc>(context, listen: false)
+            .add(SetUsersListEvent(usersList: usersList));
         print('---USERS LIST---');
         print(response);
-      } else {}
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+      }
+    } catch (error) {
+      print('--ERROR IN GET USER LIST--');
+      print(error.toString());
     }
   }
 
   static deleteUser(BuildContext context, String username) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.deleteUser +
-          "/" +
-          username;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.deleteUser +
+              "/" +
+              username;
       print('---DELETE USER---');
       print(url);
       Response response;
@@ -141,7 +143,7 @@ class AuthApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       response = await dio.delete(
         url,
       );
@@ -150,10 +152,10 @@ class AuthApi {
         print('---USER DELETED---');
         // *Getting the users list again
         getUsersList(context);
-      } else {}
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+      }
+    } catch (error) {
+      print('--ERROR IN DELETE USER--');
+      print(error.toString());
     }
   }
 }
diff --git a/lib/Api/client_api.dart b/lib/Api/client_api.dart
@@ -1,19 +1,20 @@
 import 'dart:convert';
-
 import 'package:dio/dio.dart';
+import 'package:flood_mobile/Constants/api_endpoints.dart';
+import 'package:flood_mobile/Blocs/client_settings_bloc/client_settings_bloc.dart';
 import 'package:flood_mobile/Model/client_settings_model.dart';
-import 'package:flood_mobile/Provider/api_provider.dart';
-import 'package:flood_mobile/Provider/client_provider.dart';
-import 'package:flood_mobile/Provider/user_detail_provider.dart';
 import 'package:flood_mobile/Services/transfer_speed_manager.dart';
+import 'package:flood_mobile/Blocs/api_bloc/api_bloc.dart';
+import 'package:flood_mobile/Blocs/user_detail_bloc/user_detail_bloc.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class ClientApi {
   static getClientSettings(BuildContext context) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.getClientSettingsUrl;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.getClientSettingsUrl;
       print('---GET CLIENT SETTINGS---');
       print(url);
       Response response;
@@ -23,30 +24,31 @@ class ClientApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       response = await dio.get(
         url,
       );
       if (response.statusCode == 200) {
         ClientSettingsModel clientSetting =
             ClientSettingsModel.fromJson(response.data);
-        Provider.of<ClientSettingsProvider>(context, listen: false)
-            .setClientSettings(clientSetting);
+        BlocProvider.of<ClientSettingsBloc>(context, listen: false)
+            .add(SetClientSettingsEvent(clientSettings: clientSetting));
         print('---CLIENT SETTINGS---');
         print(response);
-      } else {}
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+      }
+    } catch (error) {
+      print('--ERROR IN GET CLIENT SETTINGS--');
+      print(error.toString());
     }
   }
 
   static Future<void> setClientSettings(
       {required BuildContext context,
       required ClientSettingsModel model}) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.setClientSettingsUrl;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.setClientSettingsUrl;
       print('---SET TORRENT SETTINGS---');
       print(url);
       Response response;
@@ -56,7 +58,7 @@ class ClientApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       Map<String, dynamic> mp = model.toJson();
       String rawBody = json.encode(mp);
       print(rawBody);
@@ -72,9 +74,9 @@ class ClientApi {
       } else {
         print('Error');
       }
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+    } catch (error) {
+      print('--ERROR IN SET CLIENT SETTINGS--');
+      print(error.toString());
     }
   }
 
@@ -83,8 +85,9 @@ class ClientApi {
       required String downSpeed,
       required String upSpeed}) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.setClientSettingsUrl;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.setClientSettingsUrl;
       print('---SET SPEED LIMIT SETTINGS---');
       print(url);
       Response response;
@@ -94,7 +97,7 @@ class ClientApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       Map<String, dynamic> mp = Map();
       mp['throttleGlobalDownSpeed'] =
           TransferSpeedManager.speedToValMap[downSpeed];
@@ -113,16 +116,17 @@ class ClientApi {
       } else {
         print('Error');
       }
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+    } catch (error) {
+      print('--ERROR IN SPEED LIMIT CHANGED--');
+      print(error.toString());
     }
   }
 
   static Future<bool> checkClientOnline(BuildContext context) async {
     try {
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.getClientSettingsUrl;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.getClientSettingsUrl;
       print('---CHECK CLIENT ONLINE---');
       print(url);
       Response response;
@@ -132,7 +136,7 @@ class ClientApi {
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       response = await dio.get(
         url,
       );
@@ -141,9 +145,9 @@ class ClientApi {
       } else {
         return false;
       }
-    } catch (e) {
-      print('--ERROR--');
-      print(e.toString());
+    } catch (error) {
+      print('--ERROR IN CHECK CLIENT ONLINE--');
+      print(error.toString());
       return false;
     }
   }

diff --git a/lib/Api/delete_feeds_and_rules.dart b/lib/Api/delete_feeds_and_rules.dart
@@ -1,26 +1,27 @@
 import 'dart:convert';
-
 import 'package:dio/dio.dart';
+import 'package:flood_mobile/Constants/api_endpoints.dart';
+import 'package:flood_mobile/Blocs/api_bloc/api_bloc.dart';
+import 'package:flood_mobile/Blocs/user_detail_bloc/user_detail_bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../Provider/api_provider.dart';
-import '../Provider/user_detail_provider.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class DeleteFeedOrRulesApi {
   static Future<void> deleteFeedsOrRules(
       {required BuildContext context, required String id}) async {
     try {
       Response response;
       Dio dio = new Dio();
-      String url = Provider.of<ApiProvider>(context, listen: false).baseUrl +
-          ApiProvider.listAllFeedsAndRules +
-          "/" +
-          id;
+      String url =
+          BlocProvider.of<ApiBloc>(context, listen: false).state.baseUrl +
+              ApiEndpoints.listAllFeedsAndRules +
+              "/" +
+              id;
       dio.options.headers['Accept'] = "application/json";
       dio.options.headers['Content-Type'] = "application/json";
       dio.options.headers['Connection'] = "keep-alive";
       dio.options.headers['Cookie'] =
-          Provider.of<UserDetailProvider>(context, listen: false).token;
+          BlocProvider.of<UserDetailBloc>(context, listen: false).token;
       Map<String, dynamic> mp = Map();
       mp['id'] = id;
       String rawBody = json.encode(mp);
@@ -33,8 +34,8 @@ class DeleteFeedOrRulesApi {
       } else {
         print("There is some problem status code not 200");
       }
-    } catch (e) {
-      print('Exception caught in Api Request ' + e.toString());
+    } catch (error) {
+      print('--ERROR IN DELETE FEEDS AND RULES--' + error.toString());
     }
   }
 }