From ce95e659d6f4955cbcf2006cf7d0d87a14046063 Mon Sep 17 00:00:00 2001
From: Salah Nahed <salahamassi@users.noreply.github.com>
Date: Tue, 26 Mar 2024 02:44:03 +0200
Subject: [PATCH] wip

---
 lib/app/app.dart                             |  2 +-
 lib/app/app_run_tasks.dart                   |  1 -
 lib/app/injection_container.dart             | 10 ----------
 lib/main.dart                                |  4 +++-
 lib/providers/app_service_provider.dart      |  4 ++--
 lib/providers/firebase_service_provider.dart |  2 +-
 pubspec.lock                                 |  4 ++--
 pubspec.yaml                                 |  2 +-
 8 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 lib/app/injection_container.dart

diff --git a/lib/app/app.dart b/lib/app/app.dart
index f865b1c..9b05650 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -13,9 +13,9 @@ final List<ServiceProvider> providers = [
   // Framework Service Providers
   FirebaseServiceProvider(),
   AppServiceProvider(),
+  CacheServiceProvider(),
   AuthServiceProvider(),
   ApiServiceProvider(),
-  CacheServiceProvider(),
   AnalyticsServiceProvider(),
   NotificationsServiceProvider(),
 
diff --git a/lib/app/app_run_tasks.dart b/lib/app/app_run_tasks.dart
index cb5b5c7..9d693c9 100644
--- a/lib/app/app_run_tasks.dart
+++ b/lib/app/app_run_tasks.dart
@@ -12,7 +12,6 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 class RunAppTasks extends RunTasks {
-  RunAppTasks(List<ServiceProvider> providers) : super(providers);
 
   @override
   Future<void> beforeRun(WidgetsBinding widgetsBinding) async {
diff --git a/lib/app/injection_container.dart b/lib/app/injection_container.dart
deleted file mode 100644
index 11ef2d2..0000000
--- a/lib/app/injection_container.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:bond_core/bond_core.dart' as core;
-
-import 'app.dart';
-
-Future<void> init() async {
-  for (var provider in providers) {
-    await provider.register(core.sl);
-  }
-  core.appProviders = providers;
-}
diff --git a/lib/main.dart b/lib/main.dart
index f3ca29c..f3cb7b5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,6 +3,7 @@ import 'package:bond_core/bond_core.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'app/app.dart';
 import 'app/app_run_tasks.dart';
 import 'bond_app.dart';
 
@@ -13,5 +14,6 @@ void main() => run(
           child: const BondApp(),
         ),
       ),
-      RunAppTasks(appProviders),
+      tasks: RunAppTasks(),
+      providers: providers,
     );
diff --git a/lib/providers/app_service_provider.dart b/lib/providers/app_service_provider.dart
index 5ba423e..0cb9018 100644
--- a/lib/providers/app_service_provider.dart
+++ b/lib/providers/app_service_provider.dart
@@ -1,9 +1,9 @@
-import 'package:bond/features/update_app/data/update_app_service.dart';
 import 'package:bond/features/app/app_bloc.dart';
 import 'package:bond/features/app/data/app_local_data_source.dart';
+import 'package:bond/features/update_app/data/update_app_service.dart';
+import 'package:bond_core/bond_core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
-import 'package:bond_core/bond_core.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class AppServiceProvider extends ServiceProvider {
diff --git a/lib/providers/firebase_service_provider.dart b/lib/providers/firebase_service_provider.dart
index 99a5119..627c315 100644
--- a/lib/providers/firebase_service_provider.dart
+++ b/lib/providers/firebase_service_provider.dart
@@ -1,10 +1,10 @@
 import 'package:bond/app/default_firebase_options.dart';
 import 'package:bond/features/update_app/data/models/update_app_default_value.dart';
+import 'package:bond_core/bond_core.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
-import 'package:bond_core/bond_core.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class FirebaseServiceProvider extends ServiceProvider {
diff --git a/pubspec.lock b/pubspec.lock
index 1a31e3a..643a271 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -77,10 +77,10 @@ packages:
     dependency: "direct main"
     description:
       name: bond_core
-      sha256: "96b72a8578ba429838e42deed1d9db2f6b360c10b13cece71c036b56811689d7"
+      sha256: "22562f84d5c2f8a60d2a38217bba0be737def7617f32abecdde1eb4eac9b3a73"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.1+5"
+    version: "0.0.1+6"
   bond_form:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 4112b55..60e2da1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
 
 
   # Bond packages
-  bond_core: ^0.0.1+5
+  bond_core: ^0.0.1+6
   bond_network: ^0.0.3
   bond_cache: ^0.0.2
   bond_form: ^0.0.1+10