From a82464fd20a007c2dcae9396e27cd38c002a24cd Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 May 2018 01:11:17 -0700 Subject: [PATCH] Use relative import paths --- lib/data/file_storage.dart | 2 +- lib/data/models/models.dart | 2 +- lib/data/repositories/product_repository.dart | 10 +++++----- lib/data/repositories/repositories.dart | 2 +- lib/data/web_client.dart | 2 +- lib/main.dart | 16 ++++++++-------- lib/redux/app/app_reducer.dart | 6 +++--- lib/redux/app/app_state.dart | 2 +- lib/redux/app/loading_reducer.dart | 2 +- lib/redux/product/product_actions.dart | 2 +- lib/redux/product/product_middleware.dart | 12 ++++++------ lib/redux/product/product_reducer.dart | 6 +++--- lib/redux/product/product_selectors.dart | 6 +++--- lib/ui/app/app_loading.dart | 4 ++-- lib/ui/client/client_list.dart | 4 ++-- lib/ui/dashboard.dart | 4 ++-- lib/ui/product/product_details.dart | 4 ++-- lib/ui/product/product_details_pm.dart | 10 +++++----- lib/ui/product/product_home.dart | 6 +++--- lib/ui/product/product_item.dart | 4 ++-- lib/ui/product/product_list.dart | 12 ++++++------ lib/ui/product/product_list_pm.dart | 10 +++++----- test/widget_test.dart | 2 -- 23 files changed, 64 insertions(+), 66 deletions(-) diff --git a/lib/data/file_storage.dart b/lib/data/file_storage.dart index 0f05a15fe..cf32be9b0 100644 --- a/lib/data/file_storage.dart +++ b/lib/data/file_storage.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:invoiceninja/data/models/models.dart'; +import '../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. diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index e1330154e..05cb903b8 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -1 +1 @@ -export 'package:invoiceninja/data/models/entities.dart'; \ No newline at end of file +export '../../data/models/entities.dart'; \ No newline at end of file diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index 67a2de742..58b10c8d5 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -1,11 +1,11 @@ import 'dart:async'; import 'dart:core'; - import 'package:meta/meta.dart'; -import 'package:invoiceninja/data/models/entities.dart'; -import 'package:invoiceninja/data/repositories/repositories.dart'; -import 'package:invoiceninja/data/file_storage.dart'; -import 'package:invoiceninja/data/web_client.dart'; + +import '../../data/models/entities.dart'; +import '../../data/repositories/repositories.dart'; +import '../../data/file_storage.dart'; +import '../../data/web_client.dart'; /// A class that glues together our local file storage and web client. It has a /// clear responsibility: Load Products and Persist products. diff --git a/lib/data/repositories/repositories.dart b/lib/data/repositories/repositories.dart index ebdfb9061..4c740b492 100644 --- a/lib/data/repositories/repositories.dart +++ b/lib/data/repositories/repositories.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:core'; -import 'package:invoiceninja/data/models/entities.dart'; +import '../../data/models/entities.dart'; /// A class that Loads and Persists products. The data layer of the app. /// diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 415dc3508..6f538695e 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; import 'package:http/http.dart' as http; -import 'package:invoiceninja/data/models/models.dart'; +import '../data/models/models.dart'; /// A class that is meant to represent a Web Service you would call to fetch /// and persist Products to and from the cloud. diff --git a/lib/main.dart b/lib/main.dart index 995f8b76b..15e4c3b79 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/routes.dart'; -import 'package:invoiceninja/ui/dashboard.dart'; -import 'package:invoiceninja/ui/client/client_list.dart'; -import 'package:invoiceninja/ui/product/product_home.dart'; -import 'package:invoiceninja/redux/product/product_actions.dart'; -import 'package:invoiceninja/redux/product/product_middleware.dart'; -import 'package:invoiceninja/redux/app/app_reducer.dart'; +import 'redux/app/app_state.dart'; +import 'ui/dashboard.dart'; +import 'ui/client/client_list.dart'; +import 'ui/product/product_home.dart'; +import 'routes.dart'; +import 'redux/product/product_actions.dart'; +import 'redux/product/product_middleware.dart'; +import 'redux/app/app_reducer.dart'; void main() { diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart index 2bc8a74a8..eda1d035c 100644 --- a/lib/redux/app/app_reducer.dart +++ b/lib/redux/app/app_reducer.dart @@ -1,6 +1,6 @@ -import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/redux/app/loading_reducer.dart'; -import 'package:invoiceninja/redux/product/product_reducer.dart'; +import '../../redux/app/app_state.dart'; +import '../../redux/app/loading_reducer.dart'; +import '../../redux/product/product_reducer.dart'; // We create the State reducer by combining many smaller reducers into one! AppState appReducer(AppState state, action) { diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index fc10e43cd..ef4ca651b 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -1,5 +1,5 @@ import 'package:meta/meta.dart'; -import 'package:invoiceninja/data/models/models.dart'; +import '../../data/models/models.dart'; @immutable class AppState { diff --git a/lib/redux/app/loading_reducer.dart b/lib/redux/app/loading_reducer.dart index e7ca0543f..0dd84694e 100644 --- a/lib/redux/app/loading_reducer.dart +++ b/lib/redux/app/loading_reducer.dart @@ -1,5 +1,5 @@ import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/product/product_actions.dart'; +import '../../redux/product/product_actions.dart'; final loadingReducer = combineReducers([ TypedReducer(_setLoaded), diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart index 26420ca10..e736de8a0 100644 --- a/lib/redux/product/product_actions.dart +++ b/lib/redux/product/product_actions.dart @@ -1,4 +1,4 @@ -import 'package:invoiceninja/data/models/models.dart'; +import '../../data/models/models.dart'; class LoadProductsAction {} diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index b1d918f86..65937150c 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -1,11 +1,11 @@ import 'package:path_provider/path_provider.dart'; import 'package:redux/redux.dart'; -import 'package:invoiceninja/redux/product/product_actions.dart'; -import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/data/repositories/repositories.dart'; -import 'package:invoiceninja/data/repositories/product_repository.dart'; -import 'package:invoiceninja/data/file_storage.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; +import '../../redux/product/product_actions.dart'; +import '../../redux/app/app_state.dart'; +import '../../data/repositories/repositories.dart'; +import '../../data/repositories/product_repository.dart'; +import '../../data/file_storage.dart'; +import '../../redux/product/product_selectors.dart'; List> createStoreProductsMiddleware([ ProductsRepository repository = const ProductsRepositoryFlutter( diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart index 02c4c4c10..337e4fa68 100644 --- a/lib/redux/product/product_reducer.dart +++ b/lib/redux/product/product_reducer.dart @@ -1,7 +1,7 @@ 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 '../../redux/product/product_actions.dart'; +import '../../data/models/models.dart'; +import '../../redux/product/product_selectors.dart'; final productsReducer = combineReducers>([ /* diff --git a/lib/redux/product/product_selectors.dart b/lib/redux/product/product_selectors.dart index 3c892430a..3d5fe1476 100644 --- a/lib/redux/product/product_selectors.dart +++ b/lib/redux/product/product_selectors.dart @@ -1,6 +1,6 @@ -import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/utils/optional.dart'; +import '../../data/models/models.dart'; +import '../../redux/app/app_state.dart'; +import '../../utils/optional.dart'; bool isLoadingSelector(AppState state) => state.isLoading; diff --git a/lib/ui/app/app_loading.dart b/lib/ui/app/app_loading.dart index 777354a7e..cb0045e38 100644 --- a/lib/ui/app/app_loading.dart +++ b/lib/ui/app/app_loading.dart @@ -2,8 +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/app/app_state.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; +import '../../redux/app/app_state.dart'; +import '../../redux/product/product_selectors.dart'; class AppLoading extends StatelessWidget { final Function(BuildContext context, bool isLoading) builder; diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart index fc82ecdd9..d34338330 100644 --- a/lib/ui/client/client_list.dart +++ b/lib/ui/client/client_list.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:invoiceninja/keys.dart'; -import 'package:invoiceninja/ui/app/sidebar.dart'; +import '../../keys.dart'; +import '../../ui/app/sidebar.dart'; class ClientList extends StatelessWidget { ClientList() : super(key: NinjaKeys.clientList); diff --git a/lib/ui/dashboard.dart b/lib/ui/dashboard.dart index 1bb802452..86b406469 100644 --- a/lib/ui/dashboard.dart +++ b/lib/ui/dashboard.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:invoiceninja/keys.dart'; -import 'package:invoiceninja/ui/app/sidebar.dart'; +import '../keys.dart'; +import '../ui/app/sidebar.dart'; class Dashboard extends StatelessWidget { Dashboard() : super(key: NinjaKeys.dashboard); diff --git a/lib/ui/product/product_details.dart b/lib/ui/product/product_details.dart index 8911b4800..9e0cd9932 100644 --- a/lib/ui/product/product_details.dart +++ b/lib/ui/product/product_details.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -//import 'package:invoiceninja/containers/edit_product.dart'; -import 'package:invoiceninja/data/models/models.dart'; +//import '../../containers/edit_product.dart'; +import '../../data/models/models.dart'; class DetailsScreen extends StatelessWidget { final ProductEntity product; diff --git a/lib/ui/product/product_details_pm.dart b/lib/ui/product/product_details_pm.dart index a2cbe8ac9..d7552eb06 100644 --- a/lib/ui/product/product_details_pm.dart +++ b/lib/ui/product/product_details_pm.dart @@ -6,11 +6,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.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_details.dart'; -import 'package:invoiceninja/redux/product/product_selectors.dart'; -import 'package:invoiceninja/redux/app/app_state.dart'; +import '../../redux/product/product_actions.dart'; +import '../../data/models/models.dart'; +import '../../ui/product/product_details.dart'; +import '../../redux/product/product_selectors.dart'; +import '../../redux/app/app_state.dart'; class ProductDetails extends StatelessWidget { final int id; diff --git a/lib/ui/product/product_home.dart b/lib/ui/product/product_home.dart index d20e86e24..a08ed3365 100644 --- a/lib/ui/product/product_home.dart +++ b/lib/ui/product/product_home.dart @@ -3,9 +3,9 @@ // in the LICENSE file. import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/keys.dart'; -import 'package:invoiceninja/ui/product/product_list_pm.dart'; +import '../../data/models/models.dart'; +import '../../keys.dart'; +import '../../ui/product/product_list_pm.dart'; class ProductHome extends StatelessWidget { ProductHome() : super(key: NinjaKeys.productHome); diff --git a/lib/ui/product/product_item.dart b/lib/ui/product/product_item.dart index 36603e57c..f335e50a7 100644 --- a/lib/ui/product/product_item.dart +++ b/lib/ui/product/product_item.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/keys.dart'; +import '../../data/models/models.dart'; +import '../../keys.dart'; class ProductItem extends StatelessWidget { final DismissDirectionCallback onDismissed; diff --git a/lib/ui/product/product_list.dart b/lib/ui/product/product_list.dart index 9622b6448..0aefca89b 100644 --- a/lib/ui/product/product_list.dart +++ b/lib/ui/product/product_list.dart @@ -1,11 +1,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja/ui/app/app_loading.dart'; -import 'package:invoiceninja/ui/product/product_details_pm.dart'; -import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/ui/app/loading_indicator.dart'; -import 'package:invoiceninja/ui/product/product_item.dart'; -import 'package:invoiceninja/keys.dart'; +import '../../ui/app/app_loading.dart'; +import '../../ui/product/product_details_pm.dart'; +import '../../data/models/models.dart'; +import '../../ui/app/loading_indicator.dart'; +import '../../ui/product/product_item.dart'; +import '../../keys.dart'; class ProductList extends StatelessWidget { final List products; diff --git a/lib/ui/product/product_list_pm.dart b/lib/ui/product/product_list_pm.dart index 69086fc6a..50eb3f7a5 100644 --- a/lib/ui/product/product_list_pm.dart +++ b/lib/ui/product/product_list_pm.dart @@ -2,11 +2,11 @@ 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 '../../redux/product/product_actions.dart'; +import '../../data/models/models.dart'; +import '../../ui/product/product_list.dart'; +import '../../redux/product/product_selectors.dart'; +import '../../redux/app/app_state.dart'; class FilteredProducts extends StatelessWidget { FilteredProducts({Key key}) : super(key: key); diff --git a/test/widget_test.dart b/test/widget_test.dart index 424d1761a..d6d9cca4b 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,8 +7,6 @@ //import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -//import 'package:invoiceninja/main.dart'; - void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame.