From 44e55f0bc4a19d8699f4caea2d69b4a1ee42172b Mon Sep 17 00:00:00 2001 From: M Date: Mon, 26 Oct 2020 11:58:16 +0200 Subject: [PATCH] Changed background and text colors of confirm buttons on disclaimer and restore wallet screens. --- .../screens/disclaimer/disclaimer_page.dart | 21 ++++++++++++------- .../screens/restore/wallet_restore_page.dart | 12 +++++++++-- pubspec.lock | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lib/src/screens/disclaimer/disclaimer_page.dart b/lib/src/screens/disclaimer/disclaimer_page.dart index d7d2cb599..2142b2bd4 100644 --- a/lib/src/screens/disclaimer/disclaimer_page.dart +++ b/lib/src/screens/disclaimer/disclaimer_page.dart @@ -305,14 +305,19 @@ class DisclaimerBodyState extends State { Container( padding: EdgeInsets.only(left: 24.0, right: 24.0, bottom: 24.0), child: PrimaryButton( - onPressed: _checked - ? () => - Navigator.of(context).popAndPushNamed(Routes.welcome) - : null, - text: 'Accept', - color: Colors.green, - textColor: Colors.white, - ), + onPressed: _checked + ? () => + Navigator.of(context).popAndPushNamed(Routes.welcome) + : null, + text: 'Accept', + color: Theme.of(context) + .accentTextTheme + .subtitle + .decorationColor, + textColor: Theme.of(context) + .accentTextTheme + .headline + .decorationColor), ), ], ], diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart index 4f6bc0d66..7db7170bd 100644 --- a/lib/src/screens/restore/wallet_restore_page.dart +++ b/lib/src/screens/restore/wallet_restore_page.dart @@ -103,8 +103,16 @@ class WalletRestorePage extends BasePage { onPressed: () => walletRestoreViewModel.create(options: _credentials()), text: S.of(context).restore_recover, - color: Colors.green, - textColor: Colors.white, + color: Theme + .of(context) + .accentTextTheme + .subtitle + .decorationColor, + textColor: Theme + .of(context) + .accentTextTheme + .headline + .decorationColor, isLoading: walletRestoreViewModel.state is IsExecutingState); }, )) diff --git a/pubspec.lock b/pubspec.lock index ee3933bc8..f4bf8a412 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -645,7 +645,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "1.6.21" + version: "1.6.22" path_provider_linux: dependency: transitive description: