From c6ae88319cc302deeffc949d72e2208104a1f8a9 Mon Sep 17 00:00:00 2001 From: Pedro Marinho Date: Fri, 16 Oct 2020 13:27:16 -0400 Subject: [PATCH] ... --- lib/app/modules/store/store_controller.dart | 9 ++++++--- .../pages/app_info/app_info_controller.dart | 18 +++++++++--------- .../splash_screen_controller.dart | 11 +++++++---- .../interfaces/packages_local_interface.dart | 7 +++---- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/lib/app/modules/store/store_controller.dart b/lib/app/modules/store/store_controller.dart index 79f4992..54daf99 100644 --- 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(); - final _snapLocalController = Modular.get(); - final _appImageLocalController = Modular.get(); - final _flatpakLocalController = Modular.get(); + IPackagesLocal _snapLocalController = Modular.get(); + IPackagesLocal _appImageLocalController = + Modular.get(); + IPackagesLocal _flatpakLocalController = + Modular.get(); final _snapService = Modular.get(); 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 index 1cad54f..bf8e47d 100644 --- 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(); - final _appImageLocalController = Modular.get(); - final _flatpakDetailsLocalController = + IPackagesLocal _snapLocalController = Modular.get(); + IPackagesLocal _appImageLocalController = + Modular.get(); + IPackagesLocal _flatpakDetailsLocalController = Modular.get(); final _storeController = Modular.get(); @@ -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 index 0c96b07..3b88d41 100644 --- 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(); - final _appImageLocalController = Modular.get(); - final _flatpakLocalController = Modular.get(); + IPackagesLocal _snapLocalController = Modular.get(); + IPackagesLocal _appImageLocalController = + Modular.get(); + IPackagesLocal _flatpakLocalController = + Modular.get(); final _snapService = Modular.get(); @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 index 65110a6..6e87db3 100644 --- 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 toSave(Map data); @@ -10,9 +9,9 @@ abstract class IPackagesLocal extends Disposable{ dynamic get(String key); - Iterable getAll(); + Iterable getAll(); - List search(String name); + List search(String name); Future recovery();