From 7f92d218f886c00a288cfeb12adc901f4c79f49b Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 6 Aug 2022 13:35:59 +0200 Subject: [PATCH] chore: Adjust onboarding design --- lib/config/themes.dart | 12 ++++++++++++ lib/pages/connect/connect_page_view.dart | 18 +++++++++++++++--- lib/pages/login/login_view.dart | 19 ++++++++++++++++--- lib/widgets/layouts/login_scaffold.dart | 4 +--- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 8f554dcec..739734b19 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -61,6 +61,12 @@ abstract class FluffyThemes { surfaceTintColor: Colors.white, shadowColor: Colors.black.withAlpha(64), ), + elevatedButtonTheme: ElevatedButtonThemeData( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.all(16), + textStyle: const TextStyle(fontSize: 16), + ), + ), ); static ThemeData dark([ColorScheme? colorScheme]) => ThemeData( @@ -94,6 +100,12 @@ abstract class FluffyThemes { surfaceTintColor: Colors.black, shadowColor: Colors.black.withAlpha(64), ), + elevatedButtonTheme: ElevatedButtonThemeData( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.all(16), + textStyle: const TextStyle(fontSize: 16), + ), + ), ); static Color blackWhiteColor(BuildContext context) => diff --git a/lib/pages/connect/connect_page_view.dart b/lib/pages/connect/connect_page_view.dart index 7385a164f..4de1588b1 100644 --- a/lib/pages/connect/connect_page_view.dart +++ b/lib/pages/connect/connect_page_view.dart @@ -93,6 +93,7 @@ class ConnectPageView extends StatelessWidget { prefixIcon: const Icon(Icons.account_box_outlined), hintText: L10n.of(context)!.chooseAUsername, errorText: controller.signupError, + errorStyle: const TextStyle(color: Colors.orange), fillColor: Theme.of(context) .colorScheme .background @@ -114,15 +115,26 @@ class ConnectPageView extends StatelessWidget { ), Row( children: [ - const Expanded(child: Divider(color: Colors.white)), + const Expanded( + child: Divider( + color: Colors.white, + thickness: 1, + )), Padding( padding: const EdgeInsets.all(12.0), child: Text( L10n.of(context)!.or, - style: const TextStyle(color: Colors.white), + style: const TextStyle( + color: Colors.white, + fontSize: 18, + ), ), ), - const Expanded(child: Divider(color: Colors.white)), + const Expanded( + child: Divider( + color: Colors.white, + thickness: 1, + )), ], ), ], diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index 871a66ce6..0da6b382a 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -48,6 +48,7 @@ class LoginView extends StatelessWidget { decoration: InputDecoration( prefixIcon: const Icon(Icons.account_box_outlined), errorText: controller.usernameError, + errorStyle: const TextStyle(color: Colors.orange), hintText: L10n.of(context)!.emailOrUsername, fillColor: Theme.of(context) .colorScheme @@ -70,6 +71,7 @@ class LoginView extends StatelessWidget { decoration: InputDecoration( prefixIcon: const Icon(Icons.lock_outlined), errorText: controller.passwordError, + errorStyle: const TextStyle(color: Colors.orange), suffixIcon: IconButton( tooltip: L10n.of(context)!.showPassword, icon: Icon( @@ -104,15 +106,26 @@ class LoginView extends StatelessWidget { ), Row( children: [ - const Expanded(child: Divider(color: Colors.white)), + const Expanded( + child: Divider( + color: Colors.white, + thickness: 1, + )), Padding( padding: const EdgeInsets.all(12.0), child: Text( L10n.of(context)!.or, - style: const TextStyle(color: Colors.white), + style: const TextStyle( + color: Colors.white, + fontSize: 18, + ), ), ), - const Expanded(child: Divider(color: Colors.white)), + const Expanded( + child: Divider( + color: Colors.white, + thickness: 1, + )), ], ), Padding( diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart index 90cc5f35b..1183c1e9c 100644 --- a/lib/widgets/layouts/login_scaffold.dart +++ b/lib/widgets/layouts/login_scaffold.dart @@ -32,9 +32,7 @@ class LoginScaffold extends StatelessWidget { decoration: const BoxDecoration( image: DecorationImage( fit: BoxFit.cover, - image: AssetImage( - 'assets/login_wallpaper.png', - ), + image: AssetImage('assets/login_wallpaper.png'), ), ), alignment: Alignment.center,