From 45a8e0dd71b868ac97a7c85ed664912f62dc8895 Mon Sep 17 00:00:00 2001 From: Kima Date: Sat, 8 Jun 2024 21:42:51 +0200 Subject: [PATCH] kinda finished new goal planner --- .../lib/pages/grades/grade_subject_view.dart | 9 +++++---- refilc_plus | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart b/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart index bc321e0..7583707 100644 --- a/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart +++ b/refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart @@ -34,7 +34,6 @@ import 'package:refilc_mobile_ui/pages/grades/calculator/grade_calculator_provid import 'package:refilc_mobile_ui/pages/grades/grades_count.dart'; import 'package:refilc_mobile_ui/pages/grades/graph.dart'; import 'package:refilc_mobile_ui/pages/grades/subject_grades_container.dart'; -import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.dart'; // import 'package:refilc_plus/models/premium_scopes.dart'; // import 'package:refilc_plus/providers/plus_provider.dart'; import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.dart'; @@ -44,6 +43,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_expandable_fab/flutter_expandable_fab.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; +import 'package:refilc_plus/ui/mobile/goal_planner/goal_track_popup.dart'; import 'grades_page.i18n.dart'; // import 'package:refilc_plus/ui/mobile/goal_planner/new_goal.dart'; @@ -425,9 +425,10 @@ class _GradeSubjectViewState extends State // ScaffoldMessenger.of(context).showSnackBar( // const SnackBar(content: Text("Hamarosan..."))); - Navigator.of(context).push(CupertinoPageRoute( - builder: (context) => - GoalPlannerScreen(subject: widget.subject))); + // Navigator.of(context).push(CupertinoPageRoute( + // builder: (context) => + // GoalPlannerScreen(subject: widget.subject))); + GoalTrackPopup.show(context, subject: widget.subject); }, child: const Icon(FeatherIcons.flag, size: 20.0), ), diff --git a/refilc_plus b/refilc_plus index a45c5b1..5da93e4 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit a45c5b11a7aed29c43ee18381f0e8d15b4135183 +Subproject commit 5da93e4575290650d2939185323aa0cd81cdf0b6