From 4840a89bfa02d1e91f9666c77c0219ded2b1536e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Jun 2018 01:08:20 -0700 Subject: [PATCH] Refactor --- lib/data/models/client_model.dart | 16 ++++++++++------ lib/ui/app/entity_dropdown.dart | 1 - lib/ui/client/edit/client_edit.dart | 1 - .../client/edit/client_edit_billing_address.dart | 1 - lib/ui/client/edit/client_edit_details.dart | 1 - .../edit/client_edit_shipping_address.dart | 1 - lib/ui/client/edit/client_edit_vm.dart | 2 -- lib/ui/invoice/edit/invoice_edit.dart | 1 - lib/ui/invoice/edit/invoice_edit_details.dart | 3 --- lib/ui/invoice/edit/invoice_edit_details_vm.dart | 6 ------ lib/ui/invoice/edit/invoice_edit_vm.dart | 2 -- lib/utils/localization.dart | 2 ++ samples/form_redux.dart | 1 + 13 files changed, 13 insertions(+), 25 deletions(-) diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index 32dd70022..da01a8750 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -33,6 +33,7 @@ class ClientFields { static const String archivedAt = 'archivedAt'; static const String isDeleted = 'isDeleted'; static const String contact = 'contact'; + static const String workPhone = 'workPhone'; } @@ -221,6 +222,9 @@ abstract class ClientEntity extends Object with BaseEntity implements Built contact.matchesSearch(search)).length > 0) { return true; } @@ -235,15 +239,15 @@ abstract class ClientEntity extends Object with BaseEntity implements Built contact.matchesSearch(search)).first; if (contact != null) { return contact.matchesSearchField(search); @@ -261,11 +265,12 @@ abstract class ClientEntity extends Object with BaseEntity implements Built contact.matchesSearch(search)).first; if (contact != null) { return contact.matchesSearchValue(search); @@ -382,7 +387,6 @@ abstract class ContactEntity extends Object with BaseEntity implements Built get serializer => _$contactEntitySerializer; } diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart index 108be7f2a..8e0fbc61d 100644 --- a/lib/ui/app/entity_dropdown.dart +++ b/lib/ui/app/entity_dropdown.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/redux/ui/ui_actions.dart'; import 'package:invoiceninja/utils/localization.dart'; import 'package:redux/redux.dart'; diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart index 327efcb22..a02a89dc7 100644 --- a/lib/ui/client/edit/client_edit.dart +++ b/lib/ui/client/edit/client_edit.dart @@ -1,6 +1,5 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_billing_address.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_details.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_shipping_address.dart'; diff --git a/lib/ui/client/edit/client_edit_billing_address.dart b/lib/ui/client/edit/client_edit_billing_address.dart index be03e1cc0..28a97c3d4 100644 --- a/lib/ui/client/edit/client_edit_billing_address.dart +++ b/lib/ui/client/edit/client_edit_billing_address.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/app/form_card.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja/utils/localization.dart'; diff --git a/lib/ui/client/edit/client_edit_details.dart b/lib/ui/client/edit/client_edit_details.dart index e9995dda6..32a657ee4 100644 --- a/lib/ui/client/edit/client_edit_details.dart +++ b/lib/ui/client/edit/client_edit_details.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja/utils/localization.dart'; import 'package:invoiceninja/ui/app/form_card.dart'; diff --git a/lib/ui/client/edit/client_edit_shipping_address.dart b/lib/ui/client/edit/client_edit_shipping_address.dart index 493fb9484..d70ec2953 100644 --- a/lib/ui/client/edit/client_edit_shipping_address.dart +++ b/lib/ui/client/edit/client_edit_shipping_address.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/client/edit/client_edit_vm.dart'; import 'package:invoiceninja/utils/localization.dart'; diff --git a/lib/ui/client/edit/client_edit_vm.dart b/lib/ui/client/edit/client_edit_vm.dart index 18e150f47..64fa3d798 100644 --- a/lib/ui/client/edit/client_edit_vm.dart +++ b/lib/ui/client/edit/client_edit_vm.dart @@ -6,11 +6,9 @@ import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/redux/client/client_actions.dart'; import 'package:invoiceninja/redux/ui/ui_actions.dart'; -import 'package:invoiceninja/ui/app/snackbar_row.dart'; import 'package:invoiceninja/ui/client/client_screen.dart'; import 'package:invoiceninja/ui/client/edit/client_edit.dart'; import 'package:invoiceninja/ui/client/view/client_view_vm.dart'; -import 'package:invoiceninja/utils/localization.dart'; import 'package:redux/redux.dart'; class ClientEditScreen extends StatelessWidget { diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart index aada96fff..8372e9c67 100644 --- a/lib/ui/invoice/edit/invoice_edit.dart +++ b/lib/ui/invoice/edit/invoice_edit.dart @@ -1,6 +1,5 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja/ui/invoice/edit/invoice_edit_details.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit_details_vm.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit_items.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit_vm.dart'; diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart index 9c03e9190..89b9c09bb 100644 --- a/lib/ui/invoice/edit/invoice_edit_details.dart +++ b/lib/ui/invoice/edit/invoice_edit_details.dart @@ -1,10 +1,7 @@ -import 'package:built_collection/built_collection.dart'; import 'package:flutter/material.dart'; -import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/app/entity_dropdown.dart'; import 'package:invoiceninja/ui/app/form_card.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit_details_vm.dart'; -import 'package:invoiceninja/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja/utils/localization.dart'; class InvoiceEditDetails extends StatefulWidget { diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart index 857999b7b..d80a1b8e4 100644 --- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart @@ -1,20 +1,14 @@ -import 'dart:async'; import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja/redux/ui/ui_actions.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit_details.dart'; -import 'package:invoiceninja/ui/invoice/edit/invoice_edit_vm.dart'; -import 'package:invoiceninja/ui/invoice/invoice_screen.dart'; -import 'package:invoiceninja/utils/localization.dart'; import 'package:redux/redux.dart'; import 'package:invoiceninja/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja/data/models/models.dart'; -import 'package:invoiceninja/ui/invoice/edit/invoice_edit.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; import 'package:invoiceninja/redux/client/client_selectors.dart'; -import 'package:invoiceninja/ui/app/snackbar_row.dart'; class InvoiceEditDetailsScreen extends StatelessWidget { InvoiceEditDetailsScreen({Key key}) : super(key: key); diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart index 8367b679f..963e68139 100644 --- a/lib/ui/invoice/edit/invoice_edit_vm.dart +++ b/lib/ui/invoice/edit/invoice_edit_vm.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'package:built_collection/built_collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; @@ -11,7 +10,6 @@ import 'package:invoiceninja/redux/invoice/invoice_actions.dart'; import 'package:invoiceninja/data/models/models.dart'; import 'package:invoiceninja/ui/invoice/edit/invoice_edit.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; -import 'package:invoiceninja/redux/client/client_selectors.dart'; import 'package:invoiceninja/ui/app/snackbar_row.dart'; class InvoiceEditScreen extends StatelessWidget { diff --git a/lib/utils/localization.dart b/lib/utils/localization.dart index 6e0e9de09..481de1b43 100644 --- a/lib/utils/localization.dart +++ b/lib/utils/localization.dart @@ -127,6 +127,7 @@ class AppLocalization { 'quantity': 'Quantity', 'add_item': 'Add Item', 'contact': 'Contact', + 'work_phone': 'Phone', 'payment': 'Payment', 'payments': 'Payments', @@ -245,6 +246,7 @@ class AppLocalization { String get quantity => _localizedValues[locale.languageCode]['quantity']; String get addItem => _localizedValues[locale.languageCode]['add_item']; String get contact => _localizedValues[locale.languageCode]['contact']; + String get workPhone => _localizedValues[locale.languageCode]['work_phone']; String get payment => _localizedValues[locale.languageCode]['payment']; diff --git a/samples/form_redux.dart b/samples/form_redux.dart index 76aa591de..afc992b42 100644 --- a/samples/form_redux.dart +++ b/samples/form_redux.dart @@ -241,6 +241,7 @@ class ContactsPage extends StatelessWidget { return ListView( children: [] + ..addAll(contacts) ..add(Padding( padding: const EdgeInsets.all(12.0), child: RaisedButton(