diff --git a/lib/core/l10n/app_strings.dart b/lib/core/l10n/app_strings.dart index 24a81c8..9b7ad60 100644 --- a/lib/core/l10n/app_strings.dart +++ b/lib/core/l10n/app_strings.dart @@ -59,8 +59,8 @@ class AppStrings { String get disabled => _ru ? 'Выключено' : 'Disabled'; String get hapticFeedback => _ru ? 'Тактильная отдача' : 'Haptic Feedback'; String get vibrationOnInteractions => _ru ? 'Вибрация при взаимодействии' : 'Vibration on interactions'; - String get biometricLock => _ru ? 'Биометрическая блокировка' : 'Biometric Lock'; - String get requireFingerprint => _ru ? 'Требовать отпечаток при запуске' : 'Require fingerprint on app launch'; + String get biometricLock => _ru ? 'Биометрия' : 'Biometric Lock'; + String get requireFingerprint => _ru ? 'Отпечаток при запуске' : 'Require fingerprint to unlock'; String get currency => _ru ? 'Валюта' : 'Currency'; String get amountFormat => _ru ? 'Формат суммы' : 'Amount Format'; String get language => _ru ? 'Язык' : 'Language'; @@ -136,7 +136,7 @@ class AppStrings { // ── Color editor overlay ── String get colorPrimary => _ru ? 'Основной' : 'Primary'; - String get colorSecondary => _ru ? 'Вторичный' : 'Secondary'; + String get colorSecondary => _ru ? 'Второй' : 'Secondary'; String get colorSolid => _ru ? 'Однотон' : 'Solid'; String get gradientLinear => _ru ? 'Линейный' : 'Linear'; String get gradientReverse => _ru ? 'Обратный' : 'Reverse'; diff --git a/lib/core/services/card_color_service.dart b/lib/core/services/card_color_service.dart index e0d0770..5a92423 100644 --- a/lib/core/services/card_color_service.dart +++ b/lib/core/services/card_color_service.dart @@ -8,11 +8,11 @@ class CardColorService { static const _key2 = 'card_color_secondary'; static const _keyGradient = 'card_gradient_type'; - static const defaultPrimary = Color(0xFF2D1B69); - static const defaultSecondary = Color(0xFF8B5CF6); + static const defaultPrimary = Color(0xFFD3B3C2); + static const defaultSecondary = Color(0xFF937070); - static const defaultPrimaryLight = Color(0xFF2D1B69); - static const defaultSecondaryLight = Color(0xFF8B5CF6); + static const defaultPrimaryLight = Color(0xFF6A6482); + static const defaultSecondaryLight = Color(0xFF000000); static const defaultGradient = GradientType.sweep; diff --git a/lib/features/categories/screen.dart b/lib/features/categories/screen.dart index 0214ab5..2f307b6 100644 --- a/lib/features/categories/screen.dart +++ b/lib/features/categories/screen.dart @@ -36,23 +36,12 @@ class _CategoriesScreenState extends ConsumerState { return Scaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, appBar: AppBar( - title: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.categories, - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.w700, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - Text( - s.expenses, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - ], + title: Text( + s.categories, + style: Theme.of(context).textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.w700, + color: Theme.of(context).colorScheme.onSurface, + ), ), actions: [ _ChartToggle( diff --git a/lib/features/dashboard/widgets/color_editor_overlay.dart b/lib/features/dashboard/widgets/color_editor_overlay.dart index c10c8ae..464b399 100644 --- a/lib/features/dashboard/widgets/color_editor_overlay.dart +++ b/lib/features/dashboard/widgets/color_editor_overlay.dart @@ -9,6 +9,11 @@ import '../../settings/provider.dart'; import '../provider.dart'; import 'balance_card.dart'; +String _colorToHex(Color color) { + final hex = color.value.toRadixString(16).padLeft(8, '0').toUpperCase(); + return hex.substring(2); +} + class FullScreenBlurOverlay extends StatefulWidget { final dynamic dashboardState; final BuildContext context; @@ -305,7 +310,7 @@ class _FullScreenBlurOverlayState extends State { ), const SizedBox(width: 5), Text( - '#${dash.tempPrimary.value.toRadixString(16).substring(2).toUpperCase()}', + '#${_colorToHex(dash.tempPrimary)}', style: TextStyle( fontSize: 11, fontFamily: 'monospace', @@ -337,7 +342,7 @@ class _FullScreenBlurOverlayState extends State { mainAxisSize: MainAxisSize.min, children: [ Text( - '#${dash.tempSecondary.value.toRadixString(16).substring(2).toUpperCase()}', + '#${_colorToHex(dash.tempSecondary)}', style: TextStyle( fontSize: 11, fontFamily: 'monospace', diff --git a/lib/features/settings/screen.dart b/lib/features/settings/screen.dart index 4b439a6..fec5a9a 100644 --- a/lib/features/settings/screen.dart +++ b/lib/features/settings/screen.dart @@ -75,23 +75,12 @@ class SettingsScreen extends ConsumerWidget { return Scaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, appBar: AppBar( - title: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.settings, - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.w700, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - Text( - s.managePreferences, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - ], + title: Text( + s.settings, + style: Theme.of(context).textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.w700, + color: Theme.of(context).colorScheme.onSurface, + ), ), ), body: ListView(