setted goal plans can be saved now

filcnaplo_mobile_ui/lib/common/round_border_icon.dart

@@ -8,7 +8,7 @@ class RoundBorderIcon extends StatelessWidget {
   const RoundBorderIcon(
       {Key? key,
       this.color = Colors.black,
-      this.width = 16.0,
+      this.width = 1.5,
       required this.icon})
       : super(key: key);
 
@@ -20,7 +20,7 @@ class RoundBorderIcon extends StatelessWidget {
         borderRadius: BorderRadius.circular(50.0),
       ),
       child: Padding(
-        padding: EdgeInsets.zero,
+        padding: const EdgeInsets.all(5.0),
         child: icon,
       ),
     );

filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart

@@ -1,6 +1,8 @@
 import 'dart:math';
 
 import 'package:animations/animations.dart';
+import 'package:filcnaplo/api/providers/database_provider.dart';
+import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/utils/format.dart';
 import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
@@ -21,7 +23,7 @@ import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_pro
 import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart';
-import 'package:filcnaplo_premium/ui/mobile/goal_planner/test.dart';
+import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.dart';
 import 'package:filcnaplo_premium/models/premium_scopes.dart';
 import 'package:filcnaplo_premium/providers/premium_provider.dart';
 import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
@@ -62,12 +64,16 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
   late GradeProvider gradeProvider;
   late GradeCalculatorProvider calculatorProvider;
   late SettingsProvider settingsProvider;
+  late DatabaseProvider dbProvider;
+  late UserProvider user;
 
   late double average;
   late Widget gradeGraph;
 
   bool gradeCalcMode = false;
 
+  String plan = '';
+
   List<Grade> getSubjectGrades(Subject subject) => !gradeCalcMode
       ? gradeProvider.grades.where((e) => e.subject == subject).toList()
       : calculatorProvider.grades.where((e) => e.subject == subject).toList();
@@ -151,6 +157,20 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     gradeTiles = List.castFrom(tiles);
   }
 
+  @override
+  void initState() {
+    super.initState();
+    user = Provider.of<UserProvider>(context, listen: false);
+    dbProvider = Provider.of<DatabaseProvider>(context, listen: false);
+  }
+
+  void fetchGoalPlans() async {
+    plan = (await dbProvider.userQuery
+            .subjectGoalPlans(userId: user.id!))[widget.subject.id] ??
+        '';
+    setState(() {});
+  }
+
   @override
   Widget build(BuildContext context) {
     gradeProvider = Provider.of<GradeProvider>(context);
@@ -196,6 +216,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
       buildTiles(ghostGrades);
     }
 
+    fetchGoalPlans();
+
     return Scaffold(
         key: _scaffoldKey,
         floatingActionButtonLocation: ExpandableFab.location,
@@ -213,6 +235,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
             ),
             children: [
               FloatingActionButton.small(
+                heroTag: "btn_ghost_grades",
                 child: const Icon(FeatherIcons.plus),
                 backgroundColor: Theme.of(context).colorScheme.secondary,
                 onPressed: () {
@@ -220,6 +243,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                 },
               ),
               FloatingActionButton.small(
+                heroTag: "btn_goal_planner",
                 child: const Icon(FeatherIcons.flag, size: 20.0),
                 backgroundColor: Theme.of(context).colorScheme.secondary,
                 onPressed: () {
@@ -235,7 +259,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
 
                   Navigator.of(context).push(CupertinoPageRoute(
                       builder: (context) =>
-                          GoalPlannerTest(subject: widget.subject)));
+                          GoalPlannerScreen(subject: widget.subject)));
                 },
               ),
             ],
@@ -261,6 +285,35 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                 const SizedBox(width: 6.0),
                 if (average != 0)
                   Center(child: AverageDisplay(average: average)),
+                const SizedBox(width: 6.0),
+                if (plan != '')
+                  Center(
+                    child: GestureDetector(
+                      onTap: () {
+                        Navigator.of(context).push(CupertinoPageRoute(
+                            builder: (context) =>
+                                GoalPlannerScreen(subject: widget.subject)));
+                      },
+                      child: Container(
+                        width: 54.0,
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 5.0, vertical: 8.0),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(45.0),
+                          color: Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(.15),
+                        ),
+                        child: Icon(
+                          FeatherIcons.flag,
+                          size: 17.0,
+                          weight: 2.5,
+                          color: Theme.of(context).colorScheme.primary,
+                        ),
+                      ),
+                    ),
+                  ),
                 const SizedBox(width: 12.0),
               ],
               icon: SubjectIcon.resolveVariant(