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

Updated design

This commit is contained in:
Hillel Coren 2020-05-05 19:58:18 +03:00
parent 2b17040f9d
commit 24052b7b23
4 changed files with 426 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/constants.dart
View File

@ -344,6 +344,15 @@ const String kPaymentStatusCompleted = '4';
const String kPaymentStatusPartiallyRefunded = '5';
const String kPaymentStatusRefunded = '6';
const kPaymentStatuses = {
kPaymentStatusPending: 'pending',
kPaymentStatusVoided: 'voided',
kPaymentStatusFailed: 'failed',
kPaymentStatusCompleted: 'completed',
kPaymentStatusPartiallyRefunded: 'partially_refunded',
kPaymentStatusRefunded: 'refunded',
};
const String kExpenseStatusLogged = '1';
const String kExpenseStatusPending = '2';
const String kExpenseStatusInvoiced = '3';

149
lib/ui/credit/credit_list_item.dart
View File

@ -1,6 +1,8 @@
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:flutter/foundation.dart';
@ -42,22 +44,18 @@ class CreditListItem extends StatelessWidget {
final listUIState = state.getUIState(credit.entityType).listUIState;
final isInMultiselect = listUIState.isInMultiselect();
final showCheckbox = onCheckboxChanged != null || isInMultiselect;
final textStyle = TextStyle(fontSize: 17);
final localization = AppLocalization.of(context);
final filterMatch = filter != null && filter.isNotEmpty
? (credit.matchesFilterValue(filter) ??
client.matchesFilterValue(filter))
: null;
return DismissibleEntity(
isSelected: credit.id ==
(uiState.isEditing
? creditUIState.editing.id
: creditUIState.selectedId),
userCompany: state.userCompany,
entity: credit,
onEntityAction: onEntityAction,
child: ListTile(
final statusLabel = localization.lookup(kCreditStatuses[credit.statusId]);
final statusColor = CreditStatusColors.colors[credit.statusId];
Widget _buildMobile() {
return ListTile(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
@ -119,7 +117,136 @@ class CreditListItem extends StatelessWidget {
EntityStateLabel(credit),
],
),
),
);
}
Widget _buildDesktop() {
String subtitle = '';
if (credit.date.isNotEmpty) {
subtitle = formatDate(credit.date, context);
}
if (hasDocuments) {
subtitle += ' 📎';
}
return InkWell(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
onLongPress: onLongPress,
child: Padding(
padding: const EdgeInsets.only(
left: 12,
right: 28,
top: 4,
bottom: 4,
),
child: Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(right: 15),
child: showCheckbox
? IgnorePointer(
ignoring: listUIState.isInMultiselect(),
child: Checkbox(
value: isChecked,
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
onChanged: (value) => onCheckboxChanged(value),
activeColor: Theme.of(context).accentColor,
),
)
: ActionMenuButton(
entityActions: credit.getActions(
userCompany: state.userCompany,
includeEdit: true,
client: client),
isSaving: false,
entity: credit,
onSelected: (context, action) =>
handleEntityAction(context, credit, action),
)),
ConstrainedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
credit.number ?? localization.pending,
style: textStyle,
overflow: TextOverflow.ellipsis,
),
if (!credit.isActive) EntityStateLabel(credit)
],
),
constraints: BoxConstraints(
minWidth: 80,
),
),
SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(client.displayName, style: textStyle),
Text(
filterMatch ?? subtitle,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.subtitle2,
),
],
),
),
SizedBox(width: 10),
Text(
formatNumber(credit.amount, context, clientId: client.id),
style: textStyle,
textAlign: TextAlign.end,
),
SizedBox(width: 25),
credit.isSent
? DecoratedBox(
decoration: BoxDecoration(
color: statusColor,
borderRadius: BorderRadius.all(Radius.circular(5)),
),
child: ConstrainedBox(
constraints: BoxConstraints(
minWidth: 80,
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Text(
statusLabel.toUpperCase(),
style: TextStyle(fontSize: 14),
textAlign: TextAlign.center,
),
),
),
)
: SizedBox(
child: Text(
localization.draft.toUpperCase(),
style: TextStyle(fontSize: 14),
textAlign: TextAlign.center,
),
width: 80,
),
],
),
),
);
}
return DismissibleEntity(
isSelected: credit.id ==
(uiState.isEditing
? creditUIState.editing.id
: creditUIState.selectedId),
userCompany: state.userCompany,
entity: credit,
onEntityAction: onEntityAction,
child: state.prefState.isMobile ? _buildMobile() : _buildDesktop(),
);
}
}

