jmartin/petitspas
1
0
Fork 0
Code Issues 46 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop — alignement avec correctifs master (withOpacity, formatters, script Gitea)

Browse Source 
Made-with: Cursor
This commit is contained in:
MARTIN Julien 2026-04-12 21:15:07 +02:00
commit eac108c9f4
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/lib/widgets/admin/validation_family_wizard.dart
View File

@ -309,7 +309,7 @@ class _ValidationFamilyWizardState extends State<ValidationFamilyWizard> {
static List<BoxShadow> _enfantCardShadows() => [ static List<BoxShadow> _enfantCardShadows() => [
BoxShadow( BoxShadow(
color: Colors.black.withValues(alpha: 0.06), color: Colors.black.withOpacity(0.06),
blurRadius: 14, blurRadius: 14,
offset: const Offset(0, 4), offset: const Offset(0, 4),
), ),
@ -514,10 +514,10 @@ class _ValidationFamilyWizardState extends State<ValidationFamilyWizard> {
height: height, height: height,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(photoRadius), borderRadius: BorderRadius.circular(photoRadius),
border: Border.all(color: Colors.black.withValues(alpha: 0.08)), border: Border.all(color: Colors.black.withOpacity(0.08)),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withValues(alpha: 0.05), color: Colors.black.withOpacity(0.05),
blurRadius: 6, blurRadius: 6,
offset: const Offset(0, 2), offset: const Offset(0, 2),
), ),

6
frontend/lib/widgets/child_card_widget.dart
View File

@ -195,9 +195,9 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
? Colors.purple.shade200 ? Colors.purple.shade200
: (widget.childData.cardColor == CardColorVertical.pink ? Colors.pink.shade200 : Colors.grey.shade200); : (widget.childData.cardColor == CardColorVertical.pink ? Colors.pink.shade200 : Colors.grey.shade200);
final Color initialPhotoShadow = final Color initialPhotoShadow =
Color.alphaBlend(Colors.black.withValues(alpha: 0.22), baseCardColorForShadow); Color.alphaBlend(Colors.black.withOpacity(0.22), baseCardColorForShadow);
final Color hoverPhotoShadow = final Color hoverPhotoShadow =
Color.alphaBlend(Colors.black.withValues(alpha: 0.32), baseCardColorForShadow); Color.alphaBlend(Colors.black.withOpacity(0.32), baseCardColorForShadow);
final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0); final double photoSide = 200.0 * (config.isMobile ? 0.8 : 1.0);
final double editableCardWidth = config.isMobile final double editableCardWidth = config.isMobile
@ -722,7 +722,7 @@ class _ChildCardWidgetState extends State<ChildCardWidget> {
style: OutlinedButton.styleFrom( style: OutlinedButton.styleFrom(
padding: EdgeInsets.symmetric(vertical: padV), padding: EdgeInsets.symmetric(vertical: padV),
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
backgroundColor: on ? Colors.black.withValues(alpha: 0.08) : Colors.transparent, backgroundColor: on ? Colors.black.withOpacity(0.08) : Colors.transparent,
foregroundColor: Colors.black87, foregroundColor: Colors.black87,
side: BorderSide( side: BorderSide(
width: on ? 2 : 1, width: on ? 2 : 1,

2
frontend/lib/widgets/custom_app_text_field.dart
View File

@ -89,7 +89,7 @@ class _CustomAppTextFieldState extends State<CustomAppTextField> {
final Color labelColor = final Color labelColor =
widget.enabled ? Colors.black87 : Colors.grey; widget.enabled ? Colors.black87 : Colors.grey;
final Color hintColor = widget.enabled final Color hintColor = widget.enabled
? Colors.black54.withValues(alpha: 0.7) ? Colors.black54.withOpacity(0.7)
: Colors.grey; : Colors.grey;
return Column( return Column(

6
frontend/lib/widgets/personal_info_form_screen.dart
View File

@ -1254,6 +1254,12 @@ class _PersonalInfoFormScreenState extends State<PersonalInfoFormScreen> {
} }
} }
static final _phoneInputFormatters = [
FilteringTextInputFormatter.digitsOnly,
LengthLimitingTextInputFormatter(10),
FrenchPhoneNumberFormatter(),
];
/// Retourne l'asset de carte vertical correspondant à la couleur /// Retourne l'asset de carte vertical correspondant à la couleur
String _getVerticalCardAsset() { String _getVerticalCardAsset() {
switch (widget.cardColor) { switch (widget.cardColor) {

11
scripts/gitea-close-issue-with-comment.sh
View File

@ -15,9 +15,18 @@ if [ -z "$GITEA_TOKEN" ]; then
GITEA_TOKEN=$(cat .gitea-token) GITEA_TOKEN=$(cat .gitea-token)
fi fi
fi fi
if [ -z "$GITEA_TOKEN" ] && [ -f ~/.bashrc ]; then
eval "$(grep '^export GITEA_TOKEN=' ~/.bashrc 2>/dev/null)" || true
fi
if [ -z "$GITEA_TOKEN" ] && [ -f docs/BRIEFING-FRONTEND.md ]; then
token_from_briefing=$(sed -n 's/.*Token: *\(giteabu_[a-f0-9]*\).*/\1/p' docs/BRIEFING-FRONTEND.md 2>/dev/null | head -1)
if [ -n "$token_from_briefing" ]; then
GITEA_TOKEN="$token_from_briefing"
fi
fi
if [ -z "$GITEA_TOKEN" ]; then if [ -z "$GITEA_TOKEN" ]; then
echo "Définir GITEA_TOKEN ou créer .gitea-token avec votre token Gitea." echo "Définir GITEA_TOKEN ou créer .gitea-token avec votre token Gitea (voir docs/PROCEDURE-API-GITEA.md)."
exit 1 exit 1
fi fi