Refactor

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<Clie
     if (idNumber.toLowerCase().contains(search)) {
       return true;
     }
+    if (workPhone.toLowerCase().contains(search)) {
+      return true;
+    }
     if (contacts.where((contact) => contact.matchesSearch(search)).length > 0) {
       return true;
     }
@@ -235,15 +239,15 @@ abstract class ClientEntity extends Object with BaseEntity implements Built<Clie
     if (displayName.toLowerCase().contains(search)) {
       return null;
     }
-
     if (vatNumber.toLowerCase().contains(search)) {
       return ClientFields.vatNumber;
     }
-
     if (idNumber.toLowerCase().contains(search)) {
       return ClientFields.idNumber;
     }
-
+    if (workPhone.toLowerCase().contains(search)) {
+      return ClientFields.workPhone;
+    }
     var contact = contacts.where((contact) => contact.matchesSearch(search)).first;
     if (contact != null) {
       return contact.matchesSearchField(search);
@@ -261,11 +265,12 @@ abstract class ClientEntity extends Object with BaseEntity implements Built<Clie
     if (vatNumber.toLowerCase().contains(search)) {
       return vatNumber;
     }
-
     if (idNumber.toLowerCase().contains(search)) {
       return idNumber;
     }
-
+    if (workPhone.toLowerCase().contains(search)) {
+      return workPhone;
+    }
     var contact = contacts.where((contact) => contact.matchesSearch(search)).first;
     if (contact != null) {
       return contact.matchesSearchValue(search);
@@ -382,7 +387,6 @@ abstract class ContactEntity extends Object with BaseEntity implements Built<Con
     return null;
   }
 
-
   ContactEntity._();
   static Serializer<ContactEntity> get serializer => _$contactEntitySerializer;
 }

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';
 

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';

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';

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';

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';
 

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 {

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';

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 {

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);

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 {

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'];

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(