144
lib/ui/payment/payment_list_item.dart
View File

@ -1,6 +1,8 @@
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:flutter/foundation.dart';
@ -40,9 +42,8 @@ class PaymentListItem extends StatelessWidget {
final listUIState = paymentUIState.listUIState;
final isInMultiselect = listUIState.isInMultiselect();
final showCheckbox = onCheckboxChanged != null || isInMultiselect;
final textStyle = TextStyle(fontSize: 17);
final client = state.clientState.map[payment.clientId];
final localization = AppLocalization.of(context);
final filterMatch = filter != null && filter.isNotEmpty
? payment.matchesFilterValue(filter)
@ -50,15 +51,11 @@ class PaymentListItem extends StatelessWidget {
final subtitle = filterMatch ??
(payment.number ?? '') + ' • ' + formatDate(payment.date, context);
return DismissibleEntity(
isSelected: payment.id ==
(uiState.isEditing
? paymentUIState.editing.id
: paymentUIState.selectedId),
userCompany: state.userCompany,
entity: payment,
onEntityAction: onEntityAction,
child: ListTile(
final statusLabel = localization.lookup(kPaymentStatuses[payment.statusId]);
final statusColor = PaymentStatusColors.colors[payment.statusId];
Widget _buildMobile() {
return ListTile(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
@ -112,7 +109,130 @@ class PaymentListItem extends StatelessWidget {
EntityStateLabel(payment),
],
),
),
);
}
Widget _buildDesktop() {
String subtitle = '';
if (payment.date.isNotEmpty) {
subtitle = formatDate(payment.date, context);
}
if (payment.transactionReference.isNotEmpty) {
if (subtitle.isNotEmpty) {
subtitle += ' • ';
}
subtitle += payment.transactionReference;
}
return InkWell(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
onLongPress: onLongPress,
child: Padding(
padding: const EdgeInsets.only(
left: 12,
right: 28,
top: 4,
bottom: 4,
),
child: Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(right: 15),
child: showCheckbox
? IgnorePointer(
ignoring: listUIState.isInMultiselect(),
child: Checkbox(
value: isChecked,
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
onChanged: (value) => onCheckboxChanged(value),
activeColor: Theme.of(context).accentColor,
),
)
: ActionMenuButton(
entityActions: payment.getActions(
userCompany: state.userCompany,
includeEdit: true,
client: client),
isSaving: false,
entity: payment,
onSelected: (context, action) =>
handleEntityAction(context, payment, action),
)),
ConstrainedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
payment.number,
style: textStyle,
overflow: TextOverflow.ellipsis,
),
if (!payment.isActive) EntityStateLabel(payment)
],
),
constraints: BoxConstraints(
minWidth: 80,
),
),
SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(client.displayName, style: textStyle),
Text(
filterMatch ?? subtitle,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.subtitle2,
),
],
),
),
SizedBox(width: 10),
Text(
formatNumber(payment.amount, context, clientId: client.id),
style: textStyle,
textAlign: TextAlign.end,
),
SizedBox(width: 25),
DecoratedBox(
decoration: BoxDecoration(
color: statusColor,
borderRadius: BorderRadius.all(Radius.circular(5)),
),
child: ConstrainedBox(
constraints: BoxConstraints(
minWidth: 80,
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Text(
statusLabel.toUpperCase(),
style: TextStyle(fontSize: 14),
textAlign: TextAlign.center,
),
),
),
)
],
),
),
);
}
return DismissibleEntity(
isSelected: payment.id ==
(uiState.isEditing
? paymentUIState.editing.id
: paymentUIState.selectedId),
userCompany: state.userCompany,
entity: payment,
onEntityAction: onEntityAction,
child: state.prefState.isMobile ? _buildMobile() : _buildDesktop(),
);
}
}

