refactoring

2026-03-31 09:14:47 +00:00
parent 9bfffeeebe
commit 5383df6dcb
200 changed files with 11192 additions and 7063 deletions
--- a/lib/core/navigation/more_page.dart
+++ b/lib/core/navigation/more_page.dart
@@ -18,7 +18,7 @@ import '../../features/solidarity/presentation/pages/demandes_aide_page_wrapper.
 import '../../features/organizations/presentation/pages/organizations_page_wrapper.dart';
 import '../../features/profile/presentation/pages/profile_page_wrapper.dart';

-/// Page "Plus" avec les fonctions avancées selon le rôle (Menu Principal Extensif)
+/// Page "Plus" avec les fonctions avancées selon le rôle
 class MorePage extends StatelessWidget {
  const MorePage({super.key});

@@ -33,26 +33,20 @@ class MorePage extends StatelessWidget {
        }

        return Scaffold(
-          backgroundColor: ColorTokens.background,
+          backgroundColor: AppColors.lightBackground,
          appBar: const UFAppBar(
            title: 'PLUS',
            automaticallyImplyLeading: false,
          ),
          body: SingleChildScrollView(
-            padding: const EdgeInsets.all(16),
+            padding: const EdgeInsets.all(12),
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
-                // Profil utilisateur
                _buildUserProfile(context, state),
                const SizedBox(height: SpacingTokens.md),
-
-                // Options selon le rôle
                ..._buildRoleBasedOptions(context, state),
-
                const SizedBox(height: SpacingTokens.md),
-
-                // Options communes
                ..._buildCommonOptions(context),
              ],
            ),
@@ -63,14 +57,20 @@ class MorePage extends StatelessWidget {
  }

  Widget _buildUserProfile(BuildContext context, AuthAuthenticated state) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final textColor = isDark ? AppColors.textPrimaryDark : AppColors.textPrimaryLight;
+    final roleColor = isDark ? AppColors.brandGreenLight : AppColors.primaryGreen;
+
    return CoreCard(
      onTap: () => Navigator.of(context).push(
-        MaterialPageRoute(builder: (context) => const ProfilePageWrapper()),
+        MaterialPageRoute(builder: (_) => const ProfilePageWrapper()),
      ),
      child: Row(
        children: [
          MiniAvatar(
-            fallbackText: state.user.firstName.isNotEmpty ? state.user.firstName[0].toUpperCase() : 'U',
+            fallbackText: state.user.firstName.isNotEmpty
+                ? state.user.firstName[0].toUpperCase()
+                : 'U',
            size: 40,
            imageUrl: state.user.avatar,
          ),
@@ -81,19 +81,21 @@ class MorePage extends StatelessWidget {
              children: [
                Text(
                  '${state.user.firstName} ${state.user.lastName}',
-                  style: AppTypography.actionText,
+                  style: AppTypography.actionText.copyWith(color: textColor),
                ),
                Text(
                  state.effectiveRole.displayName.toUpperCase(),
                  style: AppTypography.badgeText.copyWith(
-                    color: AppColors.primaryGreen,
+                    color: roleColor,
                    fontWeight: FontWeight.bold,
                  ),
                ),
              ],
            ),
          ),
-          const Icon(Icons.chevron_right, color: AppColors.textSecondaryLight, size: 16),
+          Icon(Icons.chevron_right,
+              color: isDark ? AppColors.textSecondaryDark : AppColors.textSecondaryLight,
+              size: 16),
        ],
      ),
    );
@@ -102,118 +104,90 @@ class MorePage extends StatelessWidget {
  List<Widget> _buildRoleBasedOptions(BuildContext context, AuthAuthenticated state) {
    final options = <Widget>[];

-    // Options Super Admin uniquement
    if (state.effectiveRole == UserRole.superAdmin) {
      options.addAll([
-        _buildSectionTitle('Administration Système'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Administration Système'),
+        _buildOptionTile(context,
          icon: Icons.people,
          title: 'Gestion des utilisateurs',
          subtitle: 'Utilisateurs Keycloak et rôles',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const UserManagementPage()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const UserManagementPage())),
        ),
-        _buildOptionTile(
+        _buildOptionTile(context,
          icon: Icons.settings,
          title: 'Paramètres Système',
          subtitle: 'Configuration globale',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const SystemSettingsPage()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
        ),
-        _buildOptionTile(
+        _buildOptionTile(context,
          icon: Icons.backup,
          title: 'Sauvegarde & Restauration',
          subtitle: 'Gestion des sauvegardes',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const BackupPage()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const BackupPage())),
        ),
-        _buildOptionTile(
+        _buildOptionTile(context,
          icon: Icons.article,
          title: 'Logs & Monitoring',
          subtitle: 'Surveillance et journaux',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const LogsPage()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const LogsPage())),
        ),
      ]);
    }

