From a49daa926207e6f256aedfafb453afd1609bb298 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 27 May 2018 01:37:33 -0700 Subject: [PATCH] Clean up warnings --- lib/data/file_storage.dart | 10 +++------- lib/data/repositories/dashboard_repository.dart | 2 -- lib/keys.dart | 2 +- lib/redux/app/app_reducer.dart | 2 -- lib/redux/app/app_state.dart | 1 - lib/redux/auth/auth_actions.dart | 3 --- lib/redux/auth/auth_middleware.dart | 2 -- lib/redux/auth/auth_state.dart | 4 ---- lib/redux/company/company_reducer.dart | 3 --- lib/redux/company/company_state.dart | 1 - lib/redux/dashboard/dashboard_middleware.dart | 2 -- lib/redux/dashboard/dashboard_reducer.dart | 1 - lib/redux/dashboard/dashboard_state.dart | 2 -- lib/redux/product/product_middleware.dart | 6 +++--- lib/redux/product/product_reducer.dart | 2 -- lib/redux/product/product_state.dart | 2 -- lib/ui/auth/login.dart | 4 ++-- lib/ui/dashboard/dashboard_panels.dart | 2 -- lib/ui/dashboard/dashboard_vm.dart | 2 -- lib/ui/product/product_details_vm.dart | 1 - lib/ui/product/product_list_vm.dart | 2 -- lib/ui/product/products.dart | 1 - 22 files changed, 9 insertions(+), 48 deletions(-) diff --git a/lib/data/file_storage.dart b/lib/data/file_storage.dart index 1d121dbfa..891f46851 100644 --- a/lib/data/file_storage.dart +++ b/lib/data/file_storage.dart @@ -1,10 +1,6 @@ import 'dart:async'; -import 'dart:convert'; import 'dart:io'; -import 'package:invoiceninja/data/models/models.dart'; -//import 'package:built_redux_sample/models/serializers.dart'; - /// Loads and saves a List of Products using a text file stored on the device. class FileStorage { final String tag; @@ -17,8 +13,8 @@ class FileStorage { /// LoadProducts Future> loadData() async { - final file = await _getLocalFile(); - final contents = await file.readAsString(); + //final file = await _getLocalFile(); + //final contents = await file.readAsString(); /* return serializers @@ -31,7 +27,7 @@ class FileStorage { } Future saveData(List products) async { - final file = await _getLocalFile(); + //final file = await _getLocalFile(); /* return file.writeAsString( diff --git a/lib/data/repositories/dashboard_repository.dart b/lib/data/repositories/dashboard_repository.dart index 78a22c13a..2c79e03b1 100644 --- a/lib/data/repositories/dashboard_repository.dart +++ b/lib/data/repositories/dashboard_repository.dart @@ -2,8 +2,6 @@ import 'dart:async'; import 'dart:core'; import 'package:meta/meta.dart'; import 'package:invoiceninja/data/models/serializers.dart'; -import 'package:built_collection/built_collection.dart'; - import 'package:invoiceninja/redux/auth/auth_state.dart'; import 'package:invoiceninja/data/models/entities.dart'; import 'package:invoiceninja/data/file_storage.dart'; diff --git a/lib/keys.dart b/lib/keys.dart index 90bb9c875..cca74fd76 100644 --- a/lib/keys.dart +++ b/lib/keys.dart @@ -11,7 +11,7 @@ class NinjaKeys { static final productHome = const Key('__product_home__'); static final productList = const Key('__product_list__'); - static final productItem = (int id) => Key('ProductItem__${id}'); + static final productItem = (int id) => Key('ProductItem__$id'); static final productItemCheckbox = (int id) => Key('ProductItem__${id}__Checkbox'); static final productItemProductKey = (int id) => Key('ProductItem__${id}__ProductKey'); diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart index 07333d6df..1bab7da21 100644 --- a/lib/redux/app/app_reducer.dart +++ b/lib/redux/app/app_reducer.dart @@ -2,8 +2,6 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/redux/app/loading_reducer.dart'; import 'package:invoiceninja/redux/auth/auth_reducer.dart'; -import 'package:invoiceninja/redux/dashboard/dashboard_reducer.dart'; -import 'package:invoiceninja/redux/product/product_reducer.dart'; import 'package:invoiceninja/redux/company/company_reducer.dart'; import 'package:invoiceninja/redux/company/company_actions.dart'; diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index dd14536f8..11d47e4d9 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -1,4 +1,3 @@ -import 'package:meta/meta.dart'; import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/redux/auth/auth_state.dart'; import 'package:invoiceninja/redux/company/company_state.dart'; diff --git a/lib/redux/auth/auth_actions.dart b/lib/redux/auth/auth_actions.dart index f0f80457c..3f70339f2 100644 --- a/lib/redux/auth/auth_actions.dart +++ b/lib/redux/auth/auth_actions.dart @@ -1,7 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/data/models/models.dart'; class LoadUserLogin {} diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 78e22b1db..de5bd0f47 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -4,13 +4,11 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/auth/auth_actions.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:invoiceninja/redux/auth/auth_state.dart'; import 'package:invoiceninja/data/file_storage.dart'; import 'package:invoiceninja/data/repositories/auth_repository.dart'; import 'package:path_provider/path_provider.dart'; import 'package:invoiceninja/redux/company/company_actions.dart'; import 'package:invoiceninja/routes.dart'; -import 'package:invoiceninja/redux/dashboard/dashboard_actions.dart'; List> createStoreAuthMiddleware([ AuthRepository repository = const AuthRepository( diff --git a/lib/redux/auth/auth_state.dart b/lib/redux/auth/auth_state.dart index a22b67c94..ad021ce31 100644 --- a/lib/redux/auth/auth_state.dart +++ b/lib/redux/auth/auth_state.dart @@ -1,10 +1,6 @@ -import 'package:meta/meta.dart'; -import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:invoiceninja/data/models/models.dart'; - part 'auth_state.g.dart'; abstract class AuthState implements Built { diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart index 48581e5de..ea43b15d9 100644 --- a/lib/redux/company/company_reducer.dart +++ b/lib/redux/company/company_reducer.dart @@ -1,11 +1,8 @@ import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/product/product_actions.dart'; import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; import 'package:invoiceninja/redux/company/company_state.dart'; import 'package:invoiceninja/redux/product/product_reducer.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_reducer.dart'; -import 'package:invoiceninja/redux/auth/auth_actions.dart'; import 'package:invoiceninja/redux/company/company_actions.dart'; CompanyState companyReducer(CompanyState state, action) { diff --git a/lib/redux/company/company_state.dart b/lib/redux/company/company_state.dart index 5a0ac6441..c98fddf0e 100644 --- a/lib/redux/company/company_state.dart +++ b/lib/redux/company/company_state.dart @@ -1,4 +1,3 @@ -import 'package:meta/meta.dart'; import 'package:invoiceninja/redux/product/product_state.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_state.dart'; import 'package:invoiceninja/data/models/entities.dart'; diff --git a/lib/redux/dashboard/dashboard_middleware.dart b/lib/redux/dashboard/dashboard_middleware.dart index 76ecb5980..722d928cb 100644 --- a/lib/redux/dashboard/dashboard_middleware.dart +++ b/lib/redux/dashboard/dashboard_middleware.dart @@ -4,8 +4,6 @@ import 'package:invoiceninja/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/data/repositories/dashboard_repository.dart'; import 'package:invoiceninja/data/file_storage.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; -import 'package:invoiceninja/data/models/entities.dart'; List> createStoreDashboardMiddleware([ DashboardRepository repository = const DashboardRepository( diff --git a/lib/redux/dashboard/dashboard_reducer.dart b/lib/redux/dashboard/dashboard_reducer.dart index 8563d00e4..814b70fd2 100644 --- a/lib/redux/dashboard/dashboard_reducer.dart +++ b/lib/redux/dashboard/dashboard_reducer.dart @@ -1,7 +1,6 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_actions.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_state.dart'; -import 'package:invoiceninja/data/models/models.dart'; final dashboardReducer = combineReducers([ TypedReducer(_setLoadedDashboards), diff --git a/lib/redux/dashboard/dashboard_state.dart b/lib/redux/dashboard/dashboard_state.dart index 3722f2a06..358f9f7cb 100644 --- a/lib/redux/dashboard/dashboard_state.dart +++ b/lib/redux/dashboard/dashboard_state.dart @@ -1,6 +1,4 @@ -import 'package:meta/meta.dart'; import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/redux/auth/auth_state.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index bb498f52d..e104d1d77 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -14,7 +14,7 @@ List> createStoreProductsMiddleware([ ), ]) { final loadProducts = _createLoadProducts(repository); - final saveProducts = _createSaveProducts(repository); + //final saveProducts = _createSaveProducts(repository); return [ TypedMiddleware(loadProducts), @@ -22,17 +22,17 @@ List> createStoreProductsMiddleware([ ]; } +/* Middleware _createSaveProducts(ProductsRepository repository) { return (Store store, action, NextDispatcher next) { next(action); - /* repository.saveProducts( productsSelector(store.state).map((product) => product.toEntity()).toList(), ); - */ }; } +*/ Middleware _createLoadProducts(ProductsRepository repository) { return (Store store, action, NextDispatcher next) { diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart index d425d6a27..6cf5c6efd 100644 --- a/lib/redux/product/product_reducer.dart +++ b/lib/redux/product/product_reducer.dart @@ -1,7 +1,5 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/product/product_actions.dart'; -import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; import 'package:invoiceninja/redux/product/product_state.dart'; final productsReducer = combineReducers([ diff --git a/lib/redux/product/product_state.dart b/lib/redux/product/product_state.dart index e199569ed..4b946dd68 100644 --- a/lib/redux/product/product_state.dart +++ b/lib/redux/product/product_state.dart @@ -1,6 +1,4 @@ -import 'package:meta/meta.dart'; import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/redux/auth/auth_state.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/ui/auth/login.dart b/lib/ui/auth/login.dart index a67c16ede..5a29fafb7 100644 --- a/lib/ui/auth/login.dart +++ b/lib/ui/auth/login.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:invoiceninja/redux/auth/auth_state.dart'; class Login extends StatelessWidget { - bool isLoading; - AuthState authState; + final bool isLoading; + final AuthState authState; final Function(BuildContext, String, String, String) onLoginClicked; Login({ diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 20f98c778..22647a403 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -1,9 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:invoiceninja/ui/app/app_loading.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/app/loading_indicator.dart'; -import 'package:invoiceninja/keys.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_state.dart'; class DashboardPanels extends StatelessWidget { diff --git a/lib/ui/dashboard/dashboard_vm.dart b/lib/ui/dashboard/dashboard_vm.dart index d01d0b03e..5a2314304 100644 --- a/lib/ui/dashboard/dashboard_vm.dart +++ b/lib/ui/dashboard/dashboard_vm.dart @@ -2,8 +2,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/dashboard/dashboard_actions.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/dashboard/dashboard_panels.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/redux/dashboard/dashboard_state.dart'; diff --git a/lib/ui/product/product_details_vm.dart b/lib/ui/product/product_details_vm.dart index 18ab0c01f..b26c5ba5d 100644 --- a/lib/ui/product/product_details_vm.dart +++ b/lib/ui/product/product_details_vm.dart @@ -9,7 +9,6 @@ import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/product/product_actions.dart'; import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/product/product_details.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; class ProductDetails extends StatelessWidget { diff --git a/lib/ui/product/product_list_vm.dart b/lib/ui/product/product_list_vm.dart index ce3576a4f..91fd86621 100644 --- a/lib/ui/product/product_list_vm.dart +++ b/lib/ui/product/product_list_vm.dart @@ -2,10 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/product/product_actions.dart'; import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/product/product_list.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/redux/product/product_state.dart'; diff --git a/lib/ui/product/products.dart b/lib/ui/product/products.dart index fd617da9c..69ebf0469 100644 --- a/lib/ui/product/products.dart +++ b/lib/ui/product/products.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/keys.dart'; import 'package:invoiceninja/ui/product/product_list_vm.dart';