Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
flutter_channel: 'stable'
flutter_version: '3.27.1'
flutter_version: '3.35.5'

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion lib/domain/objects/tip.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ List<Tip> tipsList = [
reason: 'Increase alertness',
type: TipType.general,
timing: TipTiming.before,
icon: FontAwesomeIcons.userLarge,
icon: FontAwesomeIcons.user,
resourceLinks: [
Resource(
'YouTube video by Andrew Huberman: "Optimizing Workspace for Productivity, Focus, & Creativity"',
Expand Down
2 changes: 1 addition & 1 deletion lib/infrastructure/notifications_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class _NotificationsRepository extends NotificationsController {
required String title,
required NotificationVariant variant,
String? body,
}) async =>
}) =>
controller.createNotification(
schedule: NotificationCalendar.fromDate(
date: date,
Expand Down
98 changes: 50 additions & 48 deletions lib/presentation/molecules/energy_selection_molecule.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ class _EnergySelectionMoleculeState extends State<EnergySelectionMolecule> {
subtitle: subtitleBuffer.toString(),
leading: Radio<EnergyType>(
value: type,
groupValue: timerStates.type,
onChanged: onChanged,
),
translateTitle: false,
trailing: showTipButton
Expand All @@ -90,55 +88,59 @@ class _EnergySelectionMoleculeState extends State<EnergySelectionMolecule> {
title: 'energy',
subTitle: 'Select session length',
scaffold: false,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'recommended',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.efficient),
],
child: RadioGroup(
groupValue: timerStates.type,
onChanged: onChanged,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'recommended',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.efficient),
],
),
),
),
const SeparatorAtom(variant: SeparatorVariant.farApart),
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'custom',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.veryHigh),
energyWidget(EnergyType.high),
energyWidget(EnergyType.low),
energyWidget(EnergyType.veryLow),
],
const SeparatorAtom(variant: SeparatorVariant.farApart),
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'custom',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.veryHigh),
energyWidget(EnergyType.high),
energyWidget(EnergyType.low),
energyWidget(EnergyType.veryLow),
],
),
),
),
const SeparatorAtom(variant: SeparatorVariant.farApart),
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'known_methods',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.pomodoro),
],
const SeparatorAtom(variant: SeparatorVariant.farApart),
CardAtom(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextAtom(
'known_methods',
variant: TextVariant.smallTitle,
),
const SeparatorAtom(),
energyWidget(EnergyType.pomodoro),
],
),
),
),
],
],
),
),
),
);
Expand Down
7 changes: 2 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,13 @@ dependencies:
flutter:
sdk: flutter
flutter_cached_pdfview: ^0.4.2
flutter_inappwebview: ^6.0.0
flutter_inappwebview: ^6.1.5
flutter_svg: ^2.0.10+1
# Font Awesome Icon pack available as Flutter Icons.
font_awesome_flutter: ^10.7.0
google_fonts: ^6.2.1
health: ^13.1.1
introduction_screen:
git:
url: https://github.com/guyluz11/introduction_screen.git
ref: master
introduction_screen: ^4.0.0
liquid_progress_indicator_v2: ^0.5.0
# Logger which prints beautiful logs
logger: ^2.2.0
Expand Down