Merge pull request #7 from TMarccci/master

Handle disabled Live Activity, i18n AverageSelector won't update, ...

filcnaplo/lib/api/providers/live_card_provider.dart

@@ -44,10 +44,20 @@ class LiveCardProvider extends ChangeNotifier {
     required SettingsProvider settings,
   })  : _timetable = timetable,
         _settings = settings {
-    _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard");
+    // Check if live card is enabled .areActivitiesEnabled()
-    _liveActivitiesPlugin.getAllActivitiesIds().then((value) {
+    _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
-      _latestActivityId = value.isNotEmpty ? value.first : null;
+      // Console log
+      print("Live card enabled: $value");
+
+      if (value) {
+        _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard");
+
+        _liveActivitiesPlugin.getAllActivitiesIds().then((value) {
+          _latestActivityId = value.isNotEmpty ? value.first : null;
+        });
+      }
     });
+
     _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
     _delay = settings.bellDelayEnabled
         ? Duration(seconds: settings.bellDelay)
@@ -58,8 +68,15 @@ class LiveCardProvider extends ChangeNotifier {
   @override
   void dispose() {
     _timer.cancel();
-    if (_latestActivityId != null && Platform.isIOS)
+    if (Platform.isIOS) {
-      _liveActivitiesPlugin.endActivity(_latestActivityId!);
+      _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
+        if (value) {
+          if (_latestActivityId != null) {
+            _liveActivitiesPlugin.endActivity(_latestActivityId!);
+          }
+        }
+      });
+    }
     super.dispose();
   }
 
@@ -146,30 +163,34 @@ class LiveCardProvider extends ChangeNotifier {
 
   void update() async {
     if (Platform.isIOS) {
-      final cmap = toMap();
+      _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
-      if (!mapEquals(cmap, _lastActivity)) {
+        if (value) {
-        _lastActivity = cmap;
+          final cmap = toMap();
-        try {
+          if (!mapEquals(cmap, _lastActivity)) {
-          if (_lastActivity.isNotEmpty) {
+            _lastActivity = cmap;
-            if (_latestActivityId == null) {
+            try {
-              _liveActivitiesPlugin
+              if (_lastActivity.isNotEmpty) {
-                  .createActivity(_lastActivity)
+                if (_latestActivityId == null) {
-                  .then((value) => _latestActivityId = value);
+                  _liveActivitiesPlugin
-            } else {
+                      .createActivity(_lastActivity)
-              _liveActivitiesPlugin.updateActivity(
+                      .then((value) => _latestActivityId = value);
-                  _latestActivityId!, _lastActivity);
+                } else {
+                  _liveActivitiesPlugin.updateActivity(
+                      _latestActivityId!, _lastActivity);
+                }
+              } else {
+                if (_latestActivityId != null) {
+                  _liveActivitiesPlugin.endActivity(_latestActivityId!);
+                }
+              }
+            } catch (e) {
+              if (kDebugMode) {
+                print('ERROR: Unable to create or update iOS LiveCard!');
+              }
             }
-          } else {
-            if (_latestActivityId != null) {
-              _liveActivitiesPlugin.endActivity(_latestActivityId!);
-            }
-          }
-        } catch (e) {
-          if (kDebugMode) {
-            print('ERROR: Unable to create or update iOS LiveCard!');
           }
         }
-      }
+      });
     }
 
     List<Lesson> today = _today(_timetable);

filcnaplo_kreta_api/lib/providers/grade_provider.dart

@@ -98,7 +98,10 @@ class GradeProvider with ChangeNotifier {
               .i18n;
       grade.value.shortName = _settings.goodStudent
           ? "Jeles".i18n
-          : '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n;
+          // If not null or - or contains "Nem" or contains "%"
+          : '${grade.json!["SzovegesErtekelesRovidNev"]}' != "null" && '${grade.json!["SzovegesErtekelesRovidNev"]}' != "-"
+              ? '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n
+              : grade.value.valueName;
     }
 
     notifyListeners();

filcnaplo_premium/lib/ui/mobile/grades/average_selector.dart

@@ -9,44 +9,55 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 
 final Map<int, String> avgDropItems = {
-  0: "annual_average".i18n,
+  0: "annual_average",
-  90: "3_months_average".i18n,
+  90: "3_months_average",
-  30: "30_days_average".i18n,
+  30: "30_days_average",
-  14: "14_days_average".i18n,
+  14: "14_days_average",
-  7: "7_days_average".i18n,
+  7: "7_days_average",
 };
 
-class PremiumAverageSelector extends StatelessWidget {
+class PremiumAverageSelector extends StatefulWidget {
   const PremiumAverageSelector({Key? key, this.onChanged, required this.value}) : super(key: key);
 
   final Function(int?)? onChanged;
   final int value;
 
+  @override
+  _PremiumAverageSelectorState createState() => _PremiumAverageSelectorState();
+}
+
+class _PremiumAverageSelectorState extends State<PremiumAverageSelector> {
   @override
   Widget build(BuildContext context) {
+    List<DropdownMenuItem<int>> dropdownItems = avgDropItems.keys.map((item) {
+      return DropdownMenuItem<int>(
+        value: item,
+        child: Text(
+          avgDropItems[item]!.i18n,
+          style: TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.bold,
+            color: AppColors.of(context).text,
+          ),
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    }).toList();
+
     return DropdownButton2<int>(
-      items: avgDropItems.keys
+      items: dropdownItems,
-          .map((item) => DropdownMenuItem<int>(
-                value: item,
-                child: Text(
-                  avgDropItems[item] ?? "",
-                  style: TextStyle(
-                    fontSize: 14,
-                    fontWeight: FontWeight.bold,
-                    color: AppColors.of(context).text,
-                  ),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ))
-          .toList(),
       onChanged: (int? value) {
         if (Provider.of<PremiumProvider>(context, listen: false).hasScope(PremiumScopes.gradeStats)) {
-          if (onChanged != null) onChanged!(value);
+          if (widget.onChanged != null) {
+            setState(() {
+              widget.onChanged!(value);
+            });
+          }
         } else {
           PremiumLockedFeatureUpsell.show(context: context, feature: PremiumFeature.gradestats);
         }
       },
-      value: value,
+      value: widget.value,
       iconSize: 14,
       iconEnabledColor: AppColors.of(context).text,
       iconDisabledColor: AppColors.of(context).text,
@@ -71,11 +82,13 @@ class PremiumAverageSelector extends StatelessWidget {
         height: 30,
         child: Row(
           children: [
-            Text(avgDropItems[value] ?? "",
+            Text(
-                style: Theme.of(context)
+              avgDropItems[widget.value]!.i18n,
-                    .textTheme
+              style: Theme.of(context)
-                    .titleSmall!
+                  .textTheme
-                    .copyWith(fontWeight: FontWeight.w600, color: AppColors.of(context).text.withOpacity(0.65))),
+                  .titleSmall!
+                  .copyWith(fontWeight: FontWeight.w600, color: AppColors.of(context).text.withOpacity(0.65)),
+            ),
             const SizedBox(
               width: 4,
             ),