Fixed annoying bug : grades weren't loaded

Author: ModernChocolate

lib/UI/components/giffy_dialog/src/base_dialog.dart

@@ -137,24 +137,26 @@ class _BaseGiffyDialogState extends State<BaseGiffyDialog> with TickerProviderSt
           ),
         ),
         Expanded(
-          child: SingleChildScrollView(
-                      child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                children: <Widget>[
-                  Padding(
-                    padding: const EdgeInsets.only(top: 16.0),
-                    child: widget.title,
-                  ),
-                  Container(
-                    height:120,
-                    child: Padding(
-                      padding: const EdgeInsets.only(top:8.0,left:8.0,right:8.0,),
-                      child: CupertinoScrollbar(child: SingleChildScrollView(child: widget.description)),
+          child: CupertinoScrollbar(
+                      child: SingleChildScrollView(
+                        child: Column(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: <Widget>[
+                    Padding(
+                      padding: const EdgeInsets.only(top: 16.0),
+                      child: widget.title,
                     ),
-                  ),
-                  _buildButtonsBar(context)
-                ],
-              ),
+                    Container(
+                      height:120,
+                      child: Padding(
+                        padding: const EdgeInsets.only(top:8.0,left:8.0,right:8.0,),
+                        child: CupertinoScrollbar(child: SingleChildScrollView(child: widget.description)),
+                      ),
+                    ),
+                    _buildButtonsBar(context)
+                  ],
+                ),
+            ),
           ),
         ),
       ],
@@ -195,39 +197,43 @@ class _BaseGiffyDialogState extends State<BaseGiffyDialog> with TickerProviderSt
   }
 
   Widget _buildButtonsBar(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(top:8.0,left:8.0,right:8.0,),
-      child: Row(
-        mainAxisAlignment:
-            !widget.onlyOkButton ? MainAxisAlignment.spaceEvenly : MainAxisAlignment.center,
-        children: <Widget>[
-          if (!widget.onlyOkButton) ...[
-            RaisedButton(
-              color: widget.buttonCancelColor,
-              shape:
-                  RoundedRectangleBorder(borderRadius: BorderRadius.circular(widget.buttonRadius)),
-              onPressed: widget.onCancelButtonPressed ?? () => Navigator.of(context).pop(),
-              child: widget.buttonCancelText ??
-                  Text(
-                    'Cancel',
-                    style: TextStyle(color: Colors.white),
-                  ),
-            )
-          ],
-          if (!widget.onlyCancelButton) ...[
-            RaisedButton(
-              color: widget.buttonOkColor,
-              shape:
-                  RoundedRectangleBorder(borderRadius: BorderRadius.circular(widget.buttonRadius)),
-              onPressed: widget.onOkButtonPressed,
-              child: widget.buttonOkText ??
-                  Text(
-                    'OK',
-                    style: TextStyle(color: Colors.white),
-                  ),
-            ),
+    return FittedBox(
+          child: Padding(
+        padding: const EdgeInsets.only(top:8.0,left:8.0,right:8.0,),
+        child: Row(
+          mainAxisAlignment:
+              MainAxisAlignment.center,
+          children: <Widget>[
+            if (!widget.onlyOkButton) ...[
+              RaisedButton(
+                color: widget.buttonCancelColor,
+                shape:
+                    RoundedRectangleBorder(borderRadius: BorderRadius.circular(widget.buttonRadius)),
+                onPressed: widget.onCancelButtonPressed ?? () => Navigator.of(context).pop(),
+                child: widget.buttonCancelText ??
+                    Text(
+                      'Cancel',
+                      style: TextStyle(color: Colors.white),
+                    ),
+              )
+            ],
+            if(!widget.onlyOkButton)
+             SizedBox(width: 15,),
+            if (!widget.onlyCancelButton) ...[
+              RaisedButton(
+                color: widget.buttonOkColor,
+                shape:
+                    RoundedRectangleBorder(borderRadius: BorderRadius.circular(widget.buttonRadius)),
+                onPressed: widget.onOkButtonPressed,
+                child: widget.buttonOkText ??
+                    Text(
+                      'OK',
+                      style: TextStyle(color: Colors.white),
+                    ),
+              ),
+            ],
           ],
-        ],
+        ),
       ),
     );
   }

lib/offline.dart

@@ -6,9 +6,9 @@ import 'package:ynotes/UI/utils/fileUtils.dart';
 
 class Offline {
   //Return disciplines + grades
-  List<Discipline> disciplinesData= List();
+  List<Discipline> disciplinesData;
   //Return homework
-  List<Homework> homeworkData= List();
+  List<Homework> homeworkData;
 
   Box _offlineBox;
   Box _homeworkDoneBox;
@@ -33,6 +33,7 @@ class Offline {
         _offlineBox = await Hive.openBox("offlineData");
       }
       //Get data and cast it
+
       disciplinesData = _offlineBox.get("disciplines").cast<Discipline>();
       homeworkData = _offlineBox.get("homework").cast<Homework>();
 
@@ -149,12 +150,10 @@ class Offline {
   Future<List<Homework>> homework() async {
     try {
       if (homeworkData != null) {
-         
         return homeworkData;
       } else {
-  
         await refreshData();
-      
+
         return homeworkData;
       }
     } catch (e) {

lib/parsers/Pronote.dart

@@ -54,6 +54,9 @@ class APIPronote extends API {
     } else {
       print("Loading grades inline.");
       var toReturn = await getGradesFromInternet();
+      if (toReturn == null) {
+        toReturn = await offline.disciplines();
+      }
       await refreshDisciplinesListColors(toReturn);
       return toReturn;
     }
@@ -104,7 +107,7 @@ class APIPronote extends API {
             z++;
           });
         }
-        this.gradesList =null;
+        this.gradesList = null;
         listDisciplines.forEach((element) {
           element.gradesList
               .addAll(grades.where((grade) => grade.libelleMatiere == element.nomDiscipline));
@@ -190,11 +193,14 @@ class APIPronote extends API {
             forceReload == null) &&
         offlineHomework != null) {
       print("Loading homework from offline storage.");
-         
+
       return offlineHomework;
     } else {
       print("Loading homework inline.");
       var toReturn = await getNextHomeworkFromInternet();
+      if (toReturn == null) {
+        toReturn = await offline.homework();
+      }
       return toReturn;
     }
   }

pubspec.yaml

@@ -12,7 +12,7 @@ description: yNotes application de gestion de vie scolaire
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.
 
-version: 0.8.8+3
+version: 0.8.8+4
 
 environment:
   sdk: ">=2.2.2 <3.0.0"