From f64f63641ec9d89536837ba01450edd42fe10099 Mon Sep 17 00:00:00 2001 From: Artem Luzin m Date: Tue, 17 Jun 2025 20:25:24 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D1=83=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/theme/app_colors_scheme.dart | 20 +++++++++++++++----- lib/app/theme/app_theme.dart | 10 ++++++---- lib/app/ui_kit/app_snackbar.dart | 22 +++++++++++++++------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/lib/app/theme/app_colors_scheme.dart b/lib/app/theme/app_colors_scheme.dart index 177346a..36303b1 100644 --- a/lib/app/theme/app_colors_scheme.dart +++ b/lib/app/theme/app_colors_scheme.dart @@ -56,13 +56,19 @@ class AppColors extends ThemeExtension with DiagnosticableTreeMixin { Color? infoSnackbarBackground, }) => AppColors( testColor: testColor ?? this.testColor, - errorSnackbarBackground: errorSnackbarBackground ?? this.errorSnackbarBackground, - successSnackbarBackground: successSnackbarBackground ?? this.successSnackbarBackground, - infoSnackbarBackground: infoSnackbarBackground ?? this.infoSnackbarBackground, + errorSnackbarBackground: + errorSnackbarBackground ?? this.errorSnackbarBackground, + successSnackbarBackground: + successSnackbarBackground ?? this.successSnackbarBackground, + infoSnackbarBackground: + infoSnackbarBackground ?? this.infoSnackbarBackground, ); @override - ThemeExtension lerp(covariant ThemeExtension? other, double t) { + ThemeExtension lerp( + covariant ThemeExtension? other, + double t, + ) { if (other is! AppColors) return this; return AppColors( @@ -77,7 +83,11 @@ class AppColors extends ThemeExtension with DiagnosticableTreeMixin { other.successSnackbarBackground, t, )!, - infoSnackbarBackground: Color.lerp(infoSnackbarBackground, other.infoSnackbarBackground, t)!, + infoSnackbarBackground: Color.lerp( + infoSnackbarBackground, + other.infoSnackbarBackground, + t, + )!, ); } } diff --git a/lib/app/theme/app_theme.dart b/lib/app/theme/app_theme.dart index 2bf9360..e5dd811 100644 --- a/lib/app/theme/app_theme.dart +++ b/lib/app/theme/app_theme.dart @@ -4,10 +4,12 @@ import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; /// Класс для конфигурации светлой/темной темы приложения abstract class AppTheme { /// Геттер для получения светлой темы - static ThemeData get light => - ThemeData.light().copyWith(extensions: >[AppColors.light]); + static ThemeData get light => ThemeData.light().copyWith( + extensions: >[AppColors.light], + ); /// Геттер для получения темной темы - static ThemeData get dark => - ThemeData.dark().copyWith(extensions: >[AppColors.dark]); + static ThemeData get dark => ThemeData.dark().copyWith( + extensions: >[AppColors.dark], + ); } diff --git a/lib/app/ui_kit/app_snackbar.dart b/lib/app/ui_kit/app_snackbar.dart index bd3a343..85f37d8 100644 --- a/lib/app/ui_kit/app_snackbar.dart +++ b/lib/app/ui_kit/app_snackbar.dart @@ -139,7 +139,8 @@ class AppSnackBar extends StatefulWidget { } } -class _AppSnackBarState extends State with SingleTickerProviderStateMixin { +class _AppSnackBarState extends State + with SingleTickerProviderStateMixin { late AnimationController _animationController; late Animation _slideAnimation; Timer? _dismissTimer; @@ -174,10 +175,10 @@ class _AppSnackBarState extends State with SingleTickerProviderStat // Конечная позиция снекбара - 15 пикселей ниже верхнего отступа final endPosition = topPadding + 15; // Создание анимации с использованием Tween - _slideAnimation = Tween( - begin: startPosition, - end: endPosition, - ).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeOut)); + _slideAnimation = Tween(begin: startPosition, end: endPosition) + .animate( + CurvedAnimation(parent: _animationController, curve: Curves.easeOut), + ); _animationController.forward(); } @@ -231,7 +232,10 @@ class _AppSnackBarState extends State with SingleTickerProviderStat color: _getBackgroundColor(widget.type), borderRadius: BorderRadius.circular(16), ), - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + padding: const EdgeInsets.symmetric( + vertical: 12, + horizontal: 16, + ), child: Row( children: [ _Icon(type: widget.type), @@ -284,7 +288,11 @@ class _Icon extends StatelessWidget { @override Widget build(BuildContext context) { return switch (type) { - TypeSnackBar.success => Icon(Icons.check_circle, color: Colors.white, size: 32), + TypeSnackBar.success => Icon( + Icons.check_circle, + color: Colors.white, + size: 32, + ), TypeSnackBar.error => Icon(Icons.error, color: Colors.white, size: 32), TypeSnackBar.info => Icon(Icons.info, color: Colors.white, size: 32), };