From f6e45fcc767fb5b4286c5284afce6917ce9da70a Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Sat, 17 Apr 2021 11:26:37 +0200 Subject: [PATCH] Fix password reset route theme --- lib/ui/routes/password_reset_route.dart | 11 +++++++---- lib/ui/widgets/login_routes_theme.dart | 6 ++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/ui/routes/password_reset_route.dart b/lib/ui/routes/password_reset_route.dart index a2e5dba..ad71441 100644 --- a/lib/ui/routes/password_reset_route.dart +++ b/lib/ui/routes/password_reset_route.dart @@ -2,6 +2,7 @@ import 'package:comunic/helpers/account_helper.dart'; import 'package:comunic/models/res_check_password_reset_token.dart'; import 'package:comunic/ui/dialogs/input_new_password_dialog.dart'; import 'package:comunic/ui/widgets/async_screen_widget.dart'; +import 'package:comunic/ui/widgets/login_routes_theme.dart'; import 'package:comunic/ui/widgets/new_password_input_widget.dart'; import 'package:comunic/ui/widgets/safe_state.dart'; import 'package:comunic/utils/intl_utils.dart'; @@ -23,11 +24,13 @@ class PasswordResetRoute extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text(tr("Change your password")), + return LoginRoutesTheme( + child: Scaffold( + appBar: AppBar( + title: Text(tr("Change your password")), + ), + body: _PasswordResetBody(token: token), ), - body: _PasswordResetBody(token: token), ); } } diff --git a/lib/ui/widgets/login_routes_theme.dart b/lib/ui/widgets/login_routes_theme.dart index bcb5ff8..5796e82 100644 --- a/lib/ui/widgets/login_routes_theme.dart +++ b/lib/ui/widgets/login_routes_theme.dart @@ -33,6 +33,12 @@ class LoginRoutesTheme extends StatelessWidget { MaterialStateProperty.all(Config.get().splashBackgroundColor), ), dialogBackgroundColor: Config.get().splashBackgroundColor, + dialogTheme: DialogTheme( + contentTextStyle: TextStyle( + color: Colors.white, + ), + ), + buttonTheme: ButtonThemeData(buttonColor: Colors.white), primaryColor: Colors.white, backgroundColor: Config.get().splashBackgroundColor, disabledColor: Colors.grey,