...

pedroermarinho · Oct 16, 2020 · c6ae883 · c6ae883
1 parent caa6415
commit c6ae883
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/lib/app/modules/store/store_controller.dart b/lib/app/modules/store/store_controller.dart
@@ -7,6 +7,7 @@ import 'package:otter_store/app/modules/home/home_controller.dart';
 import 'package:otter_store/app/pages/app_info/app_info_page.dart';
 import 'package:otter_store/app/repositories/packages_local/appimage_local_repository.dart';
 import 'package:otter_store/app/repositories/packages_local/flatpak_local_repository.dart';
+import 'package:otter_store/app/repositories/packages_local/interfaces/packages_local_interface.dart';
 import 'package:otter_store/app/repositories/packages_local/snap_local_repository.dart';
 import 'package:otter_store/app/services/snap_service.dart';
 import 'package:otter_store/app/shared/config/constants.dart';
@@ -18,9 +19,11 @@ class StoreController = _StoreControllerBase with _$StoreController;
 
 abstract class _StoreControllerBase with Store {
   final _homeController = Modular.get<HomeController>();
-  final _snapLocalController = Modular.get<SnapLocalRepository>();
-  final _appImageLocalController = Modular.get<AppimageLocalRepository>();
-  final _flatpakLocalController = Modular.get<FlatpakLocalRepository>();
+  IPackagesLocal _snapLocalController = Modular.get<SnapLocalRepository>();
+  IPackagesLocal _appImageLocalController =
+      Modular.get<AppimageLocalRepository>();
+  IPackagesLocal _flatpakLocalController =
+      Modular.get<FlatpakLocalRepository>();
   final _snapService = Modular.get<SnapService>();
   final Widget container = Container();
 

diff --git a/lib/app/pages/app_info/app_info_controller.dart b/lib/app/pages/app_info/app_info_controller.dart
@@ -6,6 +6,7 @@ import 'package:otter_store/app/models/snap_model.dart';
 import 'package:otter_store/app/modules/store/store_controller.dart';
 import 'package:otter_store/app/repositories/packages_local/appimage_local_repository.dart';
 import 'package:otter_store/app/repositories/packages_local/flatpak_details_local_repository.dart';
+import 'package:otter_store/app/repositories/packages_local/interfaces/packages_local_interface.dart';
 import 'package:otter_store/app/repositories/packages_local/snap_local_repository.dart';
 import 'package:otter_store/app/shared/config/constants.dart';
 import 'package:otter_store/app/shared/utils/packages.dart';
@@ -15,9 +16,10 @@ part 'app_info_controller.g.dart';
 class AppInfoController = _AppInfoControllerBase with _$AppInfoController;
 
 abstract class _AppInfoControllerBase with Store {
-  final _snapLocalController = Modular.get<SnapLocalRepository>();
-  final _appImageLocalController = Modular.get<AppimageLocalRepository>();
-  final _flatpakDetailsLocalController =
+  IPackagesLocal _snapLocalController = Modular.get<SnapLocalRepository>();
+  IPackagesLocal _appImageLocalController =
+      Modular.get<AppimageLocalRepository>();
+  IPackagesLocal _flatpakDetailsLocalController =
       Modular.get<FlatpakDetailsLocalRepository>();
 
   final _storeController = Modular.get<StoreController>();
@@ -56,7 +58,6 @@ abstract class _AppInfoControllerBase with Store {
   @observable
   String categories;
 
-
   @observable
   String font;
 
@@ -125,11 +126,10 @@ abstract class _AppInfoControllerBase with Store {
       developerName = appImageModel.authors[0]?.name;
       projectLicense = appImageModel.license;
       final project = appImageModel.links.firstWhere(
-              (element) => element.type == "GitHub",
-          orElse: () =>
-          null
-      );
-      homepageUrl = project ==null?null:"https://github.com/"+project.url;
+          (element) => element.type == "GitHub",
+          orElse: () => null);
+      homepageUrl =
+          project == null ? null : "https://github.com/" + project.url;
       version = null;
       categories = appImageModel.categories[0];
       font = "AppImage";

diff --git a/lib/app/pages/splash_screen/splash_screen_controller.dart b/lib/app/pages/splash_screen/splash_screen_controller.dart
@@ -2,6 +2,7 @@ import 'package:flutter_modular/flutter_modular.dart';
 import 'package:mobx/mobx.dart';
 import 'package:otter_store/app/repositories/packages_local/appimage_local_repository.dart';
 import 'package:otter_store/app/repositories/packages_local/flatpak_local_repository.dart';
+import 'package:otter_store/app/repositories/packages_local/interfaces/packages_local_interface.dart';
 import 'package:otter_store/app/repositories/packages_local/snap_local_repository.dart';
 import 'package:otter_store/app/services/snap_service.dart';
 
@@ -11,9 +12,11 @@ class SplashScreenController = _SplashScreenControllerBase
     with _$SplashScreenController;
 
 abstract class _SplashScreenControllerBase with Store {
-  final _snapLocalController = Modular.get<SnapLocalRepository>();
-  final _appImageLocalController = Modular.get<AppimageLocalRepository>();
-  final _flatpakLocalController = Modular.get<FlatpakLocalRepository>();
+  IPackagesLocal _snapLocalController = Modular.get<SnapLocalRepository>();
+  IPackagesLocal _appImageLocalController =
+      Modular.get<AppimageLocalRepository>();
+  IPackagesLocal _flatpakLocalController =
+      Modular.get<FlatpakLocalRepository>();
   final _snapService = Modular.get<SnapService>();
 
   @observable
@@ -24,7 +27,7 @@ abstract class _SplashScreenControllerBase with Store {
     load = true;
 //    try {
 //      if (_snapLocalController.length() == 0)
-        await _snapLocalController.recovery();
+    await _snapLocalController.recovery();
 //    } catch (e) {
 //      print("Erro de conexão");
 //    }

diff --git a/lib/app/repositories/packages_local/interfaces/packages_local_interface.dart b/lib/app/repositories/packages_local/interfaces/packages_local_interface.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_modular/flutter_modular.dart';
 
-abstract class IPackagesLocal extends Disposable{
-
+abstract class IPackagesLocal extends Disposable {
   Future init();
 
   Future<void> toSave(Map data);
@@ -10,9 +9,9 @@ abstract class IPackagesLocal extends Disposable{
 
   dynamic get(String key);
 
-  Iterable<dynamic> getAll();
+  Iterable getAll();
 
-  List<dynamic> search(String name);
+  List search(String name);
 
   Future recovery();