diff --git a/docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md b/docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md index 8f2e521..4bc19d0 100644 --- a/docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md +++ b/docs/31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md @@ -103,7 +103,7 @@ Avec données peuplées, sur au moins 2 supports : - Parent : `frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart` + `dashbord_parent/` - AM : `frontend/lib/screens/am/am_dashboard_screen.dart` (placeholder) -- Cartes couleurs : `frontend/assets/cards/` (7 teintes max) +- Cartes couleurs : `frontend/assets/cards/` (8 teintes max) ## 9. Ordre de build suggéré diff --git a/frontend/assets/cards/card_aqua.png b/frontend/assets/cards/card_aqua.png new file mode 100644 index 0000000..47acd6a Binary files /dev/null and b/frontend/assets/cards/card_aqua.png differ diff --git a/frontend/assets/cards/card_aqua_h.png b/frontend/assets/cards/card_aqua_h.png new file mode 100644 index 0000000..d57837d Binary files /dev/null and b/frontend/assets/cards/card_aqua_h.png differ diff --git a/frontend/lib/models/card_assets.dart b/frontend/lib/models/card_assets.dart index af6982d..68faadb 100644 --- a/frontend/lib/models/card_assets.dart +++ b/frontend/lib/models/card_assets.dart @@ -7,7 +7,8 @@ enum CardColorVertical { lime('assets/cards/card_lime.png'), lavender('assets/cards/card_lavender.png'), green('assets/cards/card_green.png'), - blue('assets/cards/card_blue.png'); + blue('assets/cards/card_blue.png'), + aqua('assets/cards/card_aqua.png'); final String path; const CardColorVertical(this.path); @@ -20,7 +21,8 @@ enum CardColorHorizontal { lime('assets/cards/card_lime_h.png'), lavender('assets/cards/card_lavender_h.png'), green('assets/cards/card_green_h.png'), - blue('assets/cards/card_blue_h.png'); + blue('assets/cards/card_blue_h.png'), + aqua('assets/cards/card_aqua_h.png'); final String path; const CardColorHorizontal(this.path); diff --git a/frontend/lib/models/carte_bulle.dart b/frontend/lib/models/carte_bulle.dart index 1cc154d..e047876 100644 --- a/frontend/lib/models/carte_bulle.dart +++ b/frontend/lib/models/carte_bulle.dart @@ -155,6 +155,8 @@ class CarteBulle { return CardColorHorizontal.green.path; case 'blue': return CardColorHorizontal.blue.path; + case 'aqua': + return CardColorHorizontal.aqua.path; default: return CardColorHorizontal.peach.path; } diff --git a/frontend/lib/screens/auth/parent_register_step3_screen.dart b/frontend/lib/screens/auth/parent_register_step3_screen.dart index 7e99b0d..34e427e 100644 --- a/frontend/lib/screens/auth/parent_register_step3_screen.dart +++ b/frontend/lib/screens/auth/parent_register_step3_screen.dart @@ -41,6 +41,7 @@ class _ParentRegisterStep3ScreenState extends State { CardColorVertical.red, CardColorVertical.green, CardColorVertical.blue, + CardColorVertical.aqua, ]; // Garder une trace des couleurs déjà utilisées diff --git a/frontend/lib/utils/reprise_mapper.dart b/frontend/lib/utils/reprise_mapper.dart index 7a9730e..8b830fa 100644 --- a/frontend/lib/utils/reprise_mapper.dart +++ b/frontend/lib/utils/reprise_mapper.dart @@ -17,6 +17,7 @@ class RepriseMapper { CardColorVertical.red, CardColorVertical.green, CardColorVertical.blue, + CardColorVertical.aqua, ]; static ParentData parentFromDossier(ParentDossier p) { diff --git a/frontend/lib/widgets/base_form_screen.dart b/frontend/lib/widgets/base_form_screen.dart index 608bffd..9b7cde4 100644 --- a/frontend/lib/widgets/base_form_screen.dart +++ b/frontend/lib/widgets/base_form_screen.dart @@ -185,6 +185,8 @@ class BaseFormScreen extends StatelessWidget { return CardColorVertical.pink.path; case CardColorHorizontal.red: return CardColorVertical.red.path; + case CardColorHorizontal.aqua: + return CardColorVertical.aqua.path; } } diff --git a/frontend/lib/widgets/child_card_widget.dart b/frontend/lib/widgets/child_card_widget.dart index 4ff744f..14128f5 100644 --- a/frontend/lib/widgets/child_card_widget.dart +++ b/frontend/lib/widgets/child_card_widget.dart @@ -205,9 +205,14 @@ class _ChildCardWidgetState extends State { ); } - final Color baseCardColorForShadow = widget.childData.cardColor == CardColorVertical.lavender - ? Colors.purple.shade200 - : (widget.childData.cardColor == CardColorVertical.pink ? Colors.pink.shade200 : Colors.grey.shade200); + final Color baseCardColorForShadow = + widget.childData.cardColor == CardColorVertical.lavender + ? Colors.purple.shade200 + : (widget.childData.cardColor == CardColorVertical.pink + ? Colors.pink.shade200 + : (widget.childData.cardColor == CardColorVertical.aqua + ? Colors.teal.shade200 + : Colors.grey.shade200)); final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0); final double editableCardWidth = config.isMobile ? double.infinity @@ -340,6 +345,7 @@ class _ChildCardWidgetState extends State { // Mapping manuel simple if (widget.childData.cardColor.path.contains('lavender')) horizontalCardAsset = CardColorHorizontal.lavender.path; + else if (widget.childData.cardColor.path.contains('aqua')) horizontalCardAsset = CardColorHorizontal.aqua.path; else if (widget.childData.cardColor.path.contains('blue')) horizontalCardAsset = CardColorHorizontal.blue.path; else if (widget.childData.cardColor.path.contains('green')) horizontalCardAsset = CardColorHorizontal.green.path; else if (widget.childData.cardColor.path.contains('lime')) horizontalCardAsset = CardColorHorizontal.lime.path; diff --git a/frontend/lib/widgets/personal_info_form_screen.dart b/frontend/lib/widgets/personal_info_form_screen.dart index 94c9888..3a73267 100644 --- a/frontend/lib/widgets/personal_info_form_screen.dart +++ b/frontend/lib/widgets/personal_info_form_screen.dart @@ -1302,6 +1302,8 @@ class _PersonalInfoFormScreenState extends State { return CardColorVertical.pink.path; case CardColorHorizontal.red: return CardColorVertical.red.path; + case CardColorHorizontal.aqua: + return CardColorVertical.aqua.path; } } } diff --git a/frontend/lib/widgets/presentation_form_screen.dart b/frontend/lib/widgets/presentation_form_screen.dart index fd2d310..fb019a6 100644 --- a/frontend/lib/widgets/presentation_form_screen.dart +++ b/frontend/lib/widgets/presentation_form_screen.dart @@ -642,6 +642,8 @@ class _PresentationFormScreenState extends State { return CardColorVertical.pink.path; case CardColorHorizontal.red: return CardColorVertical.red.path; + case CardColorHorizontal.aqua: + return CardColorVertical.aqua.path; } } } diff --git a/frontend/lib/widgets/professional_info_form_screen.dart b/frontend/lib/widgets/professional_info_form_screen.dart index 9a21bd0..33a282e 100644 --- a/frontend/lib/widgets/professional_info_form_screen.dart +++ b/frontend/lib/widgets/professional_info_form_screen.dart @@ -1196,6 +1196,8 @@ class _ProfessionalInfoFormScreenState extends State return CardColorVertical.pink.path; case CardColorHorizontal.red: return CardColorVertical.red.path; + case CardColorHorizontal.aqua: + return CardColorVertical.aqua.path; } } }