-    // Options Admin+ (Admin Organisation et Super Admin)
-    if (state.effectiveRole == UserRole.orgAdmin || state.effectiveRole == UserRole.superAdmin) {
+    if (state.effectiveRole == UserRole.orgAdmin ||
+        state.effectiveRole == UserRole.superAdmin) {
      options.addAll([
-        _buildSectionTitle('Administration'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Administration'),
+        _buildOptionTile(context,
          icon: Icons.business,
          title: 'Gestion des Organisations',
          subtitle: 'Créer et gérer les organisations',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const OrganizationsPageWrapper()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const OrganizationsPageWrapper())),
        ),
-        _buildSectionTitle('Workflow Financier'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Workflow Financier'),
+        _buildOptionTile(context,
          icon: Icons.pending_actions,
          title: 'Approbations en attente',
          subtitle: 'Valider les transactions financières',
-          onTap: () {
-            Navigator.pushNamed(context, '/approvals');
-          },
+          onTap: () => Navigator.pushNamed(context, '/approvals'),
        ),
-        _buildOptionTile(
+        _buildOptionTile(context,
          icon: Icons.account_balance_wallet,
          title: 'Gestion des Budgets',
          subtitle: 'Créer et suivre les budgets',
-          onTap: () {
-            Navigator.pushNamed(context, '/budgets');
-          },
+          onTap: () => Navigator.pushNamed(context, '/budgets'),
        ),
-        _buildSectionTitle('Communication'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Communication'),
+        _buildOptionTile(context,
          icon: Icons.message,
          title: 'Messages & Broadcast',
          subtitle: 'Communiquer avec les membres',
-          onTap: () {
-            Navigator.pushNamed(context, '/messages');
-          },
+          onTap: () => Navigator.pushNamed(context, '/messages'),
        ),
-        _buildSectionTitle('Rapports & Analytics'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Rapports & Analytics'),
+        _buildOptionTile(context,
          icon: Icons.assessment,
          title: 'Rapports & Analytics',
          subtitle: 'Statistiques détaillées',
-          onTap: () {
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => const ReportsPageWrapper()),
-            );
-          },
+          onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (_) => const ReportsPageWrapper())),
        ),
      ]);
    }

-    // Options Modérateur (Communication limitée)
    if (state.effectiveRole == UserRole.moderator) {
      options.addAll([
-        _buildSectionTitle('Communication'),
-        _buildOptionTile(
+        _buildSectionTitle(context, 'Communication'),
+        _buildOptionTile(context,
          icon: Icons.message,
          title: 'Messages aux membres',
          subtitle: 'Communiquer avec les membres',
-          onTap: () {
-            Navigator.pushNamed(context, '/messages');
-          },
+          onTap: () => Navigator.pushNamed(context, '/messages'),
        ),
      ]);
    }
@@ -223,129 +197,83 @@ class MorePage extends StatelessWidget {

  List<Widget> _buildCommonOptions(BuildContext context) {
    return [
-      _buildSectionTitle('Général'),
-      _buildOptionTile(
-        icon: Icons.person_outline,
-        title: 'Mon profil',
-        subtitle: 'Voir et modifier mon profil',
-        onTap: () {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const ProfilePageWrapper()),
-          );
-        },
-      ),
-      _buildOptionTile(
+      _buildSectionTitle(context, 'Général'),
+      _buildOptionTile(context,
        icon: Icons.payment,
        title: 'Cotisations',
        subtitle: 'Gérer les cotisations',
-        onTap: () {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const CotisationsPageWrapper()),
-          );
-        },
+        onTap: () => Navigator.of(context).push(
+            MaterialPageRoute(builder: (_) => const CotisationsPageWrapper())),
      ),
-      _buildOptionTile(
+      _buildOptionTile(context,
        icon: Icons.how_to_reg,
        title: 'Demandes d\'adhésion',
        subtitle: 'Demandes d\'adhésion à une organisation',
-        onTap: () {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const AdhesionsPageWrapper()),
-          );
-        },
+        onTap: () => Navigator.of(context).push(
+            MaterialPageRoute(builder: (_) => const AdhesionsPageWrapper())),
      ),
-      _buildOptionTile(
+      _buildOptionTile(context,
        icon: Icons.volunteer_activism,
        title: 'Demandes d\'aide',
        subtitle: 'Solidarité – demandes d\'aide',
-        onTap: () {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const DemandesAidePageWrapper()),
-          );
-        },
+        onTap: () => Navigator.of(context).push(
+            MaterialPageRoute(builder: (_) => const DemandesAidePageWrapper())),
      ),
-      _buildOptionTile(
+      _buildOptionTile(context,
        icon: Icons.savings_outlined,
        title: 'Comptes épargne',
        subtitle: 'Mutuelle épargne – dépôts (LCB-FT)',
-        onTap: () {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const EpargnePage()),
-          );
-        },
-      ),
-      const SizedBox(height: 8),
-      _buildOptionTile(
-        icon: Icons.logout,
-        title: 'Déconnexion',
-        subtitle: 'Se déconnecter de l\'application',
-        color: AppColors.error,
-        onTap: () {
-          showDialog<void>(
-            context: context,
-            builder: (ctx) => AlertDialog(
-              title: const Text('Déconnexion'),
-              content: const Text('Voulez-vous vraiment vous déconnecter ?'),
-              actions: [
-                TextButton(
-                  onPressed: () => Navigator.of(ctx).pop(),
-                  child: const Text('Annuler'),
-                ),
-                TextButton(
-                  onPressed: () {
-                    Navigator.of(ctx).pop();
-                    context.read<AuthBloc>().add(AuthLogoutRequested());
-                  },
-                  style: TextButton.styleFrom(foregroundColor: AppColors.error),
-                  child: const Text('Déconnecter'),
-                ),
-              ],
-            ),
-          );
-        },
+        onTap: () => Navigator.of(context).push(
+            MaterialPageRoute(builder: (_) => const EpargnePage())),
      ),
    ];
  }

-  Widget _buildSectionTitle(String title) {
+  Widget _buildSectionTitle(BuildContext context, String title) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
    return Padding(
-      padding: const EdgeInsets.only(top: 24, bottom: 8, left: 4),
+      padding: const EdgeInsets.only(top: 16, bottom: 6, left: 4),
      child: Text(
        title.toUpperCase(),
        style: AppTypography.subtitleSmall.copyWith(
          fontWeight: FontWeight.bold,
          letterSpacing: 1.1,
-          color: AppColors.textSecondaryLight,
+          color: isDark ? AppColors.textSecondaryDark : AppColors.textSecondaryLight,
        ),
      ),
    );
  }

-  Widget _buildOptionTile({
+  Widget _buildOptionTile(
+    BuildContext context, {
    required IconData icon,
    required String title,
    required String subtitle,
    required VoidCallback onTap,
-    Color? color,
+    Color? accentColor,
  }) {
-    final effectiveColor = color ?? AppColors.primaryGreen;
-    
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final accent = accentColor ?? AppColors.primaryGreen;
+    final titleColor = accentColor != null
+        ? accentColor
+        : (isDark ? AppColors.textPrimaryDark : AppColors.textPrimaryLight);
+    final subtitleColor =
+        isDark ? AppColors.textSecondaryDark : AppColors.textSecondaryLight;
+    final chevronColor =
+        isDark ? AppColors.textSecondaryDark : AppColors.textSecondaryLight;
+
    return CoreCard(
      margin: const EdgeInsets.only(bottom: 8),
      onTap: onTap,
      child: Row(
        children: [
          Container(
-            padding: const EdgeInsets.all(8),
+            padding: const EdgeInsets.all(7),
            decoration: BoxDecoration(
-              color: effectiveColor.withOpacity(0.1),
+              color: accent.withOpacity(isDark ? 0.2 : 0.1),
              borderRadius: BorderRadius.circular(8),
            ),
-            child: Icon(
-              icon,
-              color: effectiveColor,
-              size: 20,
-            ),
+            child: Icon(icon, color: accent, size: 18),
          ),
          const SizedBox(width: 16),
          Expanded(
@@ -354,22 +282,16 @@ class MorePage extends StatelessWidget {
              children: [
                Text(
                  title,
-                  style: AppTypography.actionText.copyWith(
-                    color: color ?? AppColors.textPrimaryLight,
-                  ),
+                  style: AppTypography.actionText.copyWith(color: titleColor),
                ),
                Text(
                  subtitle,
-                  style: AppTypography.subtitleSmall,
+                  style: AppTypography.subtitleSmall.copyWith(color: subtitleColor),
                ),
              ],
            ),
          ),
-          const Icon(
-            Icons.chevron_right,
-            color: AppColors.textSecondaryLight,
-            size: 16,
-          ),
+          Icon(Icons.chevron_right, color: chevronColor, size: 16),
        ],
      ),
    );