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

Update buttons types

This commit is contained in:
Hillel Coren 2021-02-09 11:45:10 +02:00
parent c4d059579d
commit 67ef9c152c
41 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redux/credit/credit_actions.dart
View File

@ -442,7 +442,7 @@ Future handleCreditAction(
context: context, context: context,
message: localization.clientEmailNotSet, message: localization.clientEmailNotSet,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
editEntity( editEntity(

2
lib/redux/invoice/invoice_actions.dart
View File

@ -548,7 +548,7 @@ void handleInvoiceAction(BuildContext context, List<BaseEntity> invoices,
context: context, context: context,
message: localization.clientEmailNotSet, message: localization.clientEmailNotSet,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
editEntity( editEntity(

2
lib/redux/quote/quote_actions.dart
View File

@ -466,7 +466,7 @@ Future handleQuoteAction(
context: context, context: context,
message: localization.clientEmailNotSet, message: localization.clientEmailNotSet,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
editEntity( editEntity(

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

@ -484,7 +484,7 @@ class _AppBottomBarState extends State<AppBottomBar> {
if (!state.prefState.isMenuFloated) Spacer(), if (!state.prefState.isMenuFloated) Spacer(),
if (!widget.entityType.isSetting && !isList) if (!widget.entityType.isSetting && !isList)
if (state.prefState.isDesktop) if (state.prefState.isDesktop)
FlatButton( TextButton(
onPressed: _onColumnsPressed, onPressed: _onColumnsPressed,
child: Text( child: Text(
localization.columns, localization.columns,

6
lib/ui/app/buttons/action_flat_button.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
class ActionFlatButton extends StatelessWidget { class ActionTextButton extends StatelessWidget {
const ActionFlatButton({ const ActionTextButton({
this.onPressed, this.onPressed,
this.tooltip, this.tooltip,
this.isSaving = false, this.isSaving = false,
@ -45,7 +45,7 @@ class ActionFlatButton extends StatelessWidget {
); );
} }
return FlatButton( return TextButton(
child: Text( child: Text(
tooltip, tooltip,
style: isHeader && onPressed != null style: isHeader && onPressed != null

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

@ -21,7 +21,7 @@ class EditIconButton extends StatelessWidget {
return Container(); return Container();
} }
return FlatButton( return TextButton(
child: Text( child: Text(
localization.edit, localization.edit,
style: TextStyle(color: store.state.headerTextColor), style: TextStyle(color: store.state.headerTextColor),

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

@ -71,7 +71,7 @@ class _ChangeLayoutBannerState extends State<ChangeLayoutBanner> {
text: message, text: message,
), ),
), ),
FlatButton( TextButton(
child: Text( child: Text(
localization.dismiss, localization.dismiss,
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
@ -80,7 +80,7 @@ class _ChangeLayoutBannerState extends State<ChangeLayoutBanner> {
setState(() => _dismissedChange = true); setState(() => _dismissedChange = true);
}, },
), ),
FlatButton( TextButton(
child: Text( child: Text(
localization.change, localization.change,
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),

6
lib/ui/app/dialogs/alert_dialog.dart
View File

@ -12,7 +12,7 @@ class MessageDialog extends StatelessWidget {
final String message; final String message;
final String dismissLabel; final String dismissLabel;
final List<FlatButton> secondaryActions; final List<TextButton> secondaryActions;
final Function onDismiss; final Function onDismiss;
final Function onDiscard; final Function onDiscard;
@ -42,7 +42,7 @@ class MessageDialog extends StatelessWidget {
if (onDiscard != null) if (onDiscard != null)
Padding( Padding(
padding: const EdgeInsets.only(right: 10), padding: const EdgeInsets.only(right: 10),
child: FlatButton( child: TextButton(
autofocus: true, autofocus: true,
child: Text( child: Text(
localization.discardChanges.toUpperCase()), localization.discardChanges.toUpperCase()),
@ -60,7 +60,7 @@ class MessageDialog extends StatelessWidget {
)) ))
.toList(), .toList(),
), ),
FlatButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
if (onDismiss != null) { if (onDismiss != null) {

6
lib/ui/app/dialogs/error_dialog.dart
View File

@ -29,7 +29,7 @@ class ErrorDialog extends StatelessWidget {
content: error != null ? SelectableText(errorStr.toString()) : SizedBox(), content: error != null ? SelectableText(errorStr.toString()) : SizedBox(),
actions: [ actions: [
if (clearErrorOnDismiss && !Config.DEMO_MODE) if (clearErrorOnDismiss && !Config.DEMO_MODE)
FlatButton( TextButton(
child: Text(localization.logout.toUpperCase()), child: Text(localization.logout.toUpperCase()),
onPressed: () { onPressed: () {
confirmCallback( confirmCallback(
@ -38,12 +38,12 @@ class ErrorDialog extends StatelessWidget {
store.dispatch(UserLogout(context)); store.dispatch(UserLogout(context));
}); });
}), }),
FlatButton( TextButton(
child: Text(localization.copy.toUpperCase()), child: Text(localization.copy.toUpperCase()),
onPressed: () { onPressed: () {
Clipboard.setData(ClipboardData(text: errorStr)); Clipboard.setData(ClipboardData(text: errorStr));
}), }),
FlatButton( TextButton(
child: Text(localization.dismiss.toUpperCase()), child: Text(localization.dismiss.toUpperCase()),
onPressed: () { onPressed: () {
if (clearErrorOnDismiss) { if (clearErrorOnDismiss) {

6
lib/ui/app/dialogs/health_check_dialog.dart
View File

@ -152,15 +152,15 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
actions: _response == null actions: _response == null
? [] ? []
: [ : [
FlatButton( TextButton(
child: Text(localization.clearCache.toUpperCase()), child: Text(localization.clearCache.toUpperCase()),
onPressed: () => clearCache(), onPressed: () => clearCache(),
), ),
FlatButton( TextButton(
child: Text(localization.refresh.toUpperCase()), child: Text(localization.refresh.toUpperCase()),
onPressed: () => runCheck(), onPressed: () => runCheck(),
), ),
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
) )

8
lib/ui/app/dialogs/multiselect_dialog.dart
View File

@ -206,7 +206,7 @@ class MultiSelectListState extends State<MultiSelectList> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
FlatButton( TextButton(
child: Text(localization.reset.toUpperCase()), child: Text(localization.reset.toUpperCase()),
onPressed: () { onPressed: () {
setState( setState(
@ -228,7 +228,7 @@ class MultiSelectListState extends State<MultiSelectList> {
title: Text(localization.editColumns), title: Text(localization.editColumns),
content: column, content: column,
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.reset.toUpperCase()), child: Text(localization.reset.toUpperCase()),
onPressed: () { onPressed: () {
setState(() => selected = widget.defaultSelected.toList()); setState(() => selected = widget.defaultSelected.toList());
@ -236,12 +236,12 @@ class MultiSelectListState extends State<MultiSelectList> {
widget.onSelected(selected); widget.onSelected(selected);
} }
}), }),
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
}), }),
FlatButton( TextButton(
child: Text(localization.save.toUpperCase()), child: Text(localization.save.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);

8
lib/ui/app/document_grid.dart
View File

@ -149,14 +149,14 @@ class DocumentTile extends StatelessWidget {
title: Text(document.name), title: Text(document.name),
actions: [ actions: [
isFromExpense && onViewExpense != null isFromExpense && onViewExpense != null
? FlatButton( ? TextButton(
child: Text(localization.expense.toUpperCase()), child: Text(localization.expense.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
onViewExpense(document); onViewExpense(document);
}, },
) )
: FlatButton( : TextButton(
child: Text(localization.delete.toUpperCase()), child: Text(localization.delete.toUpperCase()),
onPressed: () { onPressed: () {
confirmCallback( confirmCallback(
@ -171,7 +171,7 @@ class DocumentTile extends StatelessWidget {
}); });
}, },
), ),
FlatButton( TextButton(
child: Text(localization.download.toUpperCase()), child: Text(localization.download.toUpperCase()),
onPressed: () async { onPressed: () async {
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
@ -202,7 +202,7 @@ class DocumentTile extends StatelessWidget {
} }
}, },
), ),
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();

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

@ -98,11 +98,11 @@ class _FormColorPickerState extends State<FormColorPicker> {
), ),
), ),
actions: <Widget>[ actions: <Widget>[
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
FlatButton( TextButton(
child: Text(localization.done.toUpperCase()), child: Text(localization.done.toUpperCase()),
onPressed: () { onPressed: () {
_selectColor(_pendingColor); _selectColor(_pendingColor);

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

@ -27,7 +27,7 @@ class LearnMoreUrl extends StatelessWidget {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
FlatButton( TextButton(
child: Text(localization.learnMore), child: Text(localization.learnMore),
onPressed: () async { onPressed: () async {
if (await canLaunch(url)) { if (await canLaunch(url)) {
@ -63,7 +63,7 @@ class LearnMoreDialog extends StatelessWidget {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
FlatButton( TextButton(
child: Text(label ?? localization.learnMore), child: Text(label ?? localization.learnMore),
onPressed: () { onPressed: () {
showDialog<AlertDialog>( showDialog<AlertDialog>(

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

@ -34,7 +34,7 @@ class SaveCancelButtons extends StatelessWidget {
children: <Widget>[ children: <Widget>[
if (onCancelPressed != null && !isSaving) if (onCancelPressed != null && !isSaving)
Builder(builder: (BuildContext context) { Builder(builder: (BuildContext context) {
return FlatButton( return TextButton(
child: Text( child: Text(
cancelLabel ?? localization.cancel, cancelLabel ?? localization.cancel,
style: isHeader && isEnabled style: isHeader && isEnabled
@ -48,7 +48,7 @@ class SaveCancelButtons extends StatelessWidget {
}), }),
SizedBox(width: 10), SizedBox(width: 10),
Builder(builder: (BuildContext context) { Builder(builder: (BuildContext context) {
return ActionFlatButton( return ActionTextButton(
tooltip: saveLabel ?? localization.save, tooltip: saveLabel ?? localization.save,
isVisible: true, isVisible: true,
isSaving: isSaving, isSaving: isSaving,

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

@ -99,7 +99,7 @@ class ListScaffold extends StatelessWidget {
actions: [ actions: [
...appBarActions ?? <Widget>[], ...appBarActions ?? <Widget>[],
if (isDesktop(context) && onCancelSettingsSection != null) if (isDesktop(context) && onCancelSettingsSection != null)
FlatButton( TextButton(
onPressed: () { onPressed: () {
store.dispatch(ViewSettings( store.dispatch(ViewSettings(
navigator: Navigator.of(context), navigator: Navigator.of(context),

10
lib/ui/app/main_screen.dart
View File

@ -849,7 +849,7 @@ class _EntityFilter extends StatelessWidget {
) )
: Row( : Row(
children: [ children: [
SizedBox(width: 4), SizedBox(width: 8),
if (!state.prefState.showFilterSidebar) if (!state.prefState.showFilterSidebar)
IconButton( IconButton(
tooltip: localization.showSidebar, tooltip: localization.showSidebar,
@ -860,10 +860,10 @@ class _EntityFilter extends StatelessWidget {
onPressed: () => store.dispatch( onPressed: () => store.dispatch(
UpdateUserPreferences(showFilterSidebar: true)), UpdateUserPreferences(showFilterSidebar: true)),
), ),
SizedBox(width: 4),
ConstrainedBox( ConstrainedBox(
constraints: BoxConstraints(maxWidth: 220), constraints: BoxConstraints(maxWidth: 220),
child: FlatButton( child: TextButton(
visualDensity: VisualDensity.compact,
child: Text( child: Text(
EntityPresenter() EntityPresenter()
.initialize(filterEntity, context) .initialize(filterEntity, context)
@ -887,9 +887,7 @@ class _EntityFilter extends StatelessWidget {
children: <Widget>[ children: <Widget>[
for (int i = 0; i < relatedTypes.length; i++) for (int i = 0; i < relatedTypes.length; i++)
DecoratedBox( DecoratedBox(
child: FlatButton( child: TextButton(
minWidth: 0,
visualDensity: VisualDensity.compact,
child: Text( child: Text(
localization localization
.lookup('${relatedTypes[i].plural}'), .lookup('${relatedTypes[i].plural}'),

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

@ -582,14 +582,14 @@ class SidebarFooter extends StatelessWidget {
context: context, context: context,
message: localization.cronsNotEnabled, message: localization.cronsNotEnabled,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
child: Text(localization.learnMore.toUpperCase()), child: Text(localization.learnMore.toUpperCase()),
onPressed: () { onPressed: () {
launch(kCronsHelpUrl, launch(kCronsHelpUrl,
forceSafariVC: false, forceWebView: false); forceSafariVC: false, forceWebView: false);
}, },
), ),
FlatButton( TextButton(
child: Text(localization.refreshData.toUpperCase()), child: Text(localization.refreshData.toUpperCase()),
onPressed: () { onPressed: () {
store.dispatch(RefreshData()); store.dispatch(RefreshData());
@ -609,7 +609,7 @@ class SidebarFooter extends StatelessWidget {
context: context, context: context,
message: localization.companyDisabledWarning, message: localization.companyDisabledWarning,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
child: Text(localization.viewSettings.toUpperCase()), child: Text(localization.viewSettings.toUpperCase()),
onPressed: () { onPressed: () {
store.dispatch(ViewSettings( store.dispatch(ViewSettings(
@ -699,7 +699,7 @@ class SidebarFooter extends StatelessWidget {
if (isHosted(context) && if (isHosted(context) &&
!isPaidAccount(context)) ...[ !isPaidAccount(context)) ...[
Spacer(), Spacer(),
FlatButton( TextButton(
child: Text(localization.upgrade), child: Text(localization.upgrade),
color: Colors.green, color: Colors.green,
onPressed: () => showDialog<UpgradeDialog>( onPressed: () => showDialog<UpgradeDialog>(
@ -857,7 +857,7 @@ void _showAbout(BuildContext context) async {
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.viewLicenses.toUpperCase()), child: Text(localization.viewLicenses.toUpperCase()),
onPressed: () => showLicensePage( onPressed: () => showLicensePage(
context: context, context: context,
@ -867,7 +867,7 @@ void _showAbout(BuildContext context) async {
applicationVersion: state.appVersion, applicationVersion: state.appVersion,
), ),
), ),
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
@ -938,7 +938,7 @@ void _showAbout(BuildContext context) async {
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
actions: [ actions: [
FlatButton( TextButton(
child: child:
Text(localization.sourceCode.toUpperCase()), Text(localization.sourceCode.toUpperCase()),
onPressed: () { onPressed: () {
@ -947,7 +947,7 @@ void _showAbout(BuildContext context) async {
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.close child: Text(localization.close
.toUpperCase()), .toUpperCase()),
onPressed: () => onPressed: () =>
@ -990,7 +990,7 @@ void _showAbout(BuildContext context) async {
); );
}, },
), ),
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
@ -1120,12 +1120,12 @@ class _ContactUsDialogState extends State<ContactUsDialog> {
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
), ),
if (!_isSaving) if (!_isSaving)
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
), ),
if (!_isSaving) if (!_isSaving)
FlatButton( TextButton(
child: Text(localization.send.toUpperCase()), child: Text(localization.send.toUpperCase()),
onPressed: () => _sendMessage(), onPressed: () => _sendMessage(),
), ),

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

@ -104,7 +104,7 @@ class AppPaginatedDataTable extends StatefulWidget {
/// The table card's header. /// The table card's header.
/// ///
/// This is typically a [Text] widget, but can also be a [ButtonBar] with /// This is typically a [Text] widget, but can also be a [ButtonBar] with
/// [FlatButton]s. Suitable defaults are automatically provided for the font, /// [TextButton]s. Suitable defaults are automatically provided for the font,
/// button color, button padding, and so forth. /// button color, button padding, and so forth.
/// ///
/// If items in the table are selectable, then, when the selection is not /// If items in the table are selectable, then, when the selection is not

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

@ -154,7 +154,7 @@ class DatatableHeader extends StatelessWidget {
return Row( return Row(
children: <Widget>[ children: <Widget>[
FlatButton( TextButton(
child: Text(localization.refresh), child: Text(localization.refresh),
onPressed: onRefreshPressed, onPressed: onRefreshPressed,
), ),

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

@ -200,11 +200,11 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
FlatButton( TextButton(
child: Text('Terms', style: TextStyle(fontSize: 12)), child: Text('Terms', style: TextStyle(fontSize: 12)),
onPressed: () => launch(kTermsOfServiceURL), onPressed: () => launch(kTermsOfServiceURL),
), ),
FlatButton( TextButton(
child: Text('Privacy', style: TextStyle(fontSize: 12)), child: Text('Privacy', style: TextStyle(fontSize: 12)),
onPressed: () => launch(kPrivacyPolicyURL), onPressed: () => launch(kPrivacyPolicyURL),
), ),

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

@ -209,7 +209,7 @@ class _VariableGrid extends StatelessWidget {
childAspectRatio: 4, childAspectRatio: 4,
children: fields children: fields
.map( .map(
(field) => FlatButton( (field) => TextButton(
child: Align( child: Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(

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

@ -83,7 +83,7 @@ class ViewScaffold extends StatelessWidget {
? [] ? []
: [ : [
if (isSettings && isDesktop(context)) if (isSettings && isDesktop(context))
FlatButton( TextButton(
onPressed: () { onPressed: () {
onBackPressed != null onBackPressed != null
? onBackPressed() ? onBackPressed()

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

@ -188,7 +188,7 @@ class _LoginState extends State<LoginView> {
actions: <Widget>[ actions: <Widget>[
Padding( Padding(
padding: const EdgeInsets.only(right: 8), padding: const EdgeInsets.only(right: 8),
child: FlatButton( child: TextButton(
child: Text(AppLocalization.of(context).close), child: Text(AppLocalization.of(context).close),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
@ -575,7 +575,7 @@ class _LoginState extends State<LoginView> {
children: <Widget>[ children: <Widget>[
if (!_recoverPassword) if (!_recoverPassword)
Icon(MdiIcons.lock, size: 16), Icon(MdiIcons.lock, size: 16),
FlatButton( TextButton(
child: Text(_recoverPassword child: Text(_recoverPassword
? localization.cancel ? localization.cancel
: localization.recoverPassword), : localization.recoverPassword),

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

@ -371,7 +371,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
? AlertDialog( ? AlertDialog(
content: SingleChildScrollView(child: column), content: SingleChildScrollView(child: column),
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.remove.toUpperCase()), child: Text(localization.remove.toUpperCase()),
onPressed: () => confirmCallback( onPressed: () => confirmCallback(
context: context, context: context,
@ -380,7 +380,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
Navigator.pop(context); Navigator.pop(context);
}), }),
), ),
FlatButton( TextButton(
child: Text(localization.done.toUpperCase()), child: Text(localization.done.toUpperCase()),
onPressed: () => _onDoneContactPressed(), onPressed: () => _onDoneContactPressed(),
) )

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

@ -53,7 +53,7 @@ class CompanyGatewayListItem extends StatelessWidget {
onTap: () => selectEntity(entity: companyGateway, context: context), onTap: () => selectEntity(entity: companyGateway, context: context),
trailing: onRemovePressed == null trailing: onRemovePressed == null
? null ? null
: FlatButton( : TextButton(
child: Text(AppLocalization.of(context).remove), child: Text(AppLocalization.of(context).remove),
onPressed: onRemovePressed, onPressed: onRemovePressed,
), ),

2
lib/ui/company_gateway/company_gateway_screen.dart
View File

@ -66,7 +66,7 @@ class CompanyGatewayScreen extends StatelessWidget {
) )
else if (state.uiState.settingsUIState.isFiltered && else if (state.uiState.settingsUIState.isFiltered &&
!state.isSaving) ...[ !state.isSaving) ...[
FlatButton( TextButton(
child: Text(localization.reset, child: Text(localization.reset,
style: TextStyle(color: store.state.headerTextColor)), style: TextStyle(color: store.state.headerTextColor)),
onPressed: () { onPressed: () {

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

@ -187,7 +187,7 @@ class DashboardPanels extends StatelessWidget {
key: ValueKey( key: ValueKey(
'__${settings.includeTaxes}_${settings.currencyId}__'), '__${settings.includeTaxes}_${settings.currencyId}__'),
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
) )

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

@ -234,7 +234,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
return AlertDialog( return AlertDialog(
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.remove.toUpperCase()), child: Text(localization.remove.toUpperCase()),
onPressed: () => confirmCallback( onPressed: () => confirmCallback(
context: context, context: context,
@ -243,7 +243,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
Navigator.of(context).pop(); Navigator.of(context).pop();
}), }),
), ),
FlatButton( TextButton(
child: Text(localization.done.toUpperCase()), child: Text(localization.done.toUpperCase()),
onPressed: () { onPressed: () {
viewModel.clearSelectedInvoiceItem(); viewModel.clearSelectedInvoiceItem();

6
lib/ui/invoice/invoice_pdf.dart
View File

@ -222,7 +222,7 @@ class _InvoicePdfViewState extends State<InvoicePdfView> {
if (isDesktop(context) && if (isDesktop(context) &&
_activityId == null && _activityId == null &&
!invoice.isRecurring) !invoice.isRecurring)
FlatButton( TextButton(
child: Text(localization.email, child: Text(localization.email,
style: TextStyle(color: state.headerTextColor)), style: TextStyle(color: state.headerTextColor)),
onPressed: () { onPressed: () {
@ -230,7 +230,7 @@ class _InvoicePdfViewState extends State<InvoicePdfView> {
EntityAction.emailEntityType(invoice.entityType)); EntityAction.emailEntityType(invoice.entityType));
}, },
), ),
FlatButton( TextButton(
child: Text( child: Text(
localization.download, localization.download,
style: TextStyle(color: state.headerTextColor), style: TextStyle(color: state.headerTextColor),
@ -255,7 +255,7 @@ class _InvoicePdfViewState extends State<InvoicePdfView> {
}, },
), ),
if (isDesktop(context)) if (isDesktop(context))
FlatButton( TextButton(
child: Text(localization.close, child: Text(localization.close,
style: TextStyle(color: state.headerTextColor)), style: TextStyle(color: state.headerTextColor)),
onPressed: () { onPressed: () {

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

@ -305,11 +305,11 @@ class _PaymentEditState extends State<PaymentEdit> {
), ),
) )
else ...[ else ...[
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
FlatButton( TextButton(
child: Text(localization.apply.toUpperCase()), child: Text(localization.apply.toUpperCase()),
onPressed: () => onSavePressed(context), onPressed: () => onSavePressed(context),
), ),

4
lib/ui/payment/refund/payment_refund.dart
View File

@ -212,11 +212,11 @@ class _PaymentRefundState extends State<PaymentRefund> {
), ),
) )
else ...[ else ...[
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
FlatButton( TextButton(
child: Text(localization.refund.toUpperCase()), child: Text(localization.refund.toUpperCase()),
onPressed: () => onSavePressed(context), onPressed: () => onSavePressed(context),
), ),

4
lib/ui/reports/reports_screen.dart
View File

@ -206,7 +206,7 @@ class ReportsScreen extends StatelessWidget {
actions: <Widget>[ actions: <Widget>[
if (isDesktop(context)) ...[ if (isDesktop(context)) ...[
Builder(builder: (BuildContext context) { Builder(builder: (BuildContext context) {
return FlatButton( return TextButton(
child: Text( child: Text(
localization.columns, localization.columns,
style: TextStyle(color: store.state.headerTextColor), style: TextStyle(color: store.state.headerTextColor),
@ -224,7 +224,7 @@ class ReportsScreen extends StatelessWidget {
}, },
); );
}), }),
FlatButton( TextButton(
child: Text( child: Text(
localization.export, localization.export,
style: TextStyle(color: store.state.headerTextColor), style: TextStyle(color: store.state.headerTextColor),

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

@ -268,7 +268,7 @@ class _LocalizationSettingsState extends State<LocalizationSettings>
), ),
), ),
SizedBox(width: 8), SizedBox(width: 8),
FlatButton( TextButton(
child: Text(localization.addCustom), child: Text(localization.addCustom),
onPressed: () { onPressed: () {
fieldCallback( fieldCallback(
@ -280,7 +280,7 @@ class _LocalizationSettingsState extends State<LocalizationSettings>
field: localization.label, field: localization.label,
title: localization.addCustom, title: localization.addCustom,
secondaryActions: [ secondaryActions: [
FlatButton( TextButton(
child: child:
Text(localization.labels.toUpperCase()), Text(localization.labels.toUpperCase()),
onPressed: () => launch(kGitHubLangUrl), onPressed: () => launch(kGitHubLangUrl),

2
lib/ui/settings/settings_wizard.dart
View File

@ -187,7 +187,7 @@ class _SettingsWizardState extends State<SettingsWizard> {
), ),
), ),
actions: [ actions: [
FlatButton( TextButton(
onPressed: _onSavePressed, onPressed: _onSavePressed,
child: Text(localization.save.toUpperCase())) child: Text(localization.save.toUpperCase()))
], ],

8
lib/ui/system/update_dialog.dart
View File

@ -87,27 +87,27 @@ class _UpdateDialogState extends State<UpdateDialog> {
), ),
actions: <Widget>[ actions: <Widget>[
if (updateState == UpdateState.initial) ...[ if (updateState == UpdateState.initial) ...[
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
), ),
if (!account.isUpdateAvailable) if (!account.isUpdateAvailable)
FlatButton( TextButton(
child: Text(localization.viewChanges.toUpperCase()), child: Text(localization.viewChanges.toUpperCase()),
onPressed: () => launch(kGitHubDiffUrl.replaceFirst( onPressed: () => launch(kGitHubDiffUrl.replaceFirst(
'VERSION', account.currentVersion)), 'VERSION', account.currentVersion)),
), ),
if (!account.isDocker) if (!account.isDocker)
FlatButton( TextButton(
child: Text(localization.updateNow.toUpperCase()), child: Text(localization.updateNow.toUpperCase()),
onPressed: () { onPressed: () {
updateApp(context); updateApp(context);
}, },
), ),
] else if (updateState == UpdateState.done) ] else if (updateState == UpdateState.done)
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();

4
lib/ui/task/edit/task_edit_times.dart
View File

@ -181,14 +181,14 @@ class TimeEditDetailsState extends State<TimeEditDetails> {
), ),
), ),
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.remove.toUpperCase()), child: Text(localization.remove.toUpperCase()),
onPressed: () { onPressed: () {
widget.viewModel.onRemoveTaskTimePressed(widget.index); widget.viewModel.onRemoveTaskTimePressed(widget.index);
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
), ),
FlatButton( TextButton(
child: Text(localization.done.toUpperCase()), child: Text(localization.done.toUpperCase()),
onPressed: () { onPressed: () {
widget.viewModel.onDoneTaskTimePressed(); widget.viewModel.onDoneTaskTimePressed();

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

@ -285,7 +285,7 @@ class VendorContactEditDetailsState extends State<VendorContactEditDetails> {
? AlertDialog( ? AlertDialog(
content: SingleChildScrollView(child: column), content: SingleChildScrollView(child: column),
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.remove.toUpperCase()), child: Text(localization.remove.toUpperCase()),
onPressed: () => confirmCallback( onPressed: () => confirmCallback(
context: context, context: context,
@ -294,7 +294,7 @@ class VendorContactEditDetailsState extends State<VendorContactEditDetails> {
Navigator.pop(context); Navigator.pop(context);
}), }),
), ),
FlatButton( TextButton(
child: Text(localization.done.toUpperCase()), child: Text(localization.done.toUpperCase()),
onPressed: () { onPressed: () {
viewModel.onDoneContactPressed(); viewModel.onDoneContactPressed();

12
lib/utils/dialogs.dart
View File

@ -27,7 +27,7 @@ void showErrorDialog({
void showMessageDialog({ void showMessageDialog({
@required BuildContext context, @required BuildContext context,
@required String message, @required String message,
List<FlatButton> secondaryActions, List<TextButton> secondaryActions,
}) { }) {
showDialog<MessageDialog>( showDialog<MessageDialog>(
context: context, context: context,
@ -79,12 +79,12 @@ void confirmCallback({
? null ? null
: Text(content), : Text(content),
actions: <Widget>[ actions: <Widget>[
FlatButton( TextButton(
child: Text(localization.cancel.toUpperCase()), child: Text(localization.cancel.toUpperCase()),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
}), }),
FlatButton( TextButton(
child: Text(localization.ok.toUpperCase()), child: Text(localization.ok.toUpperCase()),
onPressed: () { onPressed: () {
if (typeToConfirm == null || if (typeToConfirm == null ||
@ -192,7 +192,7 @@ void fieldCallback({
String field, String field,
Function(String) callback, Function(String) callback,
int maxLength, int maxLength,
List<FlatButton> secondaryActions, List<TextButton> secondaryActions,
}) { }) {
showDialog<AlertDialog>( showDialog<AlertDialog>(
context: context, context: context,
@ -222,7 +222,7 @@ class FieldConfirmation extends StatefulWidget {
final String title; final String title;
final String field; final String field;
final int maxLength; final int maxLength;
final List<FlatButton> secondaryActions; final List<TextButton> secondaryActions;
@override @override
_FieldConfirmationState createState() => _FieldConfirmationState(); _FieldConfirmationState createState() => _FieldConfirmationState();
@ -335,7 +335,7 @@ void cloneToDialog({
], ],
), ),
actions: [ actions: [
FlatButton( TextButton(
child: Text(localization.close.toUpperCase()), child: Text(localization.close.toUpperCase()),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
) )

5
samples/form_keys.dart
View File

@ -23,7 +23,8 @@ class MyApp extends StatefulWidget {
} }
class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin { class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
static final GlobalKey<FormState> _formKey = GlobalKey<FormState>(debugLabel: '_appState'); static final GlobalKey<FormState> _formKey =
GlobalKey<FormState>(debugLabel: '_appState');
static final GlobalKey<ClientPageState> _clientKey = static final GlobalKey<ClientPageState> _clientKey =
GlobalKey<ClientPageState>(); GlobalKey<ClientPageState>();
@ -273,7 +274,7 @@ class ContactFormState extends State<ContactForm> {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.only(top: 12.0), padding: const EdgeInsets.only(top: 12.0),
child: FlatButton( child: TextButton(
onPressed: () => widget.onRemovePressed(widget.key), onPressed: () => widget.onRemovePressed(widget.key),
child: Text( child: Text(
'Delete', 'Delete',

5
samples/form_redux.dart
View File

@ -119,7 +119,8 @@ class MyApp extends StatefulWidget {
} }
class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin { class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
static final GlobalKey<FormState> _formKey = GlobalKey<FormState>(debugLabel: '_appState'); static final GlobalKey<FormState> _formKey =
GlobalKey<FormState>(debugLabel: '_appState');
TabController _controller; TabController _controller;
@ -327,7 +328,7 @@ class _ContactFormState extends State<ContactForm> {
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.only(top: 12.0), padding: const EdgeInsets.only(top: 12.0),
child: FlatButton( child: TextButton(
onPressed: () => store.dispatch(DeleteContact(widget.index)), onPressed: () => store.dispatch(DeleteContact(widget.index)),
child: Text( child: Text(
'Delete', 'Delete',