New themes (#2239)
* Add theme base v2
* Initial new theme base files
* Typos
* Fixes
* Update theme files
* feat: Migrate to Material 3 Theming
Foundation, Theme Data Refactor, and First Extension Cleanup Batch.
This commit completes the first major phase of migrating to Material 3 theming by setting up the foundations for material 3 integration and begins the initial migration, removing custom theme extensions, updating theme data, and refactoring all relevant widget and page theming to use Material 3’s built-in color and typography tokens.
These changes:
- Lays the groundwork for Material 3 theming by restructuring the app’s theme configuration to use Material 3’s ColorScheme and TextTheme as the primary sources of color and typography throughout the app.
- Refactors the core theme config files by removing legacy custom color roles ensuring all color definitions now map directly to Material 3’s role.
- Begins the first batch migration of custom theme extensions (InfoTheme, PlaceholderTheme, KeyboardTheme, PinCodeTheme) and updates all affected widgets and pages to use Material 3 color and typography tokens instead of the custom properties.
- Cleans up the codebase by deleting the files of the initial set of migrated extensions and eliminating all related imports and usages.
* feat: Migrate to Material 3 Theming.
This change:
- Updates the themes README.md file to reflect the current structure and give more information based on the first major phase that was completed.
* feat: Migrate to Material 3 Theming
Deleting previous theme extensions
* feat: Migrate to Material 3 Theming
Another batch of migrations from existing extensions
* feat: Migration to Material 3 Theming
Third Migration batch for theme extensions
* fwat: Migration to Material 3 Theming
Final Migration batch for previous theme extensions
* Update onboarding hero
* Update button radius
* Add surfaceContainer to light theme
* feat(themes): Migrate to Material 3 Theming
This change:
- Adds new set of hero images
- Modifies the core structure for the themes
- Add missing color tokens to the theme classes
- Adds a CustomThemeColor class for custom color tokens
- Modifies the themelist to have a fall back for previous theme implementation
- Adds localization for some texts
- Modifies the flow for loading the theme on app start
- Add a WidgetsBindingObserver that listens for changes in the device theme and updates the app theme when there is a change
- Registers the themeStore as a Singleton for codebase wide use
* feat(themes): Migrate to Material 3 theming
This change:
- Migrates UI flows across the app to the new themes
- Confirms styling and typography of components across the app uses the new themes
- Remove instances of Palette use
- Switch TextStyles across the app to use theme text styles
* feat(themes): Migrate to Material 3 Theming.
This change:
- Adjusts bottomsheets styling and removes duplicate close button
- Removes more themedata extensions from the previous implementation
* - Remove outlines from cards and dock
- Update menu colors
- Update padding/divider size for cards
* - Update PIN screen
- Fix navigation dock shadow
- Update wallet screen colors
* Update border radius --skip-ci
* feat(themes): Migrate to Material 3 Theming.
This change:
- Adds gradient backgrounds to the dashbaord and balance cards.
- Migrates the input fields across the app to BaseTextFormFields.
- Removes dependence of input fields on individual styling, focusing instead on using theme defined InputDecoration styling with adjustments on individual components where needed.
- Applies new theme styling to BaseTextFormField, AddressTextField and CurrencyAmountTextField.
* - Switch some hero images to PNG
- Fix nagivation_dock shadow
- Minor fixes
* feat: Add fallback to previous underline styling in central widgets
This change:
- Adds a fallback to CurrencyAmountTextField, AddressTextField, and BaseTextFormField, allowing them use the previous theme styling.
- Adds localization for new texts
* feat(themes): Update warning box colors for dark and light themes
* feat(themes): Relaod themes when user restores from backup, ensuring the user previous theme preference is used.
* feat(themes): Handle themes logic during restore from backup
This change:
- Refactors theme loading logic to handle backup restore edgecase
- Refreshes the theme based on the user saved preference during restore from backup flow
* Fix card gradients and spacing
* Fix even more radiuses
Test new icons for navigation_dock.dart
* Update onboarding flow backgrounds
Fix swap icon clipping
Fix some text colors
Add more hero images
* Fix incorrect color for light theme
* Fix more hero images and cleanup
* Update text field icons
Fix info box CTA colors
Fix sync indicator colors
* Update toggle colors
Update dark theme colors (minor)
Update crypto_balance_widget.dart icon
* Update page transitions in router.dart
Fix some colors
* feat(themes): Display label by default for filled textfields
* feat(themes): Refactor theme handling across various components
This change:
- Fixes issue with themeMode resetting to system mode when app is restarted causing a UI glitch
- Updates theme checks from `currentTheme.type == ThemeType.dark` to `currentTheme.isDark` for consistency
- Adjusts UI components to use the theme directly from the themeStore
* feat(themes): Add animating tagline to the create pin welcome screen
* Revert text fields label temporarily, fix a couple colors, and cleanup some images
---------
Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
2025-05-25 20:11:45 +00:00
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:cake_wallet/themes/core/material_base_theme.dart';
|
|
|
|
|
|
|
|
class DarkTheme extends MaterialThemeBase {
|
|
|
|
@override
|
|
|
|
Brightness get brightness => Brightness.dark;
|
|
|
|
|
|
|
|
@override
|
|
|
|
ThemeMode get themeMode => ThemeMode.dark;
|
|
|
|
|
|
|
|
@override
|
|
|
|
Color get primaryColor => const Color(0xFF91B0FF);
|
|
|
|
|
|
|
|
@override
|
|
|
|
Color get secondaryColor => const Color(0xFFA1B9FF);
|
|
|
|
|
|
|
|
@override
|
|
|
|
Color get errorColor => const Color(0xFFFFB4AB);
|
|
|
|
|
|
|
|
@override
|
|
|
|
Color get surfaceColor => const Color(0xFF1B284A);
|
|
|
|
|
|
|
|
@override
|
|
|
|
Color get tertiaryColor => const Color(0xFF162028);
|
|
|
|
|
|
|
|
@override
|
|
|
|
ColorScheme get colorScheme => ColorScheme.dark(
|
|
|
|
primary: primaryColor,
|
|
|
|
onPrimary: const Color(0xFF002860),
|
|
|
|
primaryContainer: const Color(0xFF004C9E),
|
|
|
|
onPrimaryContainer: const Color(0xFFFFF3F0),
|
|
|
|
secondary: secondaryColor,
|
|
|
|
onSecondary: const Color(0xFF0C1C58),
|
|
|
|
secondaryContainer: const Color(0xFF1A3C6C),
|
|
|
|
onSecondaryContainer: const Color(0xFFBACBFF),
|
|
|
|
tertiary: tertiaryColor,
|
|
|
|
onTertiary: const Color(0xFF2B373F),
|
|
|
|
tertiaryContainer: const Color(0xFF1F2832),
|
|
|
|
onTertiaryContainer: const Color(0xFFA8B3C6),
|
|
|
|
error: errorColor,
|
2025-05-26 21:35:11 +00:00
|
|
|
onError: const Color(0xFFB71919),
|
|
|
|
errorContainer: const Color(0xFFC53636),
|
New themes (#2239)
* Add theme base v2
* Initial new theme base files
* Typos
* Fixes
* Update theme files
* feat: Migrate to Material 3 Theming
Foundation, Theme Data Refactor, and First Extension Cleanup Batch.
This commit completes the first major phase of migrating to Material 3 theming by setting up the foundations for material 3 integration and begins the initial migration, removing custom theme extensions, updating theme data, and refactoring all relevant widget and page theming to use Material 3’s built-in color and typography tokens.
These changes:
- Lays the groundwork for Material 3 theming by restructuring the app’s theme configuration to use Material 3’s ColorScheme and TextTheme as the primary sources of color and typography throughout the app.
- Refactors the core theme config files by removing legacy custom color roles ensuring all color definitions now map directly to Material 3’s role.
- Begins the first batch migration of custom theme extensions (InfoTheme, PlaceholderTheme, KeyboardTheme, PinCodeTheme) and updates all affected widgets and pages to use Material 3 color and typography tokens instead of the custom properties.
- Cleans up the codebase by deleting the files of the initial set of migrated extensions and eliminating all related imports and usages.
* feat: Migrate to Material 3 Theming.
This change:
- Updates the themes README.md file to reflect the current structure and give more information based on the first major phase that was completed.
* feat: Migrate to Material 3 Theming
Deleting previous theme extensions
* feat: Migrate to Material 3 Theming
Another batch of migrations from existing extensions
* feat: Migration to Material 3 Theming
Third Migration batch for theme extensions
* fwat: Migration to Material 3 Theming
Final Migration batch for previous theme extensions
* Update onboarding hero
* Update button radius
* Add surfaceContainer to light theme
* feat(themes): Migrate to Material 3 Theming
This change:
- Adds new set of hero images
- Modifies the core structure for the themes
- Add missing color tokens to the theme classes
- Adds a CustomThemeColor class for custom color tokens
- Modifies the themelist to have a fall back for previous theme implementation
- Adds localization for some texts
- Modifies the flow for loading the theme on app start
- Add a WidgetsBindingObserver that listens for changes in the device theme and updates the app theme when there is a change
- Registers the themeStore as a Singleton for codebase wide use
* feat(themes): Migrate to Material 3 theming
This change:
- Migrates UI flows across the app to the new themes
- Confirms styling and typography of components across the app uses the new themes
- Remove instances of Palette use
- Switch TextStyles across the app to use theme text styles
* feat(themes): Migrate to Material 3 Theming.
This change:
- Adjusts bottomsheets styling and removes duplicate close button
- Removes more themedata extensions from the previous implementation
* - Remove outlines from cards and dock
- Update menu colors
- Update padding/divider size for cards
* - Update PIN screen
- Fix navigation dock shadow
- Update wallet screen colors
* Update border radius --skip-ci
* feat(themes): Migrate to Material 3 Theming.
This change:
- Adds gradient backgrounds to the dashbaord and balance cards.
- Migrates the input fields across the app to BaseTextFormFields.
- Removes dependence of input fields on individual styling, focusing instead on using theme defined InputDecoration styling with adjustments on individual components where needed.
- Applies new theme styling to BaseTextFormField, AddressTextField and CurrencyAmountTextField.
* - Switch some hero images to PNG
- Fix nagivation_dock shadow
- Minor fixes
* feat: Add fallback to previous underline styling in central widgets
This change:
- Adds a fallback to CurrencyAmountTextField, AddressTextField, and BaseTextFormField, allowing them use the previous theme styling.
- Adds localization for new texts
* feat(themes): Update warning box colors for dark and light themes
* feat(themes): Relaod themes when user restores from backup, ensuring the user previous theme preference is used.
* feat(themes): Handle themes logic during restore from backup
This change:
- Refactors theme loading logic to handle backup restore edgecase
- Refreshes the theme based on the user saved preference during restore from backup flow
* Fix card gradients and spacing
* Fix even more radiuses
Test new icons for navigation_dock.dart
* Update onboarding flow backgrounds
Fix swap icon clipping
Fix some text colors
Add more hero images
* Fix incorrect color for light theme
* Fix more hero images and cleanup
* Update text field icons
Fix info box CTA colors
Fix sync indicator colors
* Update toggle colors
Update dark theme colors (minor)
Update crypto_balance_widget.dart icon
* Update page transitions in router.dart
Fix some colors
* feat(themes): Display label by default for filled textfields
* feat(themes): Refactor theme handling across various components
This change:
- Fixes issue with themeMode resetting to system mode when app is restarted causing a UI glitch
- Updates theme checks from `currentTheme.type == ThemeType.dark` to `currentTheme.isDark` for consistency
- Adjusts UI components to use the theme directly from the themeStore
* feat(themes): Add animating tagline to the create pin welcome screen
* Revert text fields label temporarily, fix a couple colors, and cleanup some images
---------
Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
2025-05-25 20:11:45 +00:00
|
|
|
onErrorContainer: const Color(0xFFFFDAD6),
|
|
|
|
surface: surfaceColor,
|
|
|
|
onSurface: const Color(0xFFD7E2F7),
|
|
|
|
onSurfaceVariant: const Color(0xFF8C9FBB),
|
|
|
|
surfaceContainerLowest: Color(0xFF171C30),
|
|
|
|
surfaceContainerLow: Color(0xFF2D385C),
|
|
|
|
surfaceContainer: Color(0xFF24335B),
|
|
|
|
surfaceContainerHigh: Color(0xFF212C47),
|
|
|
|
surfaceContainerHighest: Color(0xFF2A3B67),
|
|
|
|
outline: const Color(0xFF9EACC1),
|
|
|
|
outlineVariant: const Color(0xFF3E5579),
|
|
|
|
);
|
|
|
|
static const String fontFamily = 'Lato';
|
|
|
|
@override
|
|
|
|
TextTheme get textTheme => TextTheme(
|
|
|
|
displayLarge: TextStyle(
|
|
|
|
fontSize: 57,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: -0.25,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
displayMedium: TextStyle(
|
|
|
|
fontSize: 45,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
displaySmall: TextStyle(
|
|
|
|
fontSize: 36,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
headlineLarge: TextStyle(
|
|
|
|
fontSize: 32,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
headlineMedium: TextStyle(
|
|
|
|
fontSize: 28,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
headlineSmall: TextStyle(
|
|
|
|
fontSize: 24,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
titleLarge: TextStyle(
|
|
|
|
fontSize: 22,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
titleMedium: TextStyle(
|
|
|
|
fontSize: 16,
|
|
|
|
fontWeight: FontWeight.w500,
|
|
|
|
letterSpacing: 0.15,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
titleSmall: TextStyle(
|
|
|
|
fontSize: 14,
|
|
|
|
fontWeight: FontWeight.w500,
|
|
|
|
letterSpacing: 0.1,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
bodyLarge: TextStyle(
|
|
|
|
fontSize: 16,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0.5,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
bodyMedium: TextStyle(
|
|
|
|
fontSize: 14,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0.25,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
bodySmall: TextStyle(
|
|
|
|
fontSize: 12,
|
|
|
|
fontWeight: FontWeight.w400,
|
|
|
|
letterSpacing: 0.4,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
labelLarge: TextStyle(
|
|
|
|
fontSize: 14,
|
|
|
|
fontWeight: FontWeight.w500,
|
|
|
|
letterSpacing: 0.1,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
labelMedium: TextStyle(
|
|
|
|
fontSize: 12,
|
|
|
|
fontWeight: FontWeight.w500,
|
|
|
|
letterSpacing: 0.5,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
labelSmall: TextStyle(
|
|
|
|
fontSize: 10,
|
|
|
|
fontWeight: FontWeight.w500,
|
|
|
|
letterSpacing: 0.5,
|
|
|
|
color: colorScheme.onSurface,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
|
|
|
@override
|
|
|
|
ThemeData get themeData => ThemeData(
|
|
|
|
useMaterial3: true,
|
|
|
|
fontFamily: fontFamily,
|
|
|
|
brightness: brightness,
|
|
|
|
colorScheme: colorScheme,
|
|
|
|
textTheme: textTheme,
|
|
|
|
appBarTheme: AppBarTheme(
|
|
|
|
backgroundColor: colorScheme.surface,
|
|
|
|
foregroundColor: colorScheme.onSurface,
|
|
|
|
elevation: 0,
|
|
|
|
),
|
|
|
|
cardTheme: CardTheme(
|
|
|
|
color: colorScheme.surface,
|
|
|
|
elevation: 1,
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
borderRadius: BorderRadius.circular(12),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
|
|
|
style: ElevatedButton.styleFrom(
|
|
|
|
backgroundColor: colorScheme.primary,
|
|
|
|
foregroundColor: colorScheme.onPrimary,
|
|
|
|
elevation: 0,
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
outlinedButtonTheme: OutlinedButtonThemeData(
|
|
|
|
style: OutlinedButton.styleFrom(
|
|
|
|
foregroundColor: colorScheme.primary,
|
|
|
|
side: BorderSide(color: colorScheme.outline),
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
textButtonTheme: TextButtonThemeData(
|
|
|
|
style: TextButton.styleFrom(
|
|
|
|
foregroundColor: colorScheme.primary,
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
inputDecorationTheme: InputDecorationTheme(
|
|
|
|
filled: true,
|
|
|
|
fillColor: colorScheme.surfaceContainer,
|
|
|
|
border: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide.none,
|
|
|
|
),
|
|
|
|
enabledBorder: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide.none,
|
|
|
|
),
|
|
|
|
focusedBorder: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide(color: colorScheme.primary),
|
|
|
|
),
|
|
|
|
errorBorder: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide(color: colorScheme.error),
|
|
|
|
),
|
|
|
|
focusedErrorBorder: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide(color: colorScheme.error),
|
|
|
|
),
|
|
|
|
disabledBorder: OutlineInputBorder(
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
borderSide: BorderSide.none,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
|
|
|
@override
|
|
|
|
String get title => 'Dark Theme';
|
|
|
|
|
|
|
|
@override
|
|
|
|
ThemeType get type => ThemeType.dark;
|
|
|
|
|
|
|
|
@override
|
|
|
|
int get raw => 1;
|
|
|
|
}
|