Refactoring - Version OK

2025-11-17 16:02:04 +00:00
parent 3f00a26308
commit 3b9ffac8cd
198 changed files with 18010 additions and 11383 deletions
--- a/unionflow-mobile-apps/lib/core/navigation/adaptive_navigation.dart
+++ b/unionflow-mobile-apps/lib/core/navigation/adaptive_navigation.dart
@@ -4,10 +4,10 @@ library adaptive_navigation;

 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import '../auth/bloc/auth_bloc.dart';
-import '../auth/models/user_role.dart';
-import '../auth/models/permission_matrix.dart';
-import '../widgets/adaptive_widget.dart';
+import '../../features/authentication/presentation/bloc/auth_bloc.dart';
+import '../../features/authentication/data/models/user_role.dart';
+import '../../features/authentication/data/models/permission_matrix.dart';
+import '../../shared/widgets/adaptive_widget.dart';

 /// Élément de navigation adaptatif
 class AdaptiveNavigationItem {
--- a/unionflow-mobile-apps/lib/core/navigation/app_router.dart
+++ b/unionflow-mobile-apps/lib/core/navigation/app_router.dart
@@ -1,8 +1,8 @@
 import 'package:go_router/go_router.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

-import '../auth/bloc/auth_bloc.dart';
-import '../../features/auth/presentation/pages/login_page.dart';
+import '../../features/authentication/presentation/bloc/auth_bloc.dart';
+import '../../features/authentication/presentation/pages/login_page.dart';
 import 'main_navigation_layout.dart';

 /// Configuration du routeur principal de l'application
--- a/unionflow-mobile-apps/lib/core/navigation/main_navigation_layout.dart
+++ b/unionflow-mobile-apps/lib/core/navigation/main_navigation_layout.dart
@@ -1,20 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

-import '../auth/bloc/auth_bloc.dart';
-import '../auth/models/user_role.dart';
-
-import '../design_system/tokens/tokens.dart';
+import '../../features/authentication/presentation/bloc/auth_bloc.dart';
+import '../../features/authentication/data/models/user_role.dart';
+import '../../shared/design_system/unionflow_design_system.dart';
 import '../../features/dashboard/presentation/pages/role_dashboards/role_dashboards.dart';
 import '../../features/members/presentation/pages/members_page_wrapper.dart';
 import '../../features/events/presentation/pages/events_page_wrapper.dart';
-import '../../features/cotisations/presentation/pages/cotisations_page_wrapper.dart';
+import '../../features/contributions/presentation/pages/contributions_page_wrapper.dart';

 import '../../features/about/presentation/pages/about_page.dart';
 import '../../features/help/presentation/pages/help_support_page.dart';
 import '../../features/notifications/presentation/pages/notifications_page.dart';
 import '../../features/profile/presentation/pages/profile_page.dart';
-import '../../features/system_settings/presentation/pages/system_settings_page.dart';
+import '../../features/settings/presentation/pages/system_settings_page.dart';
 import '../../features/backup/presentation/pages/backup_page.dart';
 import '../../features/logs/presentation/pages/logs_page.dart';
 import '../../features/reports/presentation/pages/reports_page.dart';
@@ -69,38 +68,68 @@ class _MainNavigationLayoutState extends State<MainNavigationLayout> {
        }

        return Scaffold(
-          body: IndexedStack(
-            index: _selectedIndex,
-            children: _getPages(state.effectiveRole),
+          backgroundColor: ColorTokens.background,
+          body: SafeArea(
+            top: true, // Respecte le StatusBar
+            bottom: false, // Le BottomNavigationBar gère son propre SafeArea
+            child: IndexedStack(
+              index: _selectedIndex,
+              children: _getPages(state.effectiveRole),
+            ),
          ),
-          bottomNavigationBar: BottomNavigationBar(
-            type: BottomNavigationBarType.fixed,
-            currentIndex: _selectedIndex,
-            onTap: (index) {
-              setState(() {
-                _selectedIndex = index;
-              });
-            },
-            selectedItemColor: ColorTokens.primary,
-            unselectedItemColor: Colors.grey,
-            items: const [
-              BottomNavigationBarItem(
-                icon: Icon(Icons.dashboard),
-                label: 'Dashboard',
+          bottomNavigationBar: SafeArea(
+            top: false,
+            child: Container(
+              decoration: const BoxDecoration(
+                color: ColorTokens.surface,
+                boxShadow: [
+                  BoxShadow(
+                    color: ColorTokens.shadow,
+                    blurRadius: 8,
+                    offset: Offset(0, -2),
+                  ),
+                ],
              ),
-              BottomNavigationBarItem(
-                icon: Icon(Icons.people),
-                label: 'Membres',
+              child: BottomNavigationBar(
+                type: BottomNavigationBarType.fixed,
+                currentIndex: _selectedIndex,
+                onTap: (index) {
+                  setState(() {
+                    _selectedIndex = index;
+                  });
+                },
+                backgroundColor: ColorTokens.surface,
+                selectedItemColor: ColorTokens.primary,
+                unselectedItemColor: ColorTokens.onSurfaceVariant,
+                selectedLabelStyle: TypographyTokens.labelSmall.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+                unselectedLabelStyle: TypographyTokens.labelSmall,
+                elevation: 0, // Géré par le Container
+                items: const [
+                  BottomNavigationBarItem(
+                    icon: Icon(Icons.dashboard_outlined),
+                    activeIcon: Icon(Icons.dashboard),
+                    label: 'Dashboard',
+                  ),
+                  BottomNavigationBarItem(
+                    icon: Icon(Icons.people_outline),
+                    activeIcon: Icon(Icons.people),
+                    label: 'Membres',
+                  ),
+                  BottomNavigationBarItem(
+                    icon: Icon(Icons.event_outlined),
+                    activeIcon: Icon(Icons.event),
+                    label: 'Événements',
+                  ),
+                  BottomNavigationBarItem(
+                    icon: Icon(Icons.more_horiz_outlined),
+                    activeIcon: Icon(Icons.more_horiz),
+                    label: 'Plus',
+                  ),
+                ],
              ),
-              BottomNavigationBarItem(
-                icon: Icon(Icons.event),
-                label: 'Événements',
-              ),
-              BottomNavigationBarItem(
-                icon: Icon(Icons.more_horiz),
-                label: 'Plus',
-              ),
-            ],
+            ),
          ),
        );
      },
@@ -124,22 +153,21 @@ class MorePage extends StatelessWidget {
        }

        return Container(
-          color: const Color(0xFFF8F9FA),
+          color: ColorTokens.background,
          child: SingleChildScrollView(
-            padding: const EdgeInsets.all(12),
+            padding: const EdgeInsets.all(SpacingTokens.lg),
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
                // Titre de la section
-                const Text(
+                Text(
                  'Plus d\'Options',
-                  style: TextStyle(
+                  style: TypographyTokens.headlineMedium.copyWith(
+                    color: ColorTokens.primary,
                    fontWeight: FontWeight.bold,
-                    color: Color(0xFF6C5CE7),
-                    fontSize: 20,
                  ),
                ),
-                const SizedBox(height: 12),
+                const SizedBox(height: SpacingTokens.lg),

                // Profil utilisateur
                _buildUserProfile(state),