158
lib/ui/quote/quote_list_item.dart
View File

@ -1,6 +1,8 @@
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:flutter/foundation.dart';
@ -42,22 +44,21 @@ class QuoteListItem extends StatelessWidget {
final listUIState = state.getUIState(quote.entityType).listUIState;
final isInMultiselect = listUIState.isInMultiselect();
final showCheckbox = onCheckboxChanged != null || isInMultiselect;
final textStyle = TextStyle(fontSize: 17);
final localization = AppLocalization.of(context);
final filterMatch = filter != null && filter.isNotEmpty
? (quote.matchesFilterValue(filter) ??
client.matchesFilterValue(filter))
: null;
return DismissibleEntity(
isSelected: quote.id ==
(uiState.isEditing
? quoteUIState.editing.id
: quoteUIState.selectedId),
userCompany: state.userCompany,
entity: quote,
onEntityAction: onEntityAction,
child: ListTile(
final statusLabel = quote.isPastDue
? localization.expired
: localization.lookup(kQuoteStatuses[quote.statusId]);
final statusColor = QuoteStatusColors
.colors[quote.isPastDue ? kInvoiceStatusPastDue : quote.statusId];
Widget _buildMobile() {
return ListTile(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
@ -127,7 +128,142 @@ class QuoteListItem extends StatelessWidget {
EntityStateLabel(quote),
],
),
),
);
}
Widget _buildDesktop() {
String subtitle = '';
if (quote.date.isNotEmpty) {
subtitle = formatDate(quote.date, context);
}
if (quote.dueDate.isNotEmpty) {
if (subtitle.isNotEmpty) {
subtitle += ' • ';
}
subtitle += formatDate(quote.dueDate, context);
}
if (hasDocuments) {
subtitle += ' 📎';
}
return InkWell(
onTap: isInMultiselect
? () => onEntityAction(EntityAction.toggleMultiselect)
: onTap,
onLongPress: onLongPress,
child: Padding(
padding: const EdgeInsets.only(
left: 12,
right: 28,
top: 4,
bottom: 4,
),
child: Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(right: 15),
child: showCheckbox
? IgnorePointer(
ignoring: listUIState.isInMultiselect(),
child: Checkbox(
value: isChecked,
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
onChanged: (value) => onCheckboxChanged(value),
activeColor: Theme.of(context).accentColor,
),
)
: ActionMenuButton(
entityActions: quote.getActions(
userCompany: state.userCompany,
includeEdit: true,
client: client),
isSaving: false,
entity: quote,
onSelected: (context, action) =>
handleEntityAction(context, quote, action),
)),
ConstrainedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
quote.number ?? localization.pending,
style: textStyle,
overflow: TextOverflow.ellipsis,
),
if (!quote.isActive) EntityStateLabel(quote)
],
),
constraints: BoxConstraints(
minWidth: 80,
),
),
SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(client.displayName, style: textStyle),
Text(
filterMatch ?? subtitle,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.subtitle2,
),
],
),
),
SizedBox(width: 10),
Text(
formatNumber(quote.balance, context, clientId: client.id),
style: textStyle,
textAlign: TextAlign.end,
),
SizedBox(width: 25),
quote.isSent
? DecoratedBox(
decoration: BoxDecoration(
color: statusColor,
borderRadius: BorderRadius.all(Radius.circular(5)),
),
child: ConstrainedBox(
constraints: BoxConstraints(
minWidth: 80,
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Text(
statusLabel.toUpperCase(),
style: TextStyle(fontSize: 14),
textAlign: TextAlign.center,
),
),
),
)
: SizedBox(
child: Text(
localization.draft.toUpperCase(),
style: TextStyle(fontSize: 14),
textAlign: TextAlign.center,
),
width: 80,
),
],
),
),
);
}
return DismissibleEntity(
isSelected: quote.id ==
(uiState.isEditing
? quoteUIState.editing.id
: quoteUIState.selectedId),
userCompany: state.userCompany,
entity: quote,
onEntityAction: onEntityAction,
child: state.prefState.isMobile ? _buildMobile() : _buildDesktop(),
);
}
}