From e2d0efb0a659d5680863d9dfb2bc96c71c206494 Mon Sep 17 00:00:00 2001 From: Anmol Gupta Date: Tue, 3 Jul 2018 12:03:57 +0530 Subject: [PATCH] Refactor --- lib/data/models/entities.dart | 3 --- lib/data/models/invoice_model.dart | 1 - lib/data/models/models.dart | 7 ++++--- lib/data/repositories/auth_repository.dart | 3 +-- lib/data/repositories/client_repository.dart | 2 +- lib/data/repositories/credit_repository.dart | 2 +- lib/data/repositories/expense_repository.dart | 2 +- lib/data/repositories/invoice_repository.dart | 2 +- lib/data/repositories/payment_repository.dart | 2 +- lib/data/repositories/product_repository.dart | 2 +- lib/data/repositories/project_repository.dart | 2 +- lib/data/repositories/task_repository.dart | 2 +- lib/data/repositories/vendor_repository.dart | 2 +- lib/data/web_client.dart | 2 +- 14 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index 717c71f14..95ecbb575 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -1,11 +1,8 @@ -import 'dart:math'; - 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'; import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/ui/invoice/invoice_item.dart'; import 'package:invoiceninja/utils/formatting.dart'; part 'entities.g.dart'; diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 00773e190..4b01a95a0 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -2,7 +2,6 @@ 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/entities.dart'; -import 'package:invoiceninja/data/models/product_model.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/utils/formatting.dart'; diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index f7d543f51..20afcd0a4 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -1,3 +1,7 @@ +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; + export 'package:invoiceninja/data/models/entities.dart'; export 'package:invoiceninja/data/models/product_model.dart'; export 'package:invoiceninja/data/models/client_model.dart'; @@ -21,9 +25,6 @@ export 'package:invoiceninja/data/models/static/country_model.dart'; export 'package:invoiceninja/data/models/static/invoice_design_model.dart'; export 'package:invoiceninja/data/models/static/invoice_status_model.dart'; export 'package:invoiceninja/data/models/static/frequency_model.dart'; -import 'package:built_collection/built_collection.dart'; -import 'package:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; part 'models.g.dart'; diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart index 3ab740bb7..6a5f34ec5 100644 --- a/lib/data/repositories/auth_repository.dart +++ b/lib/data/repositories/auth_repository.dart @@ -1,7 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; -import 'package:built_collection/built_collection.dart'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:invoiceninja/data/models/entities.dart'; import 'package:invoiceninja/data/web_client.dart'; diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index fee71e99f..3bf1f9241 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index f545b5afd..c017b8a57 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index b649787da..2972afd90 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 8f2bb6710..8c5bfa2f3 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index e15de65e9..c98bc82d6 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index f404c8f61..c5a14ab4c 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index c889343ce..5c4fb4be6 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 4f196828c..352019ceb 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index daebadc38..c07d92f23 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:invoiceninja/data/models/serializers.dart'; import 'package:built_collection/built_collection.dart'; diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 8576ba627..02301da81 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'dart:core'; import 'dart:convert'; +import 'dart:core'; import 'package:http/http.dart' as http; import 'package:invoiceninja/constants.dart';