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

Clean up warnings

This commit is contained in:
Hillel Coren 2020-03-23 18:15:28 +02:00
parent d28683d249
commit abcc6c490a
49 changed files with 59 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,13 +372,13 @@ class _EntityListTile extends StatelessWidget {
children: <Widget>[
Expanded(
child: Text(entity.listDisplayName,
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
),
entity.listDisplayAmount != null
? Text(
formatNumber(entity.listDisplayAmount, context,
formatNumberType: entity.listDisplayAmountType),
style: Theme.of(context).textTheme.title)
style: Theme.of(context).textTheme.headline6)
: Container(),
],
),

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

@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
class DatePicker extends StatefulWidget {
const DatePicker({

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

@ -53,7 +53,7 @@ class _DateRangePickerState extends State<DateRangePicker> {
shrinkWrap: true,
children: <Widget>[
Text(localization.dateRange,
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
SizedBox(height: 16.0),
Row(
children: <Widget>[

4
lib/ui/app/forms/help_link.dart
View File

@ -16,9 +16,9 @@ class HelpLink extends StatelessWidget {
Widget build(BuildContext context) {
final localization = AppLocalization.of(context);
final ThemeData themeData = Theme.of(context);
final TextStyle aboutTextStyle = themeData.textTheme.body1;
final TextStyle aboutTextStyle = themeData.textTheme.bodyText2;
final TextStyle linkStyle =
themeData.textTheme.body1.copyWith(color: themeData.accentColor);
themeData.textTheme.bodyText2.copyWith(color: themeData.accentColor);
return Padding(
padding: const EdgeInsets.only(top: 20, bottom: 30),

1
lib/ui/app/forms/notification_settings.dart
View File

@ -5,7 +5,6 @@ import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/data/models/user_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/icon_text.dart';

1
lib/ui/app/history_drawer_vm.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter_redux/flutter_redux.dart';
import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/ui/app/history_drawer.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
class HistoryDrawerBuilder extends StatelessWidget {

18
lib/ui/app/menu_drawer.dart
View File

@ -1,5 +1,4 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@ -10,7 +9,6 @@ import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
import 'package:invoiceninja_flutter/ui/app/resources/cached_image.dart';
import 'package:invoiceninja_flutter/ui/system/update_dialog.dart';
import 'package:invoiceninja_flutter/utils/dialogs.dart';
@ -30,7 +28,6 @@ import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:url_launcher/url_launcher.dart';
// STARTER: import - do not remove comment
import 'package:invoiceninja_flutter/redux/design/design_actions.dart';
import 'package:package_info/package_info.dart';
class MenuDrawer extends StatelessWidget {
@ -77,7 +74,7 @@ class MenuDrawer extends StatelessWidget {
company.displayName.isEmpty
? localization.untitledCompany
: company.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
overflow: TextOverflow.ellipsis,
),
],
@ -132,8 +129,7 @@ class MenuDrawer extends StatelessWidget {
items: [
...state.companies
.map((CompanyEntity company) => DropdownMenuItem<String>(
value:
(state.companies.indexOf(company)).toString(),
value: (state.companies.indexOf(company)).toString(),
child: _companyListItem(company),
))
.toList(),
@ -354,7 +350,7 @@ class DrawerTile extends StatefulWidget {
}
class _DrawerTileState extends State<DrawerTile> {
bool _isHovered = false;
//bool _isHovered = false;
@override
Widget build(BuildContext context) {
@ -443,8 +439,8 @@ class _DrawerTileState extends State<DrawerTile> {
}
return MouseRegion(
onEnter: (event) => setState(() => _isHovered = true),
onExit: (event) => setState(() => _isHovered = false),
//onEnter: (event) => setState(() => _isHovered = true),
//onExit: (event) => setState(() => _isHovered = false),
child: child,
);
}
@ -636,9 +632,9 @@ void _showAbout(BuildContext context) async {
final packageInfo = await PackageInfo.fromPlatform();
final localization = AppLocalization.of(context);
final ThemeData themeData = Theme.of(context);
final TextStyle aboutTextStyle = themeData.textTheme.body1;
final TextStyle aboutTextStyle = themeData.textTheme.bodyText2;
final TextStyle linkStyle =
themeData.textTheme.body1.copyWith(color: themeData.accentColor);
themeData.textTheme.bodyText2.copyWith(color: themeData.accentColor);
showAboutDialog(
context: context,

1
lib/ui/app/menu_drawer_vm.dart
View File

@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/ui/app/menu_drawer.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
class MenuDrawerBuilder extends StatelessWidget {

1
lib/ui/app/tables/entity_datatable.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';

1
lib/ui/app/upgrade_dialog.dart
View File

@ -14,7 +14,6 @@ import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:url_launcher/url_launcher.dart';
class UpgradeDialog extends StatefulWidget {

7
lib/ui/auth/login_view.dart
View File

@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/ui/app/link_text.dart';
import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
import 'package:invoiceninja_flutter/ui/auth/login_vm.dart';
import 'package:invoiceninja_flutter/utils/colors.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
@ -61,8 +60,6 @@ class _LoginState extends State<LoginView> {
@override
void didChangeDependencies() {
final state = widget.viewModel.authState;
_controllers = [
_firstNameController,
_lastNameController,
@ -270,8 +267,8 @@ class _LoginState extends State<LoginView> {
_oneTimePasswordController.text.isNotEmpty;
final ThemeData themeData = Theme.of(context);
final TextStyle aboutTextStyle = themeData.textTheme.body1;
final TextStyle linkStyle = themeData.textTheme.body1
final TextStyle aboutTextStyle = themeData.textTheme.bodyText2;
final TextStyle linkStyle = themeData.textTheme.bodyText2
.copyWith(color: convertHexStringToColor(kDefaultAccentColor));
//final showHostedOptions = viewModel.authState.isHosted || !kIsWeb;
final showHostedOptions = !kReleaseMode;

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

@ -78,11 +78,11 @@ class ClientListItem extends StatelessWidget {
Expanded(
child: Text(
client.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(client.balance, context, clientId: client.id),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/company_gateway/company_gateway_list_item.dart
View File

@ -83,11 +83,11 @@ class CompanyGatewayListItem extends StatelessWidget {
Expanded(
child: Text(
companyGateway.gateway.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(companyGateway.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

2
lib/ui/company_gateway/edit/company_gateway_edit.dart
View File

@ -163,7 +163,7 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
const EdgeInsets.only(left: 16, top: 16, bottom: 16),
child: Text(
localization.acceptedCardLogos,
style: Theme.of(context).textTheme.headline,
style: Theme.of(context).textTheme.headline5,
),
),
CardListTile(

5
lib/ui/company_gateway/view/company_gateway_view.dart
View File

@ -1,14 +1,9 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart';
import 'package:invoiceninja_flutter/ui/app/entity_header.dart';
import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart';
import 'package:invoiceninja_flutter/ui/company_gateway/view/company_gateway_view_vm.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/icons.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
class CompanyGatewayView extends StatefulWidget {

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

@ -80,7 +80,7 @@ class CreditListItem extends StatelessWidget {
Expanded(
child: Text(
client.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(
@ -88,7 +88,7 @@ class CreditListItem extends StatelessWidget {
credit.balance > 0 ? credit.balance : credit.amount,
context,
clientId: credit.clientId),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

1
lib/ui/credit/credit_list_vm.dart
View File

@ -14,7 +14,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'
import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart';
import 'package:invoiceninja_flutter/ui/credit/credit_list_item.dart';
import 'package:invoiceninja_flutter/ui/credit/credit_presenter.dart';
import 'package:invoiceninja_flutter/ui/invoice/invoice_list_item.dart';
import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';

10
lib/ui/dashboard/dashboard_chart.dart
View File

@ -95,7 +95,7 @@ class _DashboardChartState extends State<DashboardChart> {
padding: EdgeInsets.all(14.0),
child: Text(
widget.title,
style: theme.textTheme.headline,
style: theme.textTheme.headline5,
),
),
Divider(height: 1.0),
@ -146,14 +146,14 @@ class _DashboardChartState extends State<DashboardChart> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(localization.lookup(dataGroup.name),
style: theme.textTheme.headline.copyWith(
style: theme.textTheme.headline5.copyWith(
color: isSelected ? Colors.white : null,
fontWeight: FontWeight.w400)),
SizedBox(height: 4.0),
Text(
formatNumber(dataGroup.total, context,
currencyId: widget.currencyId),
style: theme.textTheme.headline.copyWith(
style: theme.textTheme.headline5.copyWith(
color: isSelected ? Colors.white : null)),
SizedBox(height: 2.0),
changeString.isNotEmpty
@ -197,13 +197,13 @@ class _DashboardChartState extends State<DashboardChart> {
': ' +
formatNumber(series.average, context,
currencyId: widget.currencyId),
style: theme.textTheme.headline,
style: theme.textTheme.headline5,
),
),
_selected != null
? Text(
_selected,
style: theme.textTheme.headline,
style: theme.textTheme.headline5,
)
: SizedBox(),
],

2
lib/ui/dashboard/dashboard_panels.dart
View File

@ -77,7 +77,7 @@ class DashboardPanels extends StatelessWidget {
uiState.endDate(company), context),
style: Theme.of(context)
.textTheme
.title
.headline6
.copyWith(fontSize: 18),
),
),

4
lib/ui/design/design_list_item.dart
View File

@ -74,11 +74,11 @@ class DesignListItem extends StatelessWidget {
Expanded(
child: Text(
design.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(design.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

7
lib/ui/design/design_presenter.dart
View File

@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
class DesignPresenter extends EntityPresenter {
@ -11,10 +9,11 @@ class DesignPresenter extends EntityPresenter {
@override
Widget getField({String field, BuildContext context}) {
final state = StoreProvider.of<AppState>(context).state;
final design = entity as InvoiceEntity;
//final state = StoreProvider.of<AppState>(context).state;
//final design = entity as InvoiceEntity;
switch (field) {
//
}
return super.getField(field: field, context: context);

1
lib/ui/design/design_screen.dart
View File

@ -32,7 +32,6 @@ class DesignScreen extends StatelessWidget {
Widget build(BuildContext context) {
final store = StoreProvider.of<AppState>(context);
final state = store.state;
final company = state.company;
final userCompany = state.userCompany;
final localization = AppLocalization.of(context);
final listUIState = state.uiState.designUIState.listUIState;

5
lib/ui/design/edit/design_edit_vm.dart
View File

@ -1,4 +1,3 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
@ -7,16 +6,12 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/design/view/design_view_vm.dart';
import 'package:invoiceninja_flutter/redux/design/design_actions.dart';
import 'package:invoiceninja_flutter/data/models/design_model.dart';
import 'package:invoiceninja_flutter/ui/design/edit/design_edit.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
class DesignEditScreen extends StatelessWidget {
const DesignEditScreen({Key key}) : super(key: key);

4
lib/ui/document/document_list_item.dart
View File

@ -77,11 +77,11 @@ class DocumentListItem extends StatelessWidget {
Expanded(
child: Text(
document.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(document.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/expense/expense_list_item.dart
View File

@ -116,13 +116,13 @@ class ExpenseListItem extends StatelessWidget {
? expense.publicNotes
: formatDate(expense.expenseDate, context),
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(
formatNumber(expense.amountWithTax, context,
currencyId: expense.expenseCurrencyId),
style: Theme.of(context).textTheme.title)
style: Theme.of(context).textTheme.headline6)
],
),
),

4
lib/ui/group/group_list_item.dart
View File

@ -73,11 +73,11 @@ class GroupListItem extends StatelessWidget {
Expanded(
child: Text(
group.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(group.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

1
lib/ui/invoice/edit/invoice_edit_desktop.dart
View File

@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart';
import 'package:invoiceninja_flutter/ui/app/forms/client_picker.dart';
import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart';

2
lib/ui/invoice/edit/invoice_edit_details.dart
View File

@ -1,5 +1,3 @@
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/forms/client_picker.dart';
import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart';
import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';

4
lib/ui/invoice/invoice_list_item.dart
View File

@ -80,7 +80,7 @@ class InvoiceListItem extends StatelessWidget {
Expanded(
child: Text(
client.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(
@ -88,7 +88,7 @@ class InvoiceListItem extends StatelessWidget {
invoice.balance > 0 ? invoice.balance : invoice.amount,
context,
clientId: invoice.clientId),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/payment/edit/payment_edit_vm.dart
View File

@ -1,12 +1,8 @@
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_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/client_model.dart';
import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';

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

@ -81,11 +81,11 @@ class PaymentListItem extends StatelessWidget {
Expanded(
child: Text(
client.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(payment.amount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/product/product_list_item.dart
View File

@ -74,11 +74,11 @@ class ProductListItem extends StatelessWidget {
Expanded(
child: Text(
product.productKey,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(product.price, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/project/project_list_item.dart
View File

@ -78,11 +78,11 @@ class ProjectListItem extends StatelessWidget {
Expanded(
child: Text(
project.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(project.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

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

@ -80,14 +80,14 @@ class QuoteListItem extends StatelessWidget {
Expanded(
child: Text(
client.displayName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(
formatNumber(
quote.balance > 0 ? quote.balance : quote.amount, context,
clientId: quote.clientId),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

1
lib/ui/quote/quote_list_vm.dart
View File

@ -12,7 +12,6 @@ import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart';
import 'package:invoiceninja_flutter/ui/invoice/invoice_list_item.dart';
import 'package:invoiceninja_flutter/ui/quote/quote_list_item.dart';
import 'package:invoiceninja_flutter/ui/quote/quote_presenter.dart';
import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart';

1
lib/ui/reports/aging_report.dart
View File

@ -6,7 +6,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
import 'package:invoiceninja_flutter/redux/static/static_state.dart';
import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:memoize/memoize.dart';
enum AgingReportFields {

1
lib/ui/reports/quote_report.dart
View File

@ -1,7 +1,6 @@
import 'package:built_collection/built_collection.dart';
import 'package:invoiceninja_flutter/utils/enums.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/quote_model.dart';
import 'package:invoiceninja_flutter/data/models/company_model.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';

2
lib/ui/reports/tax_rate_report.dart
View File

@ -73,7 +73,7 @@ ReportResult taxRateReport(
final invoice = invoiceMap[invoiceId];
final client = clientMap[invoice.clientId];
final invoiceTaxAmount = invoice.calculateTaxes(invoice.usesInclusiveTaxes);
//final invoiceTaxAmount = invoice.calculateTaxes(invoice.usesInclusiveTaxes);
final invoicePaidAmount = invoice.amount - invoice.balance;
final taxes = invoice.getTaxes();

5
lib/ui/settings/account_management_vm.dart
View File

@ -8,17 +8,12 @@ import 'package:invoiceninja_flutter/data/models/company_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart';
import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
import 'package:invoiceninja_flutter/redux/company/company_selectors.dart';
import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
import 'package:invoiceninja_flutter/ui/settings/account_management.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:local_auth/error_codes.dart';
import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
class AccountManagementScreen extends StatelessWidget {
const AccountManagementScreen({Key key}) : super(key: key);

1
lib/ui/settings/device_settings_list_vm.dart
View File

@ -15,7 +15,6 @@ import 'package:invoiceninja_flutter/ui/settings/device_settings_list.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/dialogs.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:local_auth/local_auth.dart';
import 'package:redux/redux.dart';

1
lib/ui/settings/generated_numbers.dart
View File

@ -13,7 +13,6 @@ import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart';
class GeneratedNumbers extends StatefulWidget {
const GeneratedNumbers({

1
lib/ui/settings/invoice_design.dart
View File

@ -8,7 +8,6 @@ import 'package:invoiceninja_flutter/data/models/design_model.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/design/design_actions.dart';
import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
import 'package:invoiceninja_flutter/redux/static/static_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart';

4
lib/ui/settings/settings_list.dart
View File

@ -69,7 +69,7 @@ class SettingsList extends StatelessWidget {
padding: const EdgeInsets.only(left: 19, top: 16, bottom: 16),
child: Text(
localization.basicSettings,
style: Theme.of(context).textTheme.body1,
style: Theme.of(context).textTheme.bodyText2,
),
),
SettingsListTile(
@ -127,7 +127,7 @@ class SettingsList extends StatelessWidget {
padding: const EdgeInsets.only(left: 19, top: 16, bottom: 16),
child: Text(
localization.advancedSettings,
style: Theme.of(context).textTheme.body1,
style: Theme.of(context).textTheme.bodyText2,
),
),
SettingsListTile(

4
lib/ui/task/task_list_item.dart
View File

@ -97,13 +97,13 @@ class TaskListItem extends StatelessWidget {
: formatDate(convertTimestampToDateString(task.updatedAt),
context),
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
LiveText(() {
return formatNumber(task.listDisplayAmount, context,
formatNumberType: FormatNumberType.duration);
}, style: Theme.of(context).textTheme.title),
}, style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/tax_rate/tax_rate_list_item.dart
View File

@ -74,11 +74,11 @@ class TaxRateListItem extends StatelessWidget {
Expanded(
child: Text(
taxRate.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(taxRate.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/user/user_list_item.dart
View File

@ -72,11 +72,11 @@ class UserListItem extends StatelessWidget {
Expanded(
child: Text(
user.fullName,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(user.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),

4
lib/ui/user/view/user_view.dart
View File

@ -5,16 +5,12 @@ import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart';
import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart';
import 'package:invoiceninja_flutter/redux/quote/quote_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/entity_header.dart';
import 'package:invoiceninja_flutter/ui/app/form_card.dart';
import 'package:invoiceninja_flutter/ui/app/lists/app_list_tile.dart';
import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart';
import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart';
import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/icons.dart';
import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:url_launcher/url_launcher.dart';
class UserView extends StatelessWidget {
const UserView({

1
lib/ui/vendor/edit/vendor_edit_contacts.dart vendored
View File

@ -218,7 +218,6 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
Widget build(BuildContext context) {
final localization = AppLocalization.of(context);
final viewModel = widget.viewModel;
final company = viewModel.company;
return Padding(
padding: EdgeInsets.only(

4
lib/ui/vendor/vendor_list_item.dart vendored
View File

@ -75,11 +75,11 @@ class VendorListItem extends StatelessWidget {
Expanded(
child: Text(
vendor.name,
style: Theme.of(context).textTheme.title,
style: Theme.of(context).textTheme.headline6,
),
),
Text(formatNumber(vendor.listDisplayAmount, context),
style: Theme.of(context).textTheme.title),
style: Theme.of(context).textTheme.headline6),
],
),
),