diff --git a/lib/app/app_context_ext.dart b/lib/app/app_context_ext.dart index fa36685..2597a91 100644 --- a/lib/app/app_context_ext.dart +++ b/lib/app/app_context_ext.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; import 'package:friflex_starter/app/theme/theme_notifier.dart'; import 'package:friflex_starter/di/di_container.dart'; import 'package:friflex_starter/l10n/gen/app_localizations.dart'; @@ -11,9 +10,6 @@ extension AppContextExt on BuildContext { /// Метод для получения экземпляра DIContainer DiContainer get di => read(); - /// Геттер для получения цветовой схемы - AppColors get colors => Theme.of(this).extension()!; - /// Геттер для получения темы ThemeNotifier get theme => read(); diff --git a/lib/app/ui_kit/app_snackbar.dart b/lib/app/ui_kit/app_snackbar.dart index 85f37d8..4b58880 100644 --- a/lib/app/ui_kit/app_snackbar.dart +++ b/lib/app/ui_kit/app_snackbar.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:friflex_starter/app/app_context_ext.dart'; +import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; import 'package:friflex_starter/app/ui_kit/app_box.dart'; /// {@template app_snackbar} @@ -264,9 +264,9 @@ class _AppSnackBarState extends State /// [TypeSnackBar.error] - цвет ошибки Color _getBackgroundColor(TypeSnackBar type) { return switch (type) { - TypeSnackBar.success => context.colors.successSnackbarBackground, - TypeSnackBar.error => context.colors.errorSnackbarBackground, - TypeSnackBar.info => context.colors.infoSnackbarBackground, + TypeSnackBar.success => context.appColors.successSnackbarBackground, + TypeSnackBar.error => context.appColors.errorSnackbarBackground, + TypeSnackBar.info => context.appColors.infoSnackbarBackground, }; } } diff --git a/lib/features/debug/screens/lang_screen.dart b/lib/features/debug/screens/lang_screen.dart index fe98734..b8d8dc9 100644 --- a/lib/features/debug/screens/lang_screen.dart +++ b/lib/features/debug/screens/lang_screen.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:friflex_starter/app/app_context_ext.dart'; +import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; import 'package:friflex_starter/gen/assets.gen.dart'; import 'package:friflex_starter/gen/fonts.gen.dart'; @@ -36,7 +37,7 @@ class LangScreen extends StatelessWidget { Text( 'Тестовое слово bold: ${context.l10n.helloWorld}', style: TextStyle( - color: context.colors.testColor, + color: context.appColors.testColor, fontFamily: Assets.fonts.montserratBold, ), ), @@ -44,7 +45,7 @@ class LangScreen extends StatelessWidget { Text( 'Тестовое слово medium: ${context.l10n.helloWorld}', style: TextStyle( - color: context.colors.testColor, + color: context.appColors.testColor, fontFamily: FontFamily.montserrat, ), ), diff --git a/lib/features/debug/screens/theme_screen.dart b/lib/features/debug/screens/theme_screen.dart index 4d591af..bc36220 100644 --- a/lib/features/debug/screens/theme_screen.dart +++ b/lib/features/debug/screens/theme_screen.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:friflex_starter/app/app_context_ext.dart'; +import 'package:friflex_starter/app/theme/app_colors_scheme.dart'; /// {@template ThemeScreen} /// Экран для отладки темы приложения @@ -10,7 +11,7 @@ class ThemeScreen extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = context.colors; + final colors = context.appColors; return Scaffold( appBar: AppBar(title: const Text('Theme')), body: Center( @@ -25,7 +26,7 @@ class ThemeScreen extends StatelessWidget { ), const SizedBox(height: 16), ColoredBox( - color: context.colors.testColor, + color: context.appColors.testColor, child: const SizedBox(height: 100, width: 100), ), const SizedBox(height: 16),