Skip to content

Commit

Permalink
feat(day_navigation): improve week day display and responsiveness (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
albertms10 committed Dec 6, 2021
1 parent 3052636 commit bf01efa
Showing 1 changed file with 31 additions and 7 deletions.
38 changes: 31 additions & 7 deletions lib/widgets/layout/day_navigation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class DayNavigation extends StatelessWidget {
return Consumer<DayHandler>(
builder: (context, dayHandler, child) {
return Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: 8.0,
runSpacing: 8.0,
children: [
TextButton(
style: TextButton.styleFrom(
Expand All @@ -22,7 +25,6 @@ class DayNavigation extends StatelessWidget {
onPressed: () => dayHandler.changeToNow(),
child: Text(appLocalizations.today),
),
const SizedBox(width: 8.0),
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(24.0)),
child: Material(
Expand All @@ -35,7 +37,6 @@ class DayNavigation extends StatelessWidget {
),
),
),
const SizedBox(width: 8.0),
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(24.0)),
child: Material(
Expand All @@ -48,14 +49,37 @@ class DayNavigation extends StatelessWidget {
),
),
),
const SizedBox(width: 24.0),
Text(
DateFormat.yMMMMEEEEd().format(dayHandler.dateTime),
style: Theme.of(context).textTheme.headline5,
),
const SizedBox(width: 8.0),
_WeekDateTime(dateTime: dayHandler.dateTime),
],
);
},
);
}
}

class _WeekDateTime extends StatelessWidget {
final DateTime dateTime;

const _WeekDateTime({required this.dateTime, Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
DateFormat.EEEE().format(dateTime),
style: Theme.of(context).textTheme.headline5,
),
Text(
DateFormat.yMMMMd().format(dateTime),
style: Theme.of(context)
.textTheme
.subtitle2!
.copyWith(color: Colors.white70),
),
],
);
}
}

0 comments on commit bf01efa

Please sign in to comment.