Skip to content

Commit

Permalink
Make default background color grey to make buttons/inputs/containers …
Browse files Browse the repository at this point in the history
…standout
  • Loading branch information
JElgar committed Oct 29, 2024
1 parent d2117c0 commit f9359c5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
4 changes: 3 additions & 1 deletion lib/themes.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:nowu/assets/constants.dart';
import 'package:nowu/ui/common/app_colors.dart';

// TODO This apply doesn't seem to work
final baseTextTheme =
Expand Down Expand Up @@ -117,6 +118,7 @@ final regularColorScheme = ColorScheme(
);

final regularTheme = ThemeData(
scaffoldBackgroundColor: greyLight1,
primaryColor: CustomColors.brandColor,
fontFamily: fontFamily,
colorScheme: regularColorScheme,
Expand Down Expand Up @@ -146,7 +148,7 @@ final regularTheme = ThemeData(
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: const Color.fromRGBO(221, 221, 221, 0.2),
fillColor: Colors.white,
contentPadding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15),
border: const OutlineInputBorder(),
focusedBorder: UnderlineInputBorder(
Expand Down
18 changes: 10 additions & 8 deletions lib/ui/views/login/components/social_media_buttons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SocialMediaLoginButtons extends StatelessWidget {

@override
Widget build(BuildContext context) => Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisSize: MainAxisSize.max,
children: [
!kIsWeb && Platform.isIOS
? _SocialMediaLoginButton(
Expand All @@ -27,6 +27,7 @@ class SocialMediaLoginButtons extends StatelessWidget {
_loginBloc.onLoginWithOAuth(AuthProvider.Facebook),
iconData: FontAwesomeIcons.facebookF,
),
const SizedBox(width: 10),
_SocialMediaLoginButton(
onPressed: () => _loginBloc.onLoginWithOAuth(AuthProvider.Google),
iconData: FontAwesomeIcons.google,
Expand All @@ -47,13 +48,14 @@ class _SocialMediaLoginButton extends StatelessWidget {

@override
Widget build(BuildContext context) {
return TextButton(
onPressed: onPressed,
child: Icon(iconData, color: Colors.orange),
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all(Colors.white),
padding: const WidgetStatePropertyAll(
EdgeInsets.symmetric(vertical: 15, horizontal: 60),
return Expanded(
child: FilledButton(
onPressed: onPressed,
child: Icon(iconData, color: Colors.orange, size: 32),
style: ButtonStyle(
padding:
WidgetStateProperty.all(const EdgeInsets.symmetric(vertical: 20)),
backgroundColor: WidgetStateProperty.all(Colors.white),
),
),
);
Expand Down

0 comments on commit f9359c5

Please sign in to comment.