mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-21 06:18:42 +02:00
* 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>
262 lines
7.8 KiB
Dart
262 lines
7.8 KiB
Dart
import 'package:cake_wallet/utils/responsive_layout_util.dart';
|
|
import 'package:dotted_border/dotted_border.dart';
|
|
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
class PrimaryButton extends StatelessWidget {
|
|
const PrimaryButton({
|
|
required this.text,
|
|
required this.color,
|
|
required this.textColor,
|
|
this.onPressed,
|
|
this.isDisabled = false,
|
|
this.isDottedBorder = false,
|
|
this.borderColor = Colors.black,
|
|
this.onDisabledPressed,
|
|
this.borderRadius,
|
|
super.key,
|
|
});
|
|
|
|
final VoidCallback? onPressed;
|
|
final VoidCallback? onDisabledPressed;
|
|
final Color color;
|
|
final Color textColor;
|
|
final Color borderColor;
|
|
final String text;
|
|
final bool isDisabled;
|
|
final bool isDottedBorder;
|
|
final BorderRadius? borderRadius;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final content = ConstrainedBox(
|
|
constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
|
|
child: SizedBox(
|
|
width: double.infinity,
|
|
height: 52.0,
|
|
child: TextButton(
|
|
onPressed:
|
|
isDisabled ? (onDisabledPressed != null ? onDisabledPressed : null) : onPressed,
|
|
style: ButtonStyle(
|
|
backgroundColor: WidgetStateProperty.all(
|
|
isDisabled ? color.withOpacity(0.5) : color,
|
|
),
|
|
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
|
|
RoundedRectangleBorder(
|
|
borderRadius: borderRadius ?? BorderRadius.circular(12.0),
|
|
),
|
|
),
|
|
overlayColor: WidgetStateProperty.all(Colors.transparent),
|
|
),
|
|
child: Text(
|
|
text,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
|
fontSize: 15.0,
|
|
fontWeight: FontWeight.w600,
|
|
color: isDisabled ? textColor.withOpacity(0.5) : textColor,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
return isDottedBorder
|
|
? DottedBorder(
|
|
borderType: BorderType.RRect,
|
|
dashPattern: [6, 4],
|
|
color: borderColor,
|
|
strokeWidth: 2,
|
|
radius: Radius.circular(15),
|
|
child: content)
|
|
: content;
|
|
}
|
|
}
|
|
|
|
class LoadingPrimaryButton extends StatelessWidget {
|
|
const LoadingPrimaryButton({
|
|
required this.onPressed,
|
|
required this.text,
|
|
required this.color,
|
|
required this.textColor,
|
|
this.isDisabled = false,
|
|
this.isLoading = false,
|
|
super.key,
|
|
});
|
|
|
|
final VoidCallback onPressed;
|
|
final Color color;
|
|
final Color textColor;
|
|
final bool isLoading;
|
|
final bool isDisabled;
|
|
final String text;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ConstrainedBox(
|
|
constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
|
|
child: SizedBox(
|
|
width: double.infinity,
|
|
height: 52.0,
|
|
child: TextButton(
|
|
onPressed: (isLoading || isDisabled)
|
|
? null
|
|
: () {
|
|
FocusScope.of(context).unfocus();
|
|
onPressed.call();
|
|
},
|
|
style: ButtonStyle(
|
|
backgroundColor: WidgetStateProperty.all(isDisabled ? color.withOpacity(0.5) : color),
|
|
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
|
|
RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12.0),
|
|
),
|
|
)),
|
|
child: isLoading
|
|
? CupertinoActivityIndicator(animating: true, color: textColor)
|
|
: Text(
|
|
text,
|
|
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
|
fontSize: 15.0,
|
|
fontWeight: FontWeight.w600,
|
|
color: isDisabled ? textColor.withOpacity(0.5) : textColor,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class PrimaryIconButton extends StatelessWidget {
|
|
const PrimaryIconButton({
|
|
required this.onPressed,
|
|
required this.iconData,
|
|
required this.text,
|
|
required this.color,
|
|
required this.borderColor,
|
|
required this.iconColor,
|
|
required this.iconBackgroundColor,
|
|
required this.textColor,
|
|
this.mainAxisAlignment = MainAxisAlignment.start,
|
|
this.radius = 12,
|
|
super.key,
|
|
});
|
|
|
|
final VoidCallback onPressed;
|
|
final IconData iconData;
|
|
final Color color;
|
|
final Color borderColor;
|
|
final Color iconColor;
|
|
final Color iconBackgroundColor;
|
|
final String text;
|
|
final MainAxisAlignment mainAxisAlignment;
|
|
final Color textColor;
|
|
final double radius;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ConstrainedBox(
|
|
constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
|
|
child: SizedBox(
|
|
width: double.infinity,
|
|
height: 52.0,
|
|
child: TextButton(
|
|
onPressed: onPressed,
|
|
style: ButtonStyle(
|
|
backgroundColor: WidgetStateProperty.all(color),
|
|
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
|
|
RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(radius),
|
|
),
|
|
)),
|
|
child: Stack(
|
|
children: <Widget>[
|
|
Row(
|
|
mainAxisAlignment: mainAxisAlignment,
|
|
children: <Widget>[
|
|
Container(
|
|
width: 26.0,
|
|
height: 52.0,
|
|
decoration: BoxDecoration(shape: BoxShape.circle, color: iconBackgroundColor),
|
|
child: Center(
|
|
child: Icon(iconData, color: iconColor, size: 22.0),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
Container(
|
|
height: 52.0,
|
|
child: Center(
|
|
child: Text(
|
|
text,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
fontSize: 16,
|
|
color: textColor,
|
|
),
|
|
),
|
|
),
|
|
)
|
|
],
|
|
),
|
|
)),
|
|
);
|
|
}
|
|
}
|
|
|
|
class PrimaryImageButton extends StatelessWidget {
|
|
const PrimaryImageButton(
|
|
{required this.onPressed,
|
|
required this.image,
|
|
required this.text,
|
|
required this.color,
|
|
required this.textColor,
|
|
this.borderColor = Colors.transparent,
|
|
super.key});
|
|
|
|
final VoidCallback onPressed;
|
|
final Image image;
|
|
final Color color;
|
|
final Color textColor;
|
|
final Color borderColor;
|
|
final String text;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ConstrainedBox(
|
|
constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
|
|
child: SizedBox(
|
|
width: double.infinity,
|
|
height: 52.0,
|
|
child: ElevatedButton(
|
|
onPressed: onPressed,
|
|
style: ButtonStyle(
|
|
backgroundColor: WidgetStateProperty.all(color),
|
|
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
|
|
RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12.0),
|
|
),
|
|
)),
|
|
child: Center(
|
|
child: Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: <Widget>[
|
|
image,
|
|
SizedBox(width: 15),
|
|
Text(
|
|
text,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
fontSize: 15,
|
|
fontWeight: FontWeight.w600,
|
|
color: textColor,
|
|
),
|
|
)
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|