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

Null safety

This commit is contained in:
Hillel Coren 2023-10-01 11:04:17 +03:00
parent 43212776da
commit 66c320cfd4
10 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/app/forms/custom_field.dart
View File

@ -64,7 +64,7 @@ class _CustomFieldState extends State<CustomField> {
final localization = AppLocalization.of(context);
final fieldLabel = company.getCustomFieldLabel(widget.field);
if ((fieldLabel).isEmpty) {
if (fieldLabel.isEmpty) {
return SizedBox();
}

2
lib/ui/app/forms/date_picker.dart
View File

@ -265,7 +265,7 @@ class _DatePickerState extends State<DatePicker> {
}
}
if ((date).isNotEmpty) {
if (date.isNotEmpty) {
widget.onSelected(date, true);
}

2
lib/ui/app/forms/learn_more.dart
View File

@ -22,7 +22,7 @@ class LearnMoreUrl extends StatelessWidget {
Widget build(BuildContext context) {
final localization = AppLocalization.of(context);
if ((url).isEmpty) {
if (url.isEmpty) {
return child;
}

2
lib/ui/app/invoice/invoice_email_view.dart
View File

@ -87,7 +87,7 @@ class _InvoiceEmailViewState extends State<InvoiceEmailView>
selectedTemplate = EmailTemplate.reminder3;
else if ((invoice.reminder1Sent ?? '').isNotEmpty)
selectedTemplate = EmailTemplate.reminder2;
else if ((invoice.lastSentDate ?? '').isNotEmpty)
else if ((invoice.lastSentDate).isNotEmpty)
selectedTemplate = EmailTemplate.reminder1;
else
selectedTemplate = EmailTemplate.invoice;

2
lib/ui/app/lists/activity_list_tile.dart
View File

@ -139,7 +139,7 @@ class ActivityListTile extends StatelessWidget {
subtitle: Row(
children: <Widget>[
Flexible(
child: Text(((activity.notes ?? '').isNotEmpty
child: Text(((activity.notes).isNotEmpty
? localization.lookup(activity.notes)!.trim() + '\n'
: '') +
formatDate(

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

@ -174,7 +174,7 @@ class _DropDownMultiSelectState extends State<DropDownMultiSelect> {
? widget.selectedValues
.map((dynamic e) => e.toString())
.reduce((a, b) => a + ' , ' + b)
: widget.whenEmpty ?? ''),
: widget.whenEmpty),
),
alignment: Alignment.centerLeft),
),

2
lib/ui/app/presenters/entity_presenter.dart
View File

@ -31,7 +31,7 @@ class EntityPresenter {
var name = entity.listDisplayName;
// TODO replace with this: https://github.com/flutter/flutter/issues/45336
if ((name ?? '').isEmpty) {
if ((name).isEmpty) {
name = localization.pending;
}

5
lib/ui/app/tables/app_paginated_data_table.dart
View File

@ -227,8 +227,7 @@ class AppPaginatedDataTableState extends State<AppPaginatedDataTable> {
super.initState();
_controller = ScrollController();
_firstRowIndex = PageStorage.of(context).readState(context) as int? ??
widget.initialFirstRowIndex ??
0;
widget.initialFirstRowIndex;
widget.source.addListener(_handleDataSourceChanged);
_handleDataSourceChanged();
}
@ -298,7 +297,7 @@ class AppPaginatedDataTableState extends State<AppPaginatedDataTable> {
if (index < _rowCount || _rowCountApproximate) {
row = _rows.putIfAbsent(index, () => widget.source.getRow(index));
if (row == null && !haveProgressIndicator) {
row ??= _getProgressIndicatorRowFor(index);
row = _getProgressIndicatorRowFor(index);
haveProgressIndicator = true;
}
}

58
lib/ui/recurring_invoice/recurring_invoice_list_item.dart
View File

@ -25,7 +25,7 @@ class RecurringInvoiceListItem extends StatelessWidget {
this.showCheckbox = true,
});
final InvoiceEntity? invoice;
final InvoiceEntity invoice;
final String? filter;
final bool showCheckbox;
@ -33,38 +33,38 @@ class RecurringInvoiceListItem extends StatelessWidget {
Widget build(BuildContext context) {
final store = StoreProvider.of<AppState>(context);
final state = store.state;
final client = state.clientState.get(invoice!.clientId);
final client = state.clientState.get(invoice.clientId);
final uiState = state.uiState;
final invoiceUIState = uiState.recurringInvoiceUIState;
final listUIState = state.getUIState(invoice!.entityType)!.listUIState;
final listUIState = state.getUIState(invoice.entityType)!.listUIState;
final isInMultiselect = showCheckbox && listUIState.isInMultiselect();
final isChecked = isInMultiselect && listUIState.isSelected(invoice!.id);
final isChecked = isInMultiselect && listUIState.isSelected(invoice.id);
final textStyle = TextStyle(fontSize: 16);
final localization = AppLocalization.of(context)!;
final filterMatch = filter != null && filter!.isNotEmpty
? (invoice!.matchesFilterValue(filter) ??
? (invoice.matchesFilterValue(filter) ??
client!.matchesFilterValue(filter))
: null;
final statusLabel = localization
.lookup(kRecurringInvoiceStatuses[invoice!.calculatedStatusId]);
.lookup(kRecurringInvoiceStatuses[invoice.calculatedStatusId]);
final statusColor =
RecurringInvoiceStatusColors(state.prefState.colorThemeModel)
.colors[invoice!.calculatedStatusId];
.colors[invoice.calculatedStatusId];
final textColor = Theme.of(context).textTheme.bodyLarge!.color;
String subtitle = '';
if (invoice!.nextSendDate.isNotEmpty) {
subtitle += formatDate(invoice!.nextSendDate, context);
if (invoice.nextSendDate.isNotEmpty) {
subtitle += formatDate(invoice.nextSendDate, context);
}
if (subtitle.isNotEmpty) {
subtitle += ' • ';
}
subtitle += localization.lookup(kFrequencies[invoice!.frequencyId])!;
subtitle += localization.lookup(kFrequencies[invoice.frequencyId])!;
return DismissibleEntity(
isSelected: isDesktop(context) &&
invoice!.id ==
invoice.id ==
(uiState.isEditing
? invoiceUIState.editing!.id
: invoiceUIState.selectedId),
@ -76,11 +76,11 @@ class RecurringInvoiceListItem extends StatelessWidget {
return constraints.maxWidth > kTableListWidthCutoff
? InkWell(
onTap: () => selectEntity(
entity: invoice!,
entity: invoice,
forceView: !showCheckbox,
),
onLongPress: () =>
selectEntity(entity: invoice!, longPress: true),
selectEntity(entity: invoice, longPress: true),
child: Padding(
padding: const EdgeInsets.only(
left: 10,
@ -106,7 +106,7 @@ class RecurringInvoiceListItem extends StatelessWidget {
),
)
: ActionMenuButton(
entityActions: invoice!.getActions(
entityActions: invoice.getActions(
userCompany: state.userCompany,
client: client,
includeEdit: true,
@ -122,13 +122,13 @@ class RecurringInvoiceListItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
(invoice!.number ?? '').isEmpty
(invoice.number).isEmpty
? localization.pending
: invoice!.number,
: invoice.number,
style: textStyle,
overflow: TextOverflow.ellipsis,
),
if (!invoice!.isActive) EntityStateLabel(invoice)
if (!invoice.isActive) EntityStateLabel(invoice)
],
),
),
@ -139,7 +139,7 @@ class RecurringInvoiceListItem extends StatelessWidget {
children: <Widget>[
Text(
client!.displayName +
(invoice!.documents.isNotEmpty
(invoice.documents.isNotEmpty
? ' 📎'
: ''),
style: textStyle),
@ -160,7 +160,7 @@ class RecurringInvoiceListItem extends StatelessWidget {
),
SizedBox(width: 10),
Text(
formatNumber(invoice!.amount, context,
formatNumber(invoice.amount, context,
clientId: client.id)!,
style: textStyle,
textAlign: TextAlign.end,
@ -173,9 +173,9 @@ class RecurringInvoiceListItem extends StatelessWidget {
)
: ListTile(
onTap: () =>
selectEntity(entity: invoice!, forceView: !showCheckbox),
selectEntity(entity: invoice, forceView: !showCheckbox),
onLongPress: () =>
selectEntity(entity: invoice!, longPress: true),
selectEntity(entity: invoice, longPress: true),
leading: isInMultiselect
? IgnorePointer(
ignoring: listUIState.isInMultiselect(),
@ -202,8 +202,8 @@ class RecurringInvoiceListItem extends StatelessWidget {
),
SizedBox(width: 4),
Text(
formatNumber(invoice!.amount, context,
clientId: invoice!.clientId)!,
formatNumber(invoice.amount, context,
clientId: invoice.clientId)!,
style: Theme.of(context).textTheme.titleMedium),
],
),
@ -216,15 +216,15 @@ class RecurringInvoiceListItem extends StatelessWidget {
Expanded(
child: filterMatch == null
? Text(
(((invoice!.number ?? '').isEmpty
(((invoice.number ?? '').isEmpty
? localization.pending
: invoice!.number) +
(invoice!.nextSendDate.isNotEmpty
: invoice.number) +
(invoice.nextSendDate.isNotEmpty
? ' • '
: '') +
formatDate(invoice!.nextSendDate,
formatDate(invoice.nextSendDate,
context) +
(invoice!.documents.isNotEmpty
(invoice.documents.isNotEmpty
? ' 📎'
: ''))
.trim(),
@ -238,7 +238,7 @@ class RecurringInvoiceListItem extends StatelessWidget {
Text(statusLabel!,
style: TextStyle(
color:
!invoice!.isSent ? textColor : statusColor,
!invoice.isSent ? textColor : statusColor,
)),
],
),

2
lib/ui/recurring_invoice/recurring_invoice_list_vm.dart
View File

@ -43,7 +43,7 @@ class RecurringInvoiceListBuilder extends StatelessWidget {
itemBuilder: (BuildContext context, index) {
final recurringInvoiceId = viewModel.recurringInvoiceList[index];
final recurringInvoice =
viewModel.recurringInvoiceMap[recurringInvoiceId];
viewModel.recurringInvoiceMap[recurringInvoiceId]!;
return RecurringInvoiceListItem(
filter: viewModel.filter,