This commit is contained in:
2026-03-21 22:48:30 +03:00
parent a0f800cfe4
commit a9be4f6162
21 changed files with 966 additions and 757 deletions
+15 -12
View File
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import '../core/l10n/locale_provider.dart';
import '../features/dashboard/screen.dart';
import '../features/add_transaction/screen.dart';
import '../features/categories/screen.dart';
@@ -50,7 +52,7 @@ final appRouter = GoRouter(
],
);
class AppShell extends StatelessWidget {
class AppShell extends ConsumerWidget {
final Widget child;
const AppShell({super.key, required this.child});
@@ -62,7 +64,8 @@ class AppShell extends StatelessWidget {
}
@override
Widget build(BuildContext context) {
Widget build(BuildContext context, WidgetRef ref) {
final s = ref.watch(stringsProvider);
final idx = _locationToIndex(context);
return Scaffold(
body: child,
@@ -73,21 +76,21 @@ class AppShell extends StatelessWidget {
if (i == 1) context.go('/categories');
if (i == 2) context.go('/settings');
},
destinations: const [
destinations: [
NavigationDestination(
icon: Icon(Icons.dashboard_outlined),
selectedIcon: Icon(Icons.dashboard_rounded),
label: 'Dashboard',
icon: const Icon(Icons.dashboard_outlined),
selectedIcon: const Icon(Icons.dashboard_rounded),
label: s.navDashboard,
),
NavigationDestination(
icon: Icon(Icons.pie_chart_outline_rounded),
selectedIcon: Icon(Icons.pie_chart_rounded),
label: 'Categories',
icon: const Icon(Icons.pie_chart_outline_rounded),
selectedIcon: const Icon(Icons.pie_chart_rounded),
label: s.navCategories,
),
NavigationDestination(
icon: Icon(Icons.settings_outlined),
selectedIcon: Icon(Icons.settings_rounded),
label: 'Settings',
icon: const Icon(Icons.settings_outlined),
selectedIcon: const Icon(Icons.settings_rounded),
label: s.navSettings,
),
],
),
-4
View File
@@ -12,7 +12,6 @@ class AppTheme {
);
return base.copyWith(
fontFamily: GoogleFonts.poppins().fontFamily, // Explicit font family for Cyrillic support
textTheme: textTheme,
scaffoldBackgroundColor: AppColors.background,
colorScheme: const ColorScheme.dark(
@@ -112,7 +111,6 @@ class AppTheme {
);
return base.copyWith(
fontFamily: GoogleFonts.poppins().fontFamily, // Explicit font family for Cyrillic support
textTheme: textTheme,
scaffoldBackgroundColor: const Color(0xFFF0F0F7),
colorScheme: const ColorScheme.light(
@@ -121,8 +119,6 @@ class AppTheme {
secondary: AppColors.accent,
onPrimary: Colors.white,
onSurface: Color(0xFF1A1A2E),
onBackground: Color(0xFF1A1A2E),
background: Color(0xFFF0F0F7),
),
cardTheme: CardThemeData(
color: Colors.white,