From 7834bba793eb84a42e2310c05c8550c3f9eb892d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 20 Sep 2022 21:58:06 +0300 Subject: [PATCH] Transactions --- lib/ui/app/buttons/elevated_button.dart | 7 ++++++- lib/ui/transaction/view/transaction_view.dart | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ui/app/buttons/elevated_button.dart b/lib/ui/app/buttons/elevated_button.dart index c0fc1c712..e980f0ac7 100644 --- a/lib/ui/app/buttons/elevated_button.dart +++ b/lib/ui/app/buttons/elevated_button.dart @@ -1,8 +1,10 @@ // Flutter imports: import 'package:flutter/material.dart'; +import 'package:flutter_redux/flutter_redux.dart'; // Project imports: import 'package:invoiceninja_flutter/constants.dart'; +import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/ui/app/icon_text.dart'; class AppButton extends StatelessWidget { @@ -22,9 +24,12 @@ class AppButton extends StatelessWidget { @override Widget build(BuildContext context) { + final store = StoreProvider.of(context); + final state = store.state; + final button = ElevatedButton( style: ElevatedButton.styleFrom( - foregroundColor: color ?? Theme.of(context).colorScheme.secondary, + backgroundColor: color ?? state.accentColor, padding: EdgeInsets.symmetric(vertical: 14, horizontal: 14), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(kBorderRadius)), diff --git a/lib/ui/transaction/view/transaction_view.dart b/lib/ui/transaction/view/transaction_view.dart index 35a466eb3..3673a92fc 100644 --- a/lib/ui/transaction/view/transaction_view.dart +++ b/lib/ui/transaction/view/transaction_view.dart @@ -194,9 +194,8 @@ class __MatchInvoicesState extends State<_MatchInvoices> { Padding( padding: const EdgeInsets.only( left: 20, - bottom: 20, + bottom: 16, right: 20, - top: 4, ), child: AppButton( label: localization.convertToPayment,