From e1841ebdcf128525b8ef62fdf39ec98a0bf7c3f7 Mon Sep 17 00:00:00 2001 From: Guy Luz Date: Mon, 13 Oct 2025 21:08:44 +0300 Subject: [PATCH 1/4] Fixed app not lunching after last pr --- pubspec.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0f8f874..a7ee5a5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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 From aff1b18b946337651963321d7a66076ff12d2274 Mon Sep 17 00:00:00 2001 From: Guy Luz Date: Mon, 13 Oct 2025 21:10:52 +0300 Subject: [PATCH 2/4] Updating ci flutter version --- .github/workflows/dart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 150e027..59de3c7 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -9,7 +9,7 @@ on: env: flutter_channel: 'stable' - flutter_version: '3.27.1' + flutter_version: '3.35.5' jobs: build: From 7249baf04f98c40facf6063976e48bf4a49aeaa2 Mon Sep 17 00:00:00 2001 From: Guy Luz Date: Mon, 13 Oct 2025 21:21:34 +0300 Subject: [PATCH 3/4] Fixed deprecated call --- .../molecules/energy_selection_molecule.dart | 98 ++++++++++--------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/lib/presentation/molecules/energy_selection_molecule.dart b/lib/presentation/molecules/energy_selection_molecule.dart index c4c4def..fe577e1 100644 --- a/lib/presentation/molecules/energy_selection_molecule.dart +++ b/lib/presentation/molecules/energy_selection_molecule.dart @@ -66,8 +66,6 @@ class _EnergySelectionMoleculeState extends State { subtitle: subtitleBuffer.toString(), leading: Radio( value: type, - groupValue: timerStates.type, - onChanged: onChanged, ), translateTitle: false, trailing: showTipButton @@ -90,55 +88,59 @@ class _EnergySelectionMoleculeState extends State { 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), + ], + ), ), - ), - ], + ], + ), ), ), ); From 54ac798b0088f400fb760aa3192de8e488c8ab2b Mon Sep 17 00:00:00 2001 From: Guy Luz Date: Mon, 13 Oct 2025 21:31:28 +0300 Subject: [PATCH 4/4] Fixed lint --- lib/domain/objects/tip.dart | 2 +- lib/infrastructure/notifications_repository.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/domain/objects/tip.dart b/lib/domain/objects/tip.dart index e665d5d..eefed8a 100644 --- a/lib/domain/objects/tip.dart +++ b/lib/domain/objects/tip.dart @@ -153,7 +153,7 @@ List 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"', diff --git a/lib/infrastructure/notifications_repository.dart b/lib/infrastructure/notifications_repository.dart index e895273..b09a1f8 100644 --- a/lib/infrastructure/notifications_repository.dart +++ b/lib/infrastructure/notifications_repository.dart @@ -64,7 +64,7 @@ class _NotificationsRepository extends NotificationsController { required String title, required NotificationVariant variant, String? body, - }) async => + }) => controller.createNotification( schedule: NotificationCalendar.fromDate( date: date,