Skip to content

fix(ui): dynamic background and text colors in AuthScreenWrapper #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruvi-16-me wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(ui): dynamic background and text colors in AuthScreenWrapper #210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef7894
fix(ui): dynamic background and text colors in AuthScreenWrapper
dhruvi-16-me Mar 6, 2026
8786319
Merge branch 'main' into auth-screen-theme-fix
dhruvi-16-me Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions lib/widgets/custom_widgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,36 @@ class CustomTextField extends StatelessWidget {

@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
final String effectiveHintText = hintText;
final IconData? effectivePrefixIcon = icon ?? prefixIcon;
final bool effectiveObscureText = isPassword ?? obscureText;

return TextFormField(
controller: controller,
obscureText: effectiveObscureText,
keyboardType: keyboardType,
validator: validator,
onChanged: onChanged,
enabled: enabled,
style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
style: TextStyle(color: colorScheme.onSurface),
decoration: InputDecoration(
hintText: effectiveHintText,
labelText: label,
labelStyle: TextStyle(color: Theme.of(context).colorScheme.onSurfaceVariant),
hintStyle: TextStyle(color: Theme.of(context).colorScheme.onSurfaceVariant),
labelStyle: TextStyle(color: colorScheme.onSurfaceVariant),
hintStyle: TextStyle(color: colorScheme.onSurfaceVariant),
prefixIcon: effectivePrefixIcon != null
? Icon(effectivePrefixIcon, color: Theme.of(context).colorScheme.onSurfaceVariant)
? Icon(effectivePrefixIcon, color: colorScheme.onSurfaceVariant)
: null,
filled: true,
fillColor: Theme.of(context).colorScheme.surfaceContainerHigh,
fillColor: colorScheme.surfaceContainerHighest,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
borderSide: BorderSide(color: colorScheme.outline),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
Expand Down Expand Up @@ -146,8 +147,9 @@ class AuthScreenWrapper extends StatelessWidget {

@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Scaffold(
backgroundColor: const Color(0xFF1A1A1A),
backgroundColor: theme.scaffoldBackgroundColor,
body: SafeArea(
child: SingleChildScrollView(
padding: const EdgeInsets.all(24),
Expand All @@ -157,16 +159,23 @@ class AuthScreenWrapper extends StatelessWidget {
const SizedBox(height: 40),
Text(
title,
style: const TextStyle(
fontSize: 32,
style: theme.textTheme.displayLarge?.copyWith(
fontWeight: FontWeight.bold,
color: Colors.white,
),
color: theme.textTheme.displayLarge?.color ??
theme.colorScheme.onSurface,
) ??
TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
color: theme.colorScheme.onSurface,
),
),
const SizedBox(height: 8),
Text(
subtitle,
style: TextStyle(fontSize: 16, color: Colors.grey.shade400),
style: TextStyle(
fontSize: 16,
color: theme.colorScheme.onSurfaceVariant),
),
const SizedBox(height: 30),
...children,
Expand Down