GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-02-02 16:14:21 +01:00
Code Issues Projects Releases Wiki Activity

chore: Adjust onboarding design

Browse Source
This commit is contained in:
Christian Pauly 2022-08-06 13:35:59 +02:00
parent 20596a2c5d
commit 028dc83ed9
4 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/config/themes.dart
View File

@ -61,6 +61,12 @@ abstract class FluffyThemes {
surfaceTintColor: Colors.white, surfaceTintColor: Colors.white,
shadowColor: Colors.black.withAlpha(64), 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( static ThemeData dark([ColorScheme? colorScheme]) => ThemeData(
@ -94,6 +100,12 @@ abstract class FluffyThemes {
surfaceTintColor: Colors.black, surfaceTintColor: Colors.black,
shadowColor: Colors.black.withAlpha(64), 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) => static Color blackWhiteColor(BuildContext context) =>

18
lib/pages/connect/connect_page_view.dart
View File

@ -93,6 +93,7 @@ class ConnectPageView extends StatelessWidget {
prefixIcon: const Icon(Icons.account_box_outlined), prefixIcon: const Icon(Icons.account_box_outlined),
hintText: L10n.of(context)!.chooseAUsername, hintText: L10n.of(context)!.chooseAUsername,
errorText: controller.signupError, errorText: controller.signupError,
errorStyle: const TextStyle(color: Colors.orange),
fillColor: Theme.of(context) fillColor: Theme.of(context)
.colorScheme .colorScheme
.background .background
@ -114,15 +115,26 @@ class ConnectPageView extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
const Expanded(child: Divider(color: Colors.white)), const Expanded(
child: Divider(
color: Colors.white,
thickness: 1,
)),
Padding( Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
L10n.of(context)!.or, 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,
)),
], ],
), ),
], ],

19
lib/pages/login/login_view.dart
View File

@ -48,6 +48,7 @@ class LoginView extends StatelessWidget {
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: const Icon(Icons.account_box_outlined), prefixIcon: const Icon(Icons.account_box_outlined),
errorText: controller.usernameError, errorText: controller.usernameError,
errorStyle: const TextStyle(color: Colors.orange),
hintText: L10n.of(context)!.emailOrUsername, hintText: L10n.of(context)!.emailOrUsername,
fillColor: Theme.of(context) fillColor: Theme.of(context)
.colorScheme .colorScheme
@ -70,6 +71,7 @@ class LoginView extends StatelessWidget {
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: const Icon(Icons.lock_outlined), prefixIcon: const Icon(Icons.lock_outlined),
errorText: controller.passwordError, errorText: controller.passwordError,
errorStyle: const TextStyle(color: Colors.orange),
suffixIcon: IconButton( suffixIcon: IconButton(
tooltip: L10n.of(context)!.showPassword, tooltip: L10n.of(context)!.showPassword,
icon: Icon( icon: Icon(
@ -104,15 +106,26 @@ class LoginView extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
const Expanded(child: Divider(color: Colors.white)), const Expanded(
child: Divider(
color: Colors.white,
thickness: 1,
)),
Padding( Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
L10n.of(context)!.or, 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( Padding(

4
lib/widgets/layouts/login_scaffold.dart
View File

@ -32,9 +32,7 @@ class LoginScaffold extends StatelessWidget {
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.cover, fit: BoxFit.cover,
image: AssetImage( image: AssetImage('assets/login_wallpaper.png'),
'assets/login_wallpaper.png',
),
), ),
), ),
alignment: Alignment.center, alignment: Alignment.center,