feat(#211): sélecteur couple compact dans le bandeau
Déplace le contexte de garde (parent/AM) à côté du logo et retire le gros bandeau de la colonne Cartes. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -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
|
||||
/// (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 }
|
||||
|
||||
/// 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).
|
||||
/// - Aucun couple → état vide discret.
|
||||
class CoupleSelectorBandeau extends StatelessWidget {
|
||||
@@ -25,6 +25,9 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
||||
final String? errorMessage;
|
||||
final VoidCallback? onRetry;
|
||||
|
||||
static const double height = 40;
|
||||
static const double avatarSize = 28;
|
||||
|
||||
const CoupleSelectorBandeau({
|
||||
super.key,
|
||||
this.mode = CoupleBandeauMode.parent,
|
||||
@@ -38,7 +41,7 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
||||
|
||||
CoupleGarde? get _selected {
|
||||
if (couples.isEmpty) return null;
|
||||
if (selectedCoupleId != null) {
|
||||
if (selectedCoupleId != null) {
|
||||
for (final c in couples) {
|
||||
if (c.id == selectedCoupleId) return c;
|
||||
}
|
||||
@@ -79,11 +82,12 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
||||
),
|
||||
child: PopupMenuButton<String>(
|
||||
tooltip: 'Changer de garde',
|
||||
// L'offset doit être suffisant pour descendre sous la carte (qui fait 90px).
|
||||
offset: const Offset(0, 95),
|
||||
color: Colors.transparent, // Le fond devient invisible
|
||||
elevation: 0, // Pas d'ombre carrée
|
||||
constraints: BoxConstraints.tightFor(width: constraints.maxWidth),
|
||||
offset: const Offset(0, height + 6),
|
||||
color: Colors.transparent,
|
||||
elevation: 0,
|
||||
constraints: BoxConstraints.tightFor(
|
||||
width: constraints.maxWidth.clamp(180, 320),
|
||||
),
|
||||
padding: EdgeInsets.zero,
|
||||
onSelected: (id) {
|
||||
final chosen = couples.firstWhere((c) => c.id == id);
|
||||
@@ -95,15 +99,14 @@ class CoupleSelectorBandeau extends StatelessWidget {
|
||||
PopupMenuItem<String>(
|
||||
value: c.id,
|
||||
padding: EdgeInsets.zero,
|
||||
height: 100, // Hauteur de la carte (90) + un peu de marge (10)
|
||||
height: height + 8,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
padding: const EdgeInsets.only(bottom: 6),
|
||||
child: _CoupleCard(
|
||||
mode: mode,
|
||||
couple: c,
|
||||
showChevron: false,
|
||||
selected: false,
|
||||
isMenuItem: true,
|
||||
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 {
|
||||
final CoupleBandeauMode mode;
|
||||
final CoupleGarde couple;
|
||||
final bool showChevron;
|
||||
final bool selected;
|
||||
final bool isMenuItem;
|
||||
final int colorIndex;
|
||||
|
||||
const _CoupleCard({
|
||||
@@ -130,11 +132,9 @@ class _CoupleCard extends StatelessWidget {
|
||||
required this.couple,
|
||||
required this.showChevron,
|
||||
this.selected = true,
|
||||
this.isMenuItem = false,
|
||||
required this.colorIndex,
|
||||
});
|
||||
|
||||
/// Libellé parents côté AM : « Sophie » ou « Thomas et Claire ».
|
||||
static String _parentsLabel(List<CoupleMembre> parents) {
|
||||
if (parents.isEmpty) return 'Parents';
|
||||
String prenomOf(CoupleMembre p) {
|
||||
@@ -142,20 +142,18 @@ class _CoupleCard extends StatelessWidget {
|
||||
if (prenom.isNotEmpty) return prenom;
|
||||
return p.displayName(fallback: 'Parent');
|
||||
}
|
||||
|
||||
if (parents.length == 1) return prenomOf(parents.first);
|
||||
return '${prenomOf(parents[0])} et ${prenomOf(parents[1])}';
|
||||
}
|
||||
|
||||
@override
|
||||
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;
|
||||
|
||||
Widget amOrParentsWidget;
|
||||
|
||||
final Widget right;
|
||||
if (isParentMode) {
|
||||
amOrParentsWidget = _MembreTile(
|
||||
right = _MembreTile(
|
||||
photoUrl: couple.am?.photoUrl,
|
||||
name: (couple.am?.prenom != null && couple.am!.prenom!.isNotEmpty)
|
||||
? couple.am!.prenom!
|
||||
@@ -163,28 +161,28 @@ class _CoupleCard extends StatelessWidget {
|
||||
fallbackIcon: Icons.volunteer_activism,
|
||||
);
|
||||
} else {
|
||||
amOrParentsWidget = Text(
|
||||
right = Text(
|
||||
_parentsLabel(couple.parents),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
return Carte.bandeau(
|
||||
assetPath: QuotidienTheme
|
||||
.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length],
|
||||
height: 90,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(right: 12),
|
||||
return Opacity(
|
||||
opacity: selected ? 1 : 0.92,
|
||||
child: Carte.bandeau(
|
||||
assetPath: QuotidienTheme
|
||||
.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length],
|
||||
height: CoupleSelectorBandeau.height,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: _MembreTile(
|
||||
photoUrl: couple.enfant.photoUrl,
|
||||
name: (couple.enfant.prenom != null &&
|
||||
@@ -194,39 +192,34 @@ class _CoupleCard extends StatelessWidget {
|
||||
fallbackIcon: Icons.child_care,
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
width: 8,
|
||||
height: 44,
|
||||
decoration: const BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
|
||||
fit: BoxFit.contain,
|
||||
Container(
|
||||
width: 5,
|
||||
height: 22,
|
||||
margin: const EdgeInsets.symmetric(horizontal: 4),
|
||||
decoration: const BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
|
||||
fit: BoxFit.contain,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: amOrParentsWidget,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 28,
|
||||
child: showChevron
|
||||
? const Icon(
|
||||
Icons.keyboard_arrow_down,
|
||||
color: QuotidienTheme.ink,
|
||||
)
|
||||
: null,
|
||||
),
|
||||
],
|
||||
Expanded(child: right),
|
||||
if (showChevron)
|
||||
const Icon(
|
||||
Icons.keyboard_arrow_down,
|
||||
size: 18,
|
||||
color: QuotidienTheme.ink,
|
||||
)
|
||||
else
|
||||
const SizedBox(width: 4),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Photo ronde + nom (une moitié du couple).
|
||||
/// Photo ronde + prénom (une moitié du couple).
|
||||
class _MembreTile extends StatelessWidget {
|
||||
final String? photoUrl;
|
||||
final String name;
|
||||
@@ -242,16 +235,20 @@ class _MembreTile extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return Row(
|
||||
children: [
|
||||
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 64),
|
||||
const SizedBox(width: 12),
|
||||
_Avatar(
|
||||
photoUrl: photoUrl,
|
||||
fallbackIcon: fallbackIcon,
|
||||
size: CoupleSelectorBandeau.avatarSize,
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Expanded(
|
||||
child: Text(
|
||||
name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merienda(
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
@@ -279,7 +276,7 @@ class _Avatar extends StatelessWidget {
|
||||
width: size,
|
||||
height: size,
|
||||
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(
|
||||
child: SizedBox(
|
||||
@@ -311,11 +308,11 @@ class _CoupleBandeauSkeleton extends StatelessWidget {
|
||||
),
|
||||
child: Carte.bandeau(
|
||||
assetPath: QuotidienTheme.bandeauLime,
|
||||
height: 90,
|
||||
height: CoupleSelectorBandeau.height,
|
||||
child: const Center(
|
||||
child: SizedBox(
|
||||
width: 26,
|
||||
height: 26,
|
||||
width: 18,
|
||||
height: 18,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
),
|
||||
),
|
||||
@@ -331,17 +328,19 @@ class _CoupleBandeauEmpty extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return Carte.bandeau(
|
||||
assetPath: QuotidienTheme.bandeauLime,
|
||||
height: 90,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
height: CoupleSelectorBandeau.height,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.info_outline, color: QuotidienTheme.muted),
|
||||
const SizedBox(width: 12),
|
||||
const Icon(Icons.info_outline, size: 18, color: QuotidienTheme.muted),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
'Aucune garde active pour le moment.',
|
||||
'Aucune garde active',
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 14,
|
||||
fontSize: 12,
|
||||
color: QuotidienTheme.muted,
|
||||
),
|
||||
),
|
||||
@@ -367,25 +366,30 @@ class _CoupleBandeauError extends StatelessWidget {
|
||||
),
|
||||
child: Carte.bandeau(
|
||||
assetPath: QuotidienTheme.bandeauLime,
|
||||
height: 90,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||
height: CoupleSelectorBandeau.height,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
|
||||
const SizedBox(width: 12),
|
||||
const Icon(Icons.error_outline, size: 18, color: QuotidienTheme.ink),
|
||||
const SizedBox(width: 6),
|
||||
Expanded(
|
||||
child: Text(
|
||||
message,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: GoogleFonts.merriweather(
|
||||
fontSize: 13,
|
||||
fontSize: 11,
|
||||
color: QuotidienTheme.ink,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (onRetry != null)
|
||||
TextButton(
|
||||
IconButton(
|
||||
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/quotidien/quotidien_theme.dart';
|
||||
|
||||
/// Bandeau quotidien pastel : logo · pastilles Cahier de liaison / Agenda /
|
||||
/// Contrat · menu user.
|
||||
/// Réutilisable parent (#166) et AM (#169).
|
||||
/// Bandeau quotidien pastel : logo · [contexte couple] · pastilles · menu user.
|
||||
/// Réutilisable parent (#166) et AM (#169) ; couple compact (#211).
|
||||
class QuotidienBandeau extends StatelessWidget {
|
||||
final QuotidienNavSection selectedSection;
|
||||
final ValueChanged<QuotidienNavSection> onSectionSelected;
|
||||
final String userDisplayName;
|
||||
final String? userEmail;
|
||||
|
||||
/// Sélecteur de couple compact, juste après le logo (~280 px).
|
||||
final Widget? contextSelector;
|
||||
|
||||
final VoidCallback? onProfileTap;
|
||||
final VoidCallback? onSearchAmTap;
|
||||
final VoidCallback? onSettingsTap;
|
||||
final VoidCallback? onLogout;
|
||||
|
||||
static const double contextSelectorMaxWidth = 280;
|
||||
|
||||
const QuotidienBandeau({
|
||||
super.key,
|
||||
required this.selectedSection,
|
||||
required this.onSectionSelected,
|
||||
required this.userDisplayName,
|
||||
this.userEmail,
|
||||
this.contextSelector,
|
||||
this.onProfileTap,
|
||||
this.onSearchAmTap,
|
||||
this.onSettingsTap,
|
||||
@@ -41,10 +47,21 @@ class QuotidienBandeau extends StatelessWidget {
|
||||
height: 44,
|
||||
fit: BoxFit.contain,
|
||||
),
|
||||
if (contextSelector != null) ...[
|
||||
const SizedBox(width: 12),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(
|
||||
maxWidth: contextSelectorMaxWidth,
|
||||
),
|
||||
child: contextSelector!,
|
||||
),
|
||||
],
|
||||
const Spacer(),
|
||||
_NavPills(
|
||||
selected: selectedSection,
|
||||
onSelected: onSectionSelected,
|
||||
Flexible(
|
||||
child: _NavPills(
|
||||
selected: selectedSection,
|
||||
onSelected: onSectionSelected,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
_UserMenu(
|
||||
|
||||
@@ -16,7 +16,7 @@ class QuotidienShell extends StatelessWidget {
|
||||
final VoidCallback? onSettingsTap;
|
||||
final VoidCallback? onLogout;
|
||||
|
||||
/// Colonne gauche (couple + cartes + actions).
|
||||
/// Colonne gauche (cartes + actions).
|
||||
final Widget leftColumn;
|
||||
|
||||
/// Colonne milieu (blog).
|
||||
@@ -25,6 +25,9 @@ class QuotidienShell extends StatelessWidget {
|
||||
/// Colonne droite (messagerie).
|
||||
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).
|
||||
final Widget? agendaBody;
|
||||
final Widget? contratBody;
|
||||
@@ -37,6 +40,7 @@ class QuotidienShell extends StatelessWidget {
|
||||
required this.leftColumn,
|
||||
required this.centerColumn,
|
||||
required this.rightColumn,
|
||||
this.contextSelector,
|
||||
this.userEmail,
|
||||
this.onProfileTap,
|
||||
this.onSearchAmTap,
|
||||
@@ -59,6 +63,7 @@ class QuotidienShell extends StatelessWidget {
|
||||
onSectionSelected: onSectionSelected,
|
||||
userDisplayName: userDisplayName,
|
||||
userEmail: userEmail,
|
||||
contextSelector: contextSelector,
|
||||
onProfileTap: onProfileTap,
|
||||
onSearchAmTap: onSearchAmTap,
|
||||
onSettingsTap: onSettingsTap,
|
||||
|
||||
Reference in New Issue
Block a user