release: squash merge develop → master (#211,#212) #213

Closed
jmartin wants to merge 71 commits from develop into master
Showing only changes of commit 1f985f5b37 - Show all commits
+35 -38
View File
@@ -395,44 +395,41 @@ class _BulleTile extends StatelessWidget {
),
if (card.dateDebut != null || card.dateFin != null) ...[
const SizedBox(height: 10),
if (memeJour)
Text(
'Le ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merriweather(
fontSize: 14,
color: QuotidienTheme.ink,
height: 1.35,
),
)
else ...[
Text(
'Du ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merriweather(
fontSize: 14,
color: QuotidienTheme.ink,
height: 1.35,
),
),
Text(
'Au ${_fmtLong(card.dateFin)}',
style: GoogleFonts.merriweather(
fontSize: 14,
color: QuotidienTheme.ink,
height: 1.35,
),
),
],
],
if (card.motif != null && card.motif!.trim().isNotEmpty) ...[
const SizedBox(height: 6),
Text(
card.motif!,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merriweather(
fontSize: 12,
color: QuotidienTheme.muted,
),
Padding(
padding: const EdgeInsets.only(left: 12),
child: memeJour
? Text(
'Le ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Du ${_fmtLong(card.dateDebut)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
),
Text(
'Au ${_fmtLong(card.dateFin)}',
style: GoogleFonts.merienda(
fontSize: 17,
fontWeight: FontWeight.w600,
color: QuotidienTheme.ink,
height: 1.35,
),
),
],
),
),
],
if (card.statut == CarteStatut.refusee) ...[