Modificação nos modos, correção de textos cortados
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'app_colors.dart';
|
||||
import 'app_theme_extension.dart';
|
||||
|
||||
/// Application Theme Configuration
|
||||
class AppTheme {
|
||||
@@ -12,11 +13,18 @@ class AppTheme {
|
||||
seedColor: AppColors.primaryTeal,
|
||||
brightness: Brightness.light,
|
||||
primary: AppColors.primaryTeal,
|
||||
onPrimary: Colors.white,
|
||||
secondary: AppColors.primaryOrange,
|
||||
onSecondary: Colors.white,
|
||||
surface: LightColors.surface,
|
||||
onSurface: LightColors.textPrimary,
|
||||
onSurfaceVariant: LightColors.textSecondary,
|
||||
surfaceContainerHighest: LightColors.surfaceVariant,
|
||||
background: LightColors.background,
|
||||
error: AppColors.error,
|
||||
),
|
||||
scaffoldBackgroundColor: LightColors.background,
|
||||
extensions: [AppThemeExtras.light],
|
||||
|
||||
// App Bar Theme
|
||||
appBarTheme: const AppBarTheme(
|
||||
@@ -256,17 +264,22 @@ class AppTheme {
|
||||
return ThemeData(
|
||||
useMaterial3: true,
|
||||
brightness: Brightness.dark,
|
||||
colorScheme: ColorScheme.fromSeed(
|
||||
seedColor: AppColors.primaryTeal,
|
||||
brightness: Brightness.dark,
|
||||
primary: AppColors.primaryTeal,
|
||||
secondary: AppColors.primaryOrange,
|
||||
colorScheme: ColorScheme.dark(
|
||||
primary: DarkBrandColors.primaryTeal,
|
||||
onPrimary: Colors.white,
|
||||
secondary: DarkBrandColors.primaryOrange,
|
||||
onSecondary: Colors.white,
|
||||
surface: DarkColors.surface,
|
||||
onSurface: DarkColors.textPrimary,
|
||||
onSurfaceVariant: DarkColors.textSecondary,
|
||||
surfaceContainerHighest: DarkColors.surfaceVariant,
|
||||
surfaceContainerLow: DarkColors.background,
|
||||
background: DarkColors.background,
|
||||
error: AppColors.error,
|
||||
outline: DarkColors.border,
|
||||
),
|
||||
|
||||
// Dark mode specific overrides would go here
|
||||
scaffoldBackgroundColor: DarkColors.background,
|
||||
extensions: [AppThemeExtras.dark],
|
||||
appBarTheme: const AppBarTheme(
|
||||
backgroundColor: DarkColors.surface,
|
||||
foregroundColor: DarkColors.textPrimary,
|
||||
@@ -294,7 +307,7 @@ class AppTheme {
|
||||
backgroundColor: DarkColors.buttonPrimary,
|
||||
foregroundColor: Colors.white,
|
||||
elevation: 2,
|
||||
shadowColor: AppColors.primaryTeal.withOpacity(0.3),
|
||||
shadowColor: DarkBrandColors.primaryTeal.withOpacity(0.3),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
@@ -306,8 +319,10 @@ class AppTheme {
|
||||
// Outlined Button Theme for Dark Mode
|
||||
outlinedButtonTheme: OutlinedButtonThemeData(
|
||||
style: OutlinedButton.styleFrom(
|
||||
foregroundColor: AppColors.primaryTeal,
|
||||
side: BorderSide(color: AppColors.primaryTeal.withOpacity(0.3)),
|
||||
foregroundColor: DarkBrandColors.primaryTeal,
|
||||
side: BorderSide(
|
||||
color: DarkBrandColors.primaryTeal.withOpacity(0.3),
|
||||
),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
@@ -319,7 +334,7 @@ class AppTheme {
|
||||
// Text Button Theme for Dark Mode
|
||||
textButtonTheme: TextButtonThemeData(
|
||||
style: TextButton.styleFrom(
|
||||
foregroundColor: AppColors.primaryTeal,
|
||||
foregroundColor: DarkBrandColors.primaryTeal,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
textStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
|
||||
@@ -332,15 +347,22 @@ class AppTheme {
|
||||
fillColor: DarkColors.surface,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide(color: AppColors.primaryTeal.withOpacity(0.3)),
|
||||
borderSide: BorderSide(
|
||||
color: DarkBrandColors.primaryTeal.withOpacity(0.3),
|
||||
),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide(color: AppColors.primaryTeal.withOpacity(0.3)),
|
||||
borderSide: BorderSide(
|
||||
color: DarkBrandColors.primaryTeal.withOpacity(0.3),
|
||||
),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: const BorderSide(color: AppColors.primaryTeal, width: 2),
|
||||
borderSide: const BorderSide(
|
||||
color: DarkBrandColors.primaryTeal,
|
||||
width: 2,
|
||||
),
|
||||
),
|
||||
errorBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
@@ -363,9 +385,9 @@ class AppTheme {
|
||||
|
||||
// Text Field Theme for Dark Mode
|
||||
textSelectionTheme: TextSelectionThemeData(
|
||||
cursorColor: AppColors.primaryTeal,
|
||||
selectionColor: AppColors.primaryTeal.withOpacity(0.3),
|
||||
selectionHandleColor: AppColors.primaryTeal,
|
||||
cursorColor: DarkBrandColors.primaryTeal,
|
||||
selectionColor: DarkBrandColors.primaryTeal.withOpacity(0.3),
|
||||
selectionHandleColor: DarkBrandColors.primaryTeal,
|
||||
),
|
||||
|
||||
textTheme: const TextTheme(
|
||||
@@ -449,7 +471,7 @@ class AppTheme {
|
||||
// Bottom Navigation Bar Theme for Dark Mode
|
||||
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
|
||||
backgroundColor: DarkColors.surface,
|
||||
selectedItemColor: AppColors.primaryTeal,
|
||||
selectedItemColor: DarkBrandColors.primaryTeal,
|
||||
unselectedItemColor: DarkColors.iconInactive,
|
||||
type: BottomNavigationBarType.fixed,
|
||||
elevation: 8,
|
||||
@@ -465,7 +487,7 @@ class AppTheme {
|
||||
|
||||
// Floating Action Button Theme for Dark Mode
|
||||
floatingActionButtonTheme: FloatingActionButtonThemeData(
|
||||
backgroundColor: AppColors.primaryTeal,
|
||||
backgroundColor: DarkBrandColors.primaryTeal,
|
||||
foregroundColor: Colors.white,
|
||||
elevation: 4,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
|
||||
@@ -483,7 +505,7 @@ class AppTheme {
|
||||
|
||||
// Progress Indicator Theme for Dark Mode
|
||||
progressIndicatorTheme: const ProgressIndicatorThemeData(
|
||||
color: AppColors.primaryTeal,
|
||||
color: DarkBrandColors.primaryTeal,
|
||||
linearTrackColor: DarkColors.buttonSecondary,
|
||||
circularTrackColor: DarkColors.buttonSecondary,
|
||||
),
|
||||
@@ -491,7 +513,7 @@ class AppTheme {
|
||||
// Chip Theme for Dark Mode
|
||||
chipTheme: ChipThemeData(
|
||||
backgroundColor: DarkColors.buttonSecondary,
|
||||
selectedColor: AppColors.primaryTeal.withOpacity(0.1),
|
||||
selectedColor: DarkBrandColors.primaryTeal.withOpacity(0.1),
|
||||
disabledColor: DarkColors.buttonSecondary.withOpacity(0.5),
|
||||
labelStyle: const TextStyle(color: DarkColors.textPrimary),
|
||||
secondaryLabelStyle: const TextStyle(color: DarkColors.textPrimary),
|
||||
|
||||
Reference in New Issue
Block a user