feat(#211,#212): sélecteur couple bandeau + état vide Cartes

Closes #211
Closes #212

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-10-11 11:05:04 +02:00
co-authored by Cursor
parent f7ae13a909
commit b2c0e12066
7 changed files with 278 additions and 214 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

@@ -10,7 +10,7 @@ import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart'; import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169). /// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169).
/// Colonne gauche : sélecteur couple (#170) + feed bulles (#174). /// Contexte couple dans le bandeau (#211) ; colonne gauche = feed (#174).
/// Création « Ajouter une carte » : modale générique (#175, réutilisée #176). /// Création « Ajouter une carte » : modale générique (#175, réutilisée #176).
class AmDashboardScreen extends StatefulWidget { class AmDashboardScreen extends StatefulWidget {
const AmDashboardScreen({super.key}); const AmDashboardScreen({super.key});
@@ -108,16 +108,17 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
userEmail: _user?.email, userEmail: _user?.email,
onProfileTap: () => _soon('Profil'), onProfileTap: () => _soon('Profil'),
onSettingsTap: () => _soon('Paramètres'), onSettingsTap: () => _soon('Paramètres'),
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
onSearchAmTap: null, onSearchAmTap: null,
leftColumn: _LeftColumn( contextSelector: CoupleSelectorBandeau(
mode: CoupleBandeauMode.assistanteMaternelle,
couples: _couples, couples: _couples,
selectedCoupleId: _selectedCoupleId, selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading, loading: _couplesLoading,
error: _couplesError, errorMessage: _couplesError,
onRetry: _loadCouples, onRetry: _loadCouples,
onCoupleSelected: _selectCouple, onCoupleSelected: _selectCouple,
), ),
leftColumn: _LeftColumn(selectedCoupleId: _selectedCoupleId),
centerColumn: const QuotidienColumnPlaceholder( centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog', title: 'Blog',
subtitle: subtitle:
@@ -139,49 +140,17 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
} }
} }
/// Colonne gauche : bandeau couple AM (#170) puis flux de cartes (#174 / #175). /// Colonne gauche : flux de cartes (#174 / #175). Couple = bandeau (#211).
class _LeftColumn extends StatelessWidget { class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId; final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({ const _LeftColumn({required this.selectedCoupleId});
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.all(14), padding: const EdgeInsets.all(14),
child: Column( child: CartesFeed(placementId: selectedCoupleId),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
CoupleSelectorBandeau(
mode: CoupleBandeauMode.assistanteMaternelle,
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
Expanded(
child: CartesFeed(
placementId: selectedCoupleId,
),
),
],
),
); );
} }
} }
@@ -10,7 +10,7 @@ import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart'; import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166). /// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
/// Colonne gauche : sélecteur de couple (#167) + feed bulles (#173). /// Contexte couple dans le bandeau (#211) ; colonne gauche = feed (#173).
class ParentDashboardScreen extends StatefulWidget { class ParentDashboardScreen extends StatefulWidget {
const ParentDashboardScreen({super.key}); const ParentDashboardScreen({super.key});
@@ -108,14 +108,15 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
onProfileTap: () => _soon('Profil'), onProfileTap: () => _soon('Profil'),
onSearchAmTap: () => _soon('Recherche AM'), onSearchAmTap: () => _soon('Recherche AM'),
onSettingsTap: () => _soon('Paramètres'), onSettingsTap: () => _soon('Paramètres'),
leftColumn: _LeftColumn( contextSelector: CoupleSelectorBandeau(
couples: _couples, couples: _couples,
selectedCoupleId: _selectedCoupleId, selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading, loading: _couplesLoading,
error: _couplesError, errorMessage: _couplesError,
onRetry: _loadCouples, onRetry: _loadCouples,
onCoupleSelected: _selectCouple, onCoupleSelected: _selectCouple,
), ),
leftColumn: _LeftColumn(selectedCoupleId: _selectedCoupleId),
centerColumn: const QuotidienColumnPlaceholder( centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog', title: 'Blog',
subtitle: subtitle:
@@ -137,47 +138,17 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
} }
} }
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 / #175). /// Colonne gauche : flux de cartes (#173 / #175). Couple = bandeau (#211).
class _LeftColumn extends StatelessWidget { class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId; final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({ const _LeftColumn({required this.selectedCoupleId});
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.all(14), padding: const EdgeInsets.all(14),
child: Column( child: CartesFeed(placementId: selectedCoupleId),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
CoupleSelectorBandeau(
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
Expanded(
child: CartesFeed(
placementId: selectedCoupleId,
),
),
],
),
); );
} }
} }
+60 -11
View File
@@ -442,17 +442,7 @@ class _CartesFeedState extends State<CartesFeed> {
); );
} }
if (_items.isEmpty) { if (_items.isEmpty) {
return Center( return const _CartesEmptyState();
child: Text(
'Aucune bulle pour le moment.\nLa file d’attention est vide — c’est normal.',
textAlign: TextAlign.center,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.muted,
height: 1.4,
),
),
);
} }
return NotificationListener<ScrollMetricsNotification>( return NotificationListener<ScrollMetricsNotification>(
@@ -1191,6 +1181,65 @@ class _RefuseDialogState extends State<_RefuseDialog> {
} }
} }
/// État vide de la file d'attention — ours endormi (#212).
class _CartesEmptyState extends StatelessWidget {
const _CartesEmptyState();
static const _asset = 'assets/images/ours_endormi.png';
@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (context, constraints) {
final maxW = constraints.maxWidth;
// ~160–200 px, réduit si colonne étroite.
final imgW =
maxW.isFinite ? maxW.clamp(100.0, 200.0) : 180.0;
return Center(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: maxW),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Image.asset(
_asset,
width: imgW,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
semanticLabel: 'Ours endormi',
),
const SizedBox(height: 12),
Text(
'File d’attention au repos.',
textAlign: TextAlign.center,
style: GoogleFonts.merienda(
fontSize: 16,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
),
),
const SizedBox(height: 6),
Text(
'Pas de bulle en attente — on respire.',
textAlign: TextAlign.center,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.muted,
height: 1.4,
),
),
],
),
),
),
);
},
);
}
}
/// CTA « Ajouter une carte » — pilule aquarelle en bas du feed (#175). /// CTA « Ajouter une carte » — pilule aquarelle en bas du feed (#175).
class _AjouterCarteCta extends StatelessWidget { class _AjouterCarteCta extends StatelessWidget {
final VoidCallback onTap; final VoidCallback onTap;
@@ -8,12 +8,12 @@ import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM /// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
/// (enfant | parent(s)). Le composant est le même, seule la lecture change. /// (enfant | parent(s)). Le composant est le même, seule la lecture change.
/// Ticket #167 (parent) ; #170 réutilise en mode AM. /// Ticket #167 (parent) ; #170 (AM) ; #211 (compact dans le bandeau haut).
enum CoupleBandeauMode { parent, assistanteMaternelle } enum CoupleBandeauMode { parent, assistanteMaternelle }
/// Bandeau « couple de garde » en haut de la colonne gauche du TdB. /// Sélecteur « couple de garde » compact dans le bandeau haut (#211).
/// ///
/// - Plusieurs couples → contrôle unique avec chevron (dropdown de bascule). /// - Plusieurs couples → contrôle unique avec chevron (menu de bascule).
/// - Un seul couple → affichage informatif (pas de chevron, pas de menu). /// - Un seul couple → affichage informatif (pas de chevron, pas de menu).
/// - Aucun couple → état vide discret. /// - Aucun couple → état vide discret.
class CoupleSelectorBandeau extends StatelessWidget { class CoupleSelectorBandeau extends StatelessWidget {
@@ -25,6 +25,9 @@ class CoupleSelectorBandeau extends StatelessWidget {
final String? errorMessage; final String? errorMessage;
final VoidCallback? onRetry; final VoidCallback? onRetry;
static const double height = 40;
static const double avatarSize = 28;
const CoupleSelectorBandeau({ const CoupleSelectorBandeau({
super.key, super.key,
this.mode = CoupleBandeauMode.parent, this.mode = CoupleBandeauMode.parent,
@@ -38,7 +41,7 @@ class CoupleSelectorBandeau extends StatelessWidget {
CoupleGarde? get _selected { CoupleGarde? get _selected {
if (couples.isEmpty) return null; if (couples.isEmpty) return null;
if (selectedCoupleId != null) { if (selectedCoupleId != null) {
for (final c in couples) { for (final c in couples) {
if (c.id == selectedCoupleId) return c; if (c.id == selectedCoupleId) return c;
} }
@@ -79,11 +82,12 @@ class CoupleSelectorBandeau extends StatelessWidget {
), ),
child: PopupMenuButton<String>( child: PopupMenuButton<String>(
tooltip: 'Changer de garde', tooltip: 'Changer de garde',
// L'offset doit être suffisant pour descendre sous la carte (qui fait 90px). offset: const Offset(0, height + 6),
offset: const Offset(0, 95), color: Colors.transparent,
color: Colors.transparent, // Le fond devient invisible elevation: 0,
elevation: 0, // Pas d'ombre carrée constraints: BoxConstraints.tightFor(
constraints: BoxConstraints.tightFor(width: constraints.maxWidth), width: constraints.maxWidth.clamp(180, 320),
),
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
onSelected: (id) { onSelected: (id) {
final chosen = couples.firstWhere((c) => c.id == id); final chosen = couples.firstWhere((c) => c.id == id);
@@ -95,15 +99,14 @@ class CoupleSelectorBandeau extends StatelessWidget {
PopupMenuItem<String>( PopupMenuItem<String>(
value: c.id, value: c.id,
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
height: 100, // Hauteur de la carte (90) + un peu de marge (10) height: height + 8,
child: Padding( child: Padding(
padding: const EdgeInsets.only(bottom: 10), padding: const EdgeInsets.only(bottom: 6),
child: _CoupleCard( child: _CoupleCard(
mode: mode, mode: mode,
couple: c, couple: c,
showChevron: false, showChevron: false,
selected: false, selected: false,
isMenuItem: true,
colorIndex: couples.indexOf(c), colorIndex: couples.indexOf(c),
), ),
), ),
@@ -116,13 +119,12 @@ class CoupleSelectorBandeau extends StatelessWidget {
} }
} }
/// Carte principale : enfant à gauche, séparateur, AM/parents à droite. /// Carte compacte : enfant | AM/parents (+ chevron si multi).
class _CoupleCard extends StatelessWidget { class _CoupleCard extends StatelessWidget {
final CoupleBandeauMode mode; final CoupleBandeauMode mode;
final CoupleGarde couple; final CoupleGarde couple;
final bool showChevron; final bool showChevron;
final bool selected; final bool selected;
final bool isMenuItem;
final int colorIndex; final int colorIndex;
const _CoupleCard({ const _CoupleCard({
@@ -130,11 +132,9 @@ class _CoupleCard extends StatelessWidget {
required this.couple, required this.couple,
required this.showChevron, required this.showChevron,
this.selected = true, this.selected = true,
this.isMenuItem = false,
required this.colorIndex, required this.colorIndex,
}); });
/// Libellé parents côté AM : « Sophie » ou « Thomas et Claire ».
static String _parentsLabel(List<CoupleMembre> parents) { static String _parentsLabel(List<CoupleMembre> parents) {
if (parents.isEmpty) return 'Parents'; if (parents.isEmpty) return 'Parents';
String prenomOf(CoupleMembre p) { String prenomOf(CoupleMembre p) {
@@ -142,20 +142,18 @@ class _CoupleCard extends StatelessWidget {
if (prenom.isNotEmpty) return prenom; if (prenom.isNotEmpty) return prenom;
return p.displayName(fallback: 'Parent'); return p.displayName(fallback: 'Parent');
} }
if (parents.length == 1) return prenomOf(parents.first); if (parents.length == 1) return prenomOf(parents.first);
return '${prenomOf(parents[0])} et ${prenomOf(parents[1])}'; return '${prenomOf(parents[0])} et ${prenomOf(parents[1])}';
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// Parent mode: enfant | AM (photo + prénom)
// AM mode: enfant | parent(s) — texte seul, pas de vignette parent
final isParentMode = mode == CoupleBandeauMode.parent; final isParentMode = mode == CoupleBandeauMode.parent;
Widget amOrParentsWidget; final Widget right;
if (isParentMode) { if (isParentMode) {
amOrParentsWidget = _MembreTile( right = _MembreTile(
photoUrl: couple.am?.photoUrl, photoUrl: couple.am?.photoUrl,
name: (couple.am?.prenom != null && couple.am!.prenom!.isNotEmpty) name: (couple.am?.prenom != null && couple.am!.prenom!.isNotEmpty)
? couple.am!.prenom! ? couple.am!.prenom!
@@ -163,28 +161,28 @@ class _CoupleCard extends StatelessWidget {
fallbackIcon: Icons.volunteer_activism, fallbackIcon: Icons.volunteer_activism,
); );
} else { } else {
amOrParentsWidget = Text( right = Text(
_parentsLabel(couple.parents), _parentsLabel(couple.parents),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda( style: GoogleFonts.merienda(
fontSize: 22, fontSize: 13,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
color: QuotidienTheme.ink, color: QuotidienTheme.ink,
), ),
); );
} }
return Carte.bandeau( return Opacity(
assetPath: QuotidienTheme opacity: selected ? 1 : 0.92,
.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length], child: Carte.bandeau(
height: 90, assetPath: QuotidienTheme
padding: const EdgeInsets.symmetric(horizontal: 24), .bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length],
child: Row( height: CoupleSelectorBandeau.height,
children: [ padding: const EdgeInsets.symmetric(horizontal: 10),
Expanded( child: Row(
child: Padding( children: [
padding: const EdgeInsets.only(right: 12), Expanded(
child: _MembreTile( child: _MembreTile(
photoUrl: couple.enfant.photoUrl, photoUrl: couple.enfant.photoUrl,
name: (couple.enfant.prenom != null && name: (couple.enfant.prenom != null &&
@@ -194,39 +192,34 @@ class _CoupleCard extends StatelessWidget {
fallbackIcon: Icons.child_care, fallbackIcon: Icons.child_care,
), ),
), ),
), Container(
Container( width: 5,
width: 8, height: 22,
height: 44, margin: const EdgeInsets.symmetric(horizontal: 4),
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset), image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
fit: BoxFit.contain, fit: BoxFit.contain,
),
), ),
), ),
), Expanded(child: right),
Expanded( if (showChevron)
child: Padding( const Icon(
padding: const EdgeInsets.only(left: 12), Icons.keyboard_arrow_down,
child: amOrParentsWidget, size: 18,
), color: QuotidienTheme.ink,
), )
SizedBox( else
width: 28, const SizedBox(width: 4),
child: showChevron ],
? const Icon( ),
Icons.keyboard_arrow_down,
color: QuotidienTheme.ink,
)
: null,
),
],
), ),
); );
} }
} }
/// Photo ronde + nom (une moitié du couple). /// Photo ronde + prénom (une moitié du couple).
class _MembreTile extends StatelessWidget { class _MembreTile extends StatelessWidget {
final String? photoUrl; final String? photoUrl;
final String name; final String name;
@@ -242,16 +235,20 @@ class _MembreTile extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return Row(
children: [ children: [
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 64), _Avatar(
const SizedBox(width: 12), photoUrl: photoUrl,
fallbackIcon: fallbackIcon,
size: CoupleSelectorBandeau.avatarSize,
),
const SizedBox(width: 6),
Expanded( Expanded(
child: Text( child: Text(
name, name,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda( style: GoogleFonts.merienda(
fontSize: 22, fontSize: 13,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
color: QuotidienTheme.ink, color: QuotidienTheme.ink,
), ),
), ),
@@ -279,7 +276,7 @@ class _Avatar extends StatelessWidget {
width: size, width: size,
height: size, height: size,
color: QuotidienTheme.lavender.withValues(alpha: 0.35), color: QuotidienTheme.lavender.withValues(alpha: 0.35),
child: Icon(fallbackIcon, size: size * 0.5, color: QuotidienTheme.ink), child: Icon(fallbackIcon, size: size * 0.55, color: QuotidienTheme.ink),
); );
return ClipOval( return ClipOval(
child: SizedBox( child: SizedBox(
@@ -311,11 +308,11 @@ class _CoupleBandeauSkeleton extends StatelessWidget {
), ),
child: Carte.bandeau( child: Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime, assetPath: QuotidienTheme.bandeauLime,
height: 90, height: CoupleSelectorBandeau.height,
child: const Center( child: const Center(
child: SizedBox( child: SizedBox(
width: 26, width: 18,
height: 26, height: 18,
child: CircularProgressIndicator(strokeWidth: 2), child: CircularProgressIndicator(strokeWidth: 2),
), ),
), ),
@@ -331,17 +328,19 @@ class _CoupleBandeauEmpty extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Carte.bandeau( return Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime, assetPath: QuotidienTheme.bandeauLime,
height: 90, height: CoupleSelectorBandeau.height,
padding: const EdgeInsets.symmetric(horizontal: 24), padding: const EdgeInsets.symmetric(horizontal: 10),
child: Row( child: Row(
children: [ children: [
const Icon(Icons.info_outline, color: QuotidienTheme.muted), const Icon(Icons.info_outline, size: 18, color: QuotidienTheme.muted),
const SizedBox(width: 12), const SizedBox(width: 8),
Expanded( Expanded(
child: Text( child: Text(
'Aucune garde active pour le moment.', 'Aucune garde active',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merriweather( style: GoogleFonts.merriweather(
fontSize: 14, fontSize: 12,
color: QuotidienTheme.muted, color: QuotidienTheme.muted,
), ),
), ),
@@ -367,25 +366,30 @@ class _CoupleBandeauError extends StatelessWidget {
), ),
child: Carte.bandeau( child: Carte.bandeau(
assetPath: QuotidienTheme.bandeauLime, assetPath: QuotidienTheme.bandeauLime,
height: 90, height: CoupleSelectorBandeau.height,
padding: const EdgeInsets.symmetric(horizontal: 24), padding: const EdgeInsets.symmetric(horizontal: 8),
child: Row( child: Row(
children: [ children: [
const Icon(Icons.error_outline, color: QuotidienTheme.ink), const Icon(Icons.error_outline, size: 18, color: QuotidienTheme.ink),
const SizedBox(width: 12), const SizedBox(width: 6),
Expanded( Expanded(
child: Text( child: Text(
message, message,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merriweather( style: GoogleFonts.merriweather(
fontSize: 13, fontSize: 11,
color: QuotidienTheme.ink, color: QuotidienTheme.ink,
), ),
), ),
), ),
if (onRetry != null) if (onRetry != null)
TextButton( IconButton(
onPressed: onRetry, onPressed: onRetry,
child: const Text('Réessayer'), icon: const Icon(Icons.refresh, size: 18),
tooltip: 'Réessayer',
padding: EdgeInsets.zero,
constraints: const BoxConstraints(minWidth: 28, minHeight: 28),
), ),
], ],
), ),
@@ -5,25 +5,31 @@ import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/widgets/image_button.dart'; import 'package:p_tits_pas/widgets/image_button.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart'; import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
/// Bandeau quotidien pastel : logo · pastilles Cahier de liaison / Agenda / /// Bandeau quotidien pastel : logo · [contexte couple] · pastilles · menu user.
/// Contrat · menu user. /// Réutilisable parent (#166) et AM (#169) ; couple compact (#211).
/// Réutilisable parent (#166) et AM (#169).
class QuotidienBandeau extends StatelessWidget { class QuotidienBandeau extends StatelessWidget {
final QuotidienNavSection selectedSection; final QuotidienNavSection selectedSection;
final ValueChanged<QuotidienNavSection> onSectionSelected; final ValueChanged<QuotidienNavSection> onSectionSelected;
final String userDisplayName; final String userDisplayName;
final String? userEmail; final String? userEmail;
/// Sélecteur de couple compact, juste après le logo (~280 px).
final Widget? contextSelector;
final VoidCallback? onProfileTap; final VoidCallback? onProfileTap;
final VoidCallback? onSearchAmTap; final VoidCallback? onSearchAmTap;
final VoidCallback? onSettingsTap; final VoidCallback? onSettingsTap;
final VoidCallback? onLogout; final VoidCallback? onLogout;
static const double contextSelectorMaxWidth = 280;
const QuotidienBandeau({ const QuotidienBandeau({
super.key, super.key,
required this.selectedSection, required this.selectedSection,
required this.onSectionSelected, required this.onSectionSelected,
required this.userDisplayName, required this.userDisplayName,
this.userEmail, this.userEmail,
this.contextSelector,
this.onProfileTap, this.onProfileTap,
this.onSearchAmTap, this.onSearchAmTap,
this.onSettingsTap, this.onSettingsTap,
@@ -32,28 +38,61 @@ class QuotidienBandeau extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// 3 zones : gauche (logo + couple vers le centre) · pastilles · menu.
// Les Expanded gauche/droite équilibrent le centrage des pastilles.
return Padding( return Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 16, 8), padding: const EdgeInsets.fromLTRB(16, 12, 16, 8),
child: Row( child: Row(
children: [ children: [
Image.asset( Expanded(
QuotidienTheme.logoAsset, child: Row(
height: 44, children: [
fit: BoxFit.contain, Image.asset(
QuotidienTheme.logoAsset,
height: 44,
fit: BoxFit.contain,
),
if (contextSelector != null) ...[
const SizedBox(width: 16),
Flexible(
child: Align(
// Pousse le couple vers le centre du bandeau.
alignment: Alignment.centerRight,
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: contextSelectorMaxWidth,
),
child: contextSelector!,
),
),
),
],
],
),
), ),
const Spacer(), const SizedBox(width: 8),
_NavPills( Flexible(
selected: selectedSection, flex: 2,
onSelected: onSectionSelected, child: Center(
child: _NavPills(
selected: selectedSection,
onSelected: onSectionSelected,
),
),
), ),
const Spacer(), const SizedBox(width: 8),
_UserMenu( Expanded(
displayName: userDisplayName, child: Align(
email: userEmail, alignment: Alignment.centerRight,
onProfileTap: onProfileTap, child: _UserMenu(
onSearchAmTap: onSearchAmTap, displayName: userDisplayName,
onSettingsTap: onSettingsTap, email: userEmail,
onLogout: onLogout, onProfileTap: onProfileTap,
onSearchAmTap: onSearchAmTap,
onSettingsTap: onSettingsTap,
onLogout: onLogout,
),
),
), ),
], ],
), ),
@@ -70,51 +109,78 @@ class _NavPills extends StatelessWidget {
required this.onSelected, required this.onSelected,
}); });
static const double _pillHeight = 46;
static const double _gap = 10;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return LayoutBuilder(
mainAxisSize: MainAxisSize.min, builder: (context, constraints) {
children: [ final naturalW = _pillHeight * QuotidienTheme.pillAspectRatio;
_pill( final naturalTotal = 3 * naturalW + 2 * _gap;
label: 'Cahier de liaison', final maxW = constraints.maxWidth;
section: QuotidienNavSection.liaison, // Réduit proportionnellement si la fenêtre est trop étroite
), // (évite l’overflow jaune/noir sur les pastilles).
const SizedBox(width: 10), final scale = maxW.isFinite && maxW > 0 && maxW < naturalTotal
_pill( ? (maxW / naturalTotal).clamp(0.55, 1.0)
label: 'Agenda', : 1.0;
section: QuotidienNavSection.agenda, final h = _pillHeight * scale;
), final w = naturalW * scale;
const SizedBox(width: 10), final g = _gap * scale;
_pill( final fontSize = (14 * scale).clamp(10.0, 14.0);
label: 'Contrat',
section: QuotidienNavSection.contrat, return Row(
), mainAxisSize: MainAxisSize.min,
], mainAxisAlignment: MainAxisAlignment.center,
children: [
_pill(
label: 'Cahier de liaison',
section: QuotidienNavSection.liaison,
width: w,
height: h,
fontSize: fontSize,
),
SizedBox(width: g),
_pill(
label: 'Agenda',
section: QuotidienNavSection.agenda,
width: w,
height: h,
fontSize: fontSize,
),
SizedBox(width: g),
_pill(
label: 'Contrat',
section: QuotidienNavSection.contrat,
width: w,
height: h,
fontSize: fontSize,
),
],
);
},
); );
} }
Widget _pill({ Widget _pill({
required String label, required String label,
required QuotidienNavSection section, required QuotidienNavSection section,
required double width,
required double height,
required double fontSize,
}) { }) {
final active = selected == section; final active = selected == section;
// Même famille que l’inscription : fonds « dessinés » (pas Material).
// Les deux pastilles ont la même silhouette (ratio ~4:1) : la largeur
// est dérivée de la hauteur pour ne jamais déformer le PNG.
// Chaque section garde sa couleur ; l'inactive est juste plus claire.
return ImageButton( return ImageButton(
bg: QuotidienTheme.pillAssetFor(section), bg: QuotidienTheme.pillAssetFor(section),
bgOpacity: active ? 1.0 : QuotidienTheme.pillInactiveOpacity, bgOpacity: active ? 1.0 : QuotidienTheme.pillInactiveOpacity,
width: _pillHeight * QuotidienTheme.pillAspectRatio, width: width,
height: _pillHeight, height: height,
text: label, text: label,
textColor: QuotidienTheme.ink, textColor: QuotidienTheme.ink,
fontSize: 14, fontSize: fontSize,
onPressed: () => onSelected(section), onPressed: () => onSelected(section),
); );
} }
static const double _pillHeight = 46;
} }
class _UserMenu extends StatelessWidget { class _UserMenu extends StatelessWidget {
@@ -16,7 +16,7 @@ class QuotidienShell extends StatelessWidget {
final VoidCallback? onSettingsTap; final VoidCallback? onSettingsTap;
final VoidCallback? onLogout; final VoidCallback? onLogout;
/// Colonne gauche (couple + cartes + actions). /// Colonne gauche (cartes + actions).
final Widget leftColumn; final Widget leftColumn;
/// Colonne milieu (blog). /// Colonne milieu (blog).
@@ -25,6 +25,9 @@ class QuotidienShell extends StatelessWidget {
/// Colonne droite (messagerie). /// Colonne droite (messagerie).
final Widget rightColumn; final Widget rightColumn;
/// Sélecteur de couple compact dans le bandeau haut (#211).
final Widget? contextSelector;
/// Corps affiché hors Cahier de liaison (Agenda / Contrat stubs). /// Corps affiché hors Cahier de liaison (Agenda / Contrat stubs).
final Widget? agendaBody; final Widget? agendaBody;
final Widget? contratBody; final Widget? contratBody;
@@ -37,6 +40,7 @@ class QuotidienShell extends StatelessWidget {
required this.leftColumn, required this.leftColumn,
required this.centerColumn, required this.centerColumn,
required this.rightColumn, required this.rightColumn,
this.contextSelector,
this.userEmail, this.userEmail,
this.onProfileTap, this.onProfileTap,
this.onSearchAmTap, this.onSearchAmTap,
@@ -59,6 +63,7 @@ class QuotidienShell extends StatelessWidget {
onSectionSelected: onSectionSelected, onSectionSelected: onSectionSelected,
userDisplayName: userDisplayName, userDisplayName: userDisplayName,
userEmail: userEmail, userEmail: userEmail,
contextSelector: contextSelector,
onProfileTap: onProfileTap, onProfileTap: onProfileTap,
onSearchAmTap: onSearchAmTap, onSearchAmTap: onSearchAmTap,
onSettingsTap: onSettingsTap, onSettingsTap: onSettingsTap,