Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Refactor

This commit is contained in:
Anmol Gupta 2018-07-02 20:05:00 +05:30
parent 9b9902cdb6
commit d16fc4f65c
30 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/invoice_model.dart
View File

@ -250,7 +250,7 @@ abstract class InvoiceEntity extends Object with BaseEntity, CalculateInvoiceTot
//String get custom_messages;
int compareTo(InvoiceEntity invoice, String sortField, bool sortAscending) {
int response = 0;
final response = 0;
final InvoiceEntity invoiceA = sortAscending ? this : invoice;
final InvoiceEntity invoiceB = sortAscending ? invoice: this;

2
lib/data/repositories/invoice_repository.dart
View File

@ -53,7 +53,7 @@ class InvoiceRepository {
final Future<dynamic> response = await webClient.post(
auth.url + '/email_invoice?invoice_id=${invoice.id}', company.token, null);
InvoiceItemResponse invoiceResponse = serializers.deserializeWith(
final InvoiceItemResponse invoiceResponse = serializers.deserializeWith(
InvoiceItemResponse.serializer, response);
return invoiceResponse.data;

10
lib/data/repositories/persistence_repository.dart
View File

@ -20,12 +20,12 @@ class PersistenceRepository {
Future<File> saveCompanyState(CompanyState state) async {
var data = serializers.serializeWith(CompanyState.serializer, state);
final data = serializers.serializeWith(CompanyState.serializer, state);
return await fileStorage.save(json.encode(data));
}
Future<CompanyState> loadCompanyState() async {
String data = await fileStorage.load();
final String data = await fileStorage.load();
return serializers.deserializeWith(CompanyState.serializer, json.decode(data));
//return compute(_deserialize, data);
}
@ -37,18 +37,18 @@ class PersistenceRepository {
}
Future<AuthState> loadAuthState() async {
String data = await fileStorage.load();
final String data = await fileStorage.load();
return serializers.deserializeWith(AuthState.serializer, json.decode(data));
}
Future<File> saveStaticState(StaticState state) async {
var data = serializers.serializeWith(StaticState.serializer, state);
final data = serializers.serializeWith(StaticState.serializer, state);
return await fileStorage.save(json.encode(data));
}
Future<StaticState> loadStaticState() async {
String data = await fileStorage.load();
final String data = await fileStorage.load();
return serializers.deserializeWith(StaticState.serializer, json.decode(data));
}

6
lib/redux/auth/auth_middleware.dart
View File

@ -22,7 +22,7 @@ List<Middleware<AppState>> createStoreAuthMiddleware([
}
void _saveAuthLocal(dynamic action) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
final SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.setString('email', action.email);
prefs.setString('url', action.url);
@ -35,7 +35,7 @@ void _saveAuthLocal(dynamic action) async {
}
void _loadAuthLocal(Store<AppState> store, dynamic action) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
final SharedPreferences prefs = await SharedPreferences.getInstance();
final String email = prefs.getString('email') ?? Config.LOGIN_EMAIL;
final String password = prefs.getString('password') ?? Config.LOGIN_PASSWORD;
@ -86,7 +86,7 @@ Middleware<AppState> _createLoginRequest(AuthRepository repository) {
}
bool _isVersionSupported(String version) {
var parts = version.split('.');
final parts = version.split('.');
final int major = int.parse(parts[0]);
final int minor = int.parse(parts[1]);

2
lib/redux/client/client_middleware.dart
View File

@ -63,7 +63,7 @@ Middleware<AppState> _viewClientList() {
Middleware<AppState> _archiveClient(ClientRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
var origClient = store.state.clientState.map[action.clientId];
final origClient = store.state.clientState.map[action.clientId];
repository
.saveData(store.state.selectedCompany, store.state.authState,
origClient, EntityAction.archive)

2
lib/redux/client/client_reducer.dart
View File

@ -142,7 +142,7 @@ ClientState _archiveClientFailure(ClientState clientState, ArchiveClientFailure
}
ClientState _deleteClientRequest(ClientState clientState, DeleteClientRequest action) {
var client = clientState.map[action.clientId].rebuild((b) => b
final client = clientState.map[action.clientId].rebuild((b) => b
..archivedAt = DateTime.now().millisecondsSinceEpoch
..isDeleted = true
);

6
lib/redux/client/client_selectors.dart
View File

@ -23,8 +23,8 @@ List<int> dropdownClientsSelector(
}).toList();
list.sort((clientAId, clientBId) {
var clientA = clientMap[clientAId];
var clientB = clientMap[clientBId];
final clientA = clientMap[clientAId];
final clientB = clientMap[clientBId];
return clientA.compareTo(clientB, ClientFields.name, true);
});
@ -43,7 +43,7 @@ List<int> visibleClientsSelector(
BuiltList<int> clientList,
ListUIState clientListState) {
var list = clientList.where((clientId) {
final list = clientList.where((clientId) {
final client = clientMap[clientId];
if (! client.matchesStates(clientListState.stateFilters)) {
return false;

2
lib/redux/dashboard/dashboard_middleware.dart
View File

@ -36,7 +36,7 @@ Middleware<AppState> _createViewDashboard() {
Middleware<AppState> _createLoadDashboard(DashboardRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
AppState state = store.state;
final state = store.state;
if (!state.dashboardState.isStale && !action.force) {
next(action);

4
lib/redux/invoice/invoice_middleware.dart
View File

@ -111,7 +111,7 @@ Middleware<AppState> _deleteInvoice(InvoiceRepository repository) {
Middleware<AppState> _restoreInvoice(InvoiceRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
var origInvoice = store.state.invoiceState.map[action.invoiceId];
final origInvoice = store.state.invoiceState.map[action.invoiceId];
repository
.saveData(store.state.selectedCompany, store.state.authState,
origInvoice, EntityAction.restore)
@ -134,7 +134,7 @@ Middleware<AppState> _restoreInvoice(InvoiceRepository repository) {
Middleware<AppState> _emailInvoice(InvoiceRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
var origInvoice = store.state.invoiceState.map[action.invoiceId];
final origInvoice = store.state.invoiceState.map[action.invoiceId];
repository
.emailInvoice(store.state.selectedCompany, store.state.authState,
origInvoice)

4
lib/redux/product/product_middleware.dart
View File

@ -50,7 +50,7 @@ Middleware<AppState> _viewProductList() {
Middleware<AppState> _archiveProduct(ProductRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
var origProduct = store.state.productState.map[action.productId];
final origProduct = store.state.productState.map[action.productId];
repository
.saveData(store.state.selectedCompany, store.state.authState,
origProduct, EntityAction.archive)
@ -96,7 +96,7 @@ Middleware<AppState> _deleteProduct(ProductRepository repository) {
Middleware<AppState> _restoreProduct(ProductRepository repository) {
return (Store<AppState> store, dynamic action, NextDispatcher next) {
var origProduct = store.state.productState.map[action.productId];
final origProduct = store.state.productState.map[action.productId];
repository
.saveData(store.state.selectedCompany, store.state.authState,
origProduct, EntityAction.restore)

2
lib/redux/product/product_reducer.dart
View File

@ -115,7 +115,7 @@ ProductState _archiveProductFailure(ProductState productState, ArchiveProductFai
}
ProductState _deleteProductRequest(ProductState productState, DeleteProductRequest action) {
var product = productState.map[action.productId].rebuild((b) => b
final product = productState.map[action.productId].rebuild((b) => b
..archivedAt = DateTime.now().millisecondsSinceEpoch
..isDeleted = true
);

4
lib/ui/app/app_drawer.dart
View File

@ -57,8 +57,8 @@ class AppDrawer extends StatelessWidget {
),
);
Store<AppState> store = StoreProvider.of<AppState>(context);
NavigatorState navigator = Navigator.of(context);
final Store<AppState> store = StoreProvider.of<AppState>(context);
final NavigatorState navigator = Navigator.of(context);
return Drawer(
child: ListView(

2
lib/ui/app/app_search_button.dart
View File

@ -18,7 +18,7 @@ class AppSearchButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
//var store = StoreProvider.of<AppState>(context);
return StoreConnector<AppState, ListUIState>(

2
lib/ui/app/buttons/edit_icon_button.dart
View File

@ -12,7 +12,7 @@ class EditIconButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
if (!isVisible) {
return Container();

2
lib/ui/app/buttons/save_icon_button.dart
View File

@ -16,7 +16,7 @@ class SaveIconButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
if (!isVisible) {
return Container();

2
lib/ui/app/entity_dropdown.dart
View File

@ -49,7 +49,7 @@ class _EntityDropdownState extends State<EntityDropdown> {
void _showOptions() {
widget.onFilterChanged('');
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
Widget _headerRow() {
return Row(

2
lib/ui/app/entity_state_label.dart
View File

@ -9,7 +9,7 @@ class EntityStateLabel extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
return entity.isDeleted
? Text(localization.deleted,

4
lib/ui/app/invoice/invoice_item_view.dart
View File

@ -17,8 +17,8 @@ class InvoiceItemListTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
String cost = formatNumber(invoiceItem.cost, state, clientId: invoice.clientId);
String qty = formatNumber(invoiceItem.qty, state, clientId: invoice.clientId, formatNumberType: FormatNumberType.double);
final String cost = formatNumber(invoiceItem.cost, state, clientId: invoice.clientId);
final String qty = formatNumber(invoiceItem.qty, state, clientId: invoice.clientId, formatNumberType: FormatNumberType.double);
return ListTile(
title: Text(invoiceItem.productKey),

4
lib/ui/client/client_list.dart
View File

@ -27,8 +27,8 @@ class ClientList extends StatelessWidget {
child: ListView.builder(
itemCount: viewModel.clientList.length,
itemBuilder: (BuildContext context, index) {
var clientId = viewModel.clientList[index];
var client = viewModel.clientMap[clientId];
final clientId = viewModel.clientList[index];
final client = viewModel.clientMap[clientId];
return Column(children: <Widget>[
ClientItem(
filter: viewModel.filter,

4
lib/ui/client/edit/client_edit_contacts.dart
View File

@ -78,7 +78,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
_controllers.forEach((dynamic controller) => controller.removeListener(_onChanged));
var contact = widget.contact;
final contact = widget.contact;
_firstNameController.text = contact.firstName;
_lastNameController.text = contact.lastName;
_emailController.text = contact.email;
@ -113,7 +113,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
void _confirmDelete() {
showDialog<AlertDialog>(

2
lib/ui/client/edit/client_edit_details.dart
View File

@ -28,7 +28,7 @@ class ClientEditDetailsState extends State<ClientEditDetails> {
@override
void didChangeDependencies() {
List<TextEditingController> _controllers = [
final List<TextEditingController> _controllers = [
_nameController,
_idNumberController,
_vatNumberController,

2
lib/ui/client/edit/client_edit_shipping_address.dart
View File

@ -40,7 +40,7 @@ class ClientEditShippingAddressState extends State<ClientEditShippingAddress> {
_controllers.forEach((dynamic controller) => controller.removeListener(_onChanged));
var client = widget.viewModel.client;
final client = widget.viewModel.client;
_shippingAddress1Controller.text = client.shippingAddress1;
_shippingAddress2Controller.text = client.shippingAddress2;
_shippingCityController.text = client.shippingCity;

12
lib/ui/client/view/client_view_details.dart
View File

@ -21,7 +21,7 @@ class _ClientViewDetailsState extends State<ClientViewDetails> {
Future<Null> _launched;
Future<Null> _launchURL(BuildContext context, String url) async {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
if (await canLaunch(url)) {
await launch(url, forceSafariVC: false, forceWebView: false);
} else {
@ -40,11 +40,11 @@ class _ClientViewDetailsState extends State<ClientViewDetails> {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
var client = widget.client;
final localization = AppLocalization.of(context);
final client = widget.client;
List<Widget> _buildDetailsList() {
var listTiles = <Widget>[];
final listTiles = <Widget>[];
listTiles
.add(FutureBuilder<Null>(future: _launched, builder: _launchStatus));
@ -122,8 +122,8 @@ class _ClientViewDetailsState extends State<ClientViewDetails> {
));
}
var billingAddress = formatAddress(object: client);
var shippingAddress = formatAddress(object: client, isShipping: true);
final billingAddress = formatAddress(object: client);
final shippingAddress = formatAddress(object: client, isShipping: true);
if (billingAddress.isNotEmpty) {
listTiles.add(AppListTile(

2
lib/ui/client/view/client_view_overview.dart
View File

@ -15,7 +15,7 @@ class ClientOverview extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
return ListView(
children: <Widget>[

4
lib/ui/invoice/edit/invoice_edit_items.dart
View File

@ -29,7 +29,7 @@ class InvoiceEditItems extends StatelessWidget {
);
}
var invoiceItems = invoice.invoiceItems.map((invoiceItem) =>
final invoiceItems = invoice.invoiceItems.map((invoiceItem) =>
ItemEditDetails(
viewModel: viewModel,
key: Key('__${EntityType.invoiceItem}_${invoiceItem.id}__'),
@ -117,7 +117,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> with AutomaticKeepAliv
@override
Widget build(BuildContext context) {
var localization = AppLocalization.of(context);
final localization = AppLocalization.of(context);
void _confirmDelete() {
showDialog<AlertDialog>(

8
lib/ui/invoice/edit/invoice_item_selector.dart
View File

@ -34,10 +34,10 @@ class _InvoiceItemSelectorState extends State<InvoiceItemSelector> {
}
void _onItemsSelected() {
List<InvoiceItemEntity> items = [];
final List<InvoiceItemEntity> items = [];
_selectedIds.forEach((entityId) {
var product = widget.state.productState.map[entityId];
final product = widget.state.productState.map[entityId];
items.add(product.asInvoiceItem);
});
@ -143,8 +143,8 @@ class _InvoiceItemSelectorState extends State<InvoiceItemSelector> {
shrinkWrap: true,
itemCount: matches.length,
itemBuilder: (BuildContext context, int index) {
int entityId = matches[index];
var entity = state.map[entityId];
final int entityId = matches[index];
final entity = state.map[entityId];
final String subtitle = entity.matchesSearchValue(_filter);
return ListTile(
dense: true,

2
lib/ui/product/edit/product_edit.dart
View File

@ -40,7 +40,7 @@ class _ProductEditState extends State<ProductEdit> {
_controllers.forEach((dynamic controller) => controller.removeListener(_onChanged));
var product = widget.viewModel.product;
final product = widget.viewModel.product;
_productKeyController.text = product.productKey;
_notesController.text = product.notes;
_costController.text = formatNumber(product.cost, widget.viewModel.state, formatNumberType: FormatNumberType.input);

14
lib/utils/formatting.dart
View File

@ -32,8 +32,8 @@ String formatNumber(
return null;
}
CompanyEntity company = state.selectedCompany;
ClientEntity client = state.selectedCompanyState.clientState.map[clientId];
final CompanyEntity company = state.selectedCompany;
final ClientEntity client = state.selectedCompanyState.clientState.map[clientId];
//var countryId = client?.countryId ?? company.countryId;
int currencyId;
@ -114,13 +114,13 @@ String formatAddress(
{dynamic object, bool isShipping = false, String delimiter = '\n'}) {
var str = '';
String address1 =
final String address1 =
(isShipping ? object.shippingAddress1 : object.address1) ?? '';
String address2 =
final String address2 =
(isShipping ? object.shippingAddress2 : object.address2) ?? '';
String city = (isShipping ? object.city : object.city) ?? '';
String state = (isShipping ? object.state : object.state) ?? '';
String postalCode =
final String city = (isShipping ? object.city : object.city) ?? '';
final String state = (isShipping ? object.state : object.state) ?? '';
final String postalCode =
(isShipping ? object.postalCode : object.postalCode) ?? '';
if (address1.isNotEmpty) {

14
samples/form_keys.dart
View File

@ -45,7 +45,7 @@ class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
@override
Widget build(BuildContext context) {
// Create a test client to show initially
ClientEntity _client = ClientEntity(
final ClientEntity _client = ClientEntity(
name: 'Acme Client',
contacts: [ContactEntity(email: 'test@example.com')]);
@ -63,12 +63,12 @@ class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
_formKey.currentState.save();
var clientState = _clientKey.currentState;
var contactsState = _contactsKey.currentState;
final clientState = _clientKey.currentState;
final contactsState = _contactsKey.currentState;
// If the user never views a tab the state can be null
// in which case we'll use the current value
ClientEntity client = ClientEntity(
final ClientEntity client = ClientEntity(
name: clientState?.name ?? _client.name,
contacts: contactsState?.getContacts() ?? _client.contacts,
);
@ -168,7 +168,7 @@ class ContactsPageState extends State<ContactsPage>
@override
void initState() {
super.initState();
var client = widget.client;
final client = widget.client;
_contacts = client.contacts.toList();
_contactKeys = client.contacts
.map((contact) => GlobalKey<ContactFormState>())
@ -192,7 +192,7 @@ class ContactsPageState extends State<ContactsPage>
void _onRemovePressed(GlobalKey<ContactFormState> key) {
setState(() {
var index = _contactKeys.indexOf(key);
final index = _contactKeys.indexOf(key);
_contactKeys.removeAt(index);
_contacts.removeAt(index);
});
@ -200,7 +200,7 @@ class ContactsPageState extends State<ContactsPage>
@override
Widget build(BuildContext context) {
List<Widget> items = [];
final List<Widget> items = [];
for (var i = 0; i < _contacts.length; i++) {
final contact = _contacts[i];

8
samples/form_redux.dart
View File

@ -190,7 +190,7 @@ class _ClientPageState extends State<ClientPage> {
@override
void didChangeDependencies() {
var store = StoreProvider.of<AppState>(context);
final store = StoreProvider.of<AppState>(context);
_nameController.removeListener(_onChanged);
_nameController.text = store.state.client.name;
_nameController.addListener(_onChanged);
@ -289,8 +289,8 @@ class _ContactFormState extends State<ContactForm> {
}
void _onChanged() {
var store = StoreProvider.of<AppState>(context);
var email = _emailController.text.trim();
final store = StoreProvider.of<AppState>(context);
final email = _emailController.text.trim();
if (email != widget.contact.email) {
store.dispatch(UpdateContact(email: email, index: widget.index));
}
@ -298,7 +298,7 @@ class _ContactFormState extends State<ContactForm> {
@override
Widget build(BuildContext context) {
var store = StoreProvider.of<AppState>(context);
final store = StoreProvider.of<AppState>(context);
return FormCard(
children: <Widget>[