Merge pull request #8 from TMarccci/master

I think I fixed this

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/lib/helpers/update_helper.dart

@@ -19,13 +19,15 @@ extension UpdateHelper on Release {
     updateCallback!(-1, UpdateState.preparing);
 
     String downloads = await StorageHelper.downloadsPath();
-    File apk = File("$downloads/filcnaplo-$version.apk");
+    File apk = File("$downloads/refilc-$version.apk");
 
     if (!await apk.exists()) {
       updateCallback(-1, UpdateState.downloading);
 
       var bytes = await download(updateCallback: updateCallback);
-      if (!await StorageHelper.write(apk.path, bytes)) throw "failed to write apk: permission denied";
+      if (!await StorageHelper.write(apk.path, bytes)) {
+        throw "failed to write apk: permission denied";
+      }
     }
 
     updateCallback(-1, UpdateState.installing);
@@ -50,7 +52,8 @@ extension UpdateHelper on Release {
     var completer = Completer<Uint8List>();
 
     response?.stream.listen((List<int> chunk) {
-      updateCallback!(downloaded / (response.contentLength ?? 0), UpdateState.downloading);
+      updateCallback!(
+          downloaded / (response.contentLength ?? 0), UpdateState.downloading);
 
       chunks.add(chunk);
       downloaded += chunk.length;

filcnaplo/pubspec.yaml

@@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez"
 homepage: https://refilc.hu
 publish_to: "none"
 
-version: 4.0.3+210
+version: 4.0.4+212
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

filcnaplo_kreta_api/lib/providers/grade_provider.dart

@@ -98,7 +98,9 @@ class GradeProvider with ChangeNotifier {
               .i18n;
       grade.value.shortName = _settings.goodStudent
           ? "Jeles".i18n
-          : '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n;
+          : '${grade.json!["SzovegesErtekelesRovidNev"]}' != "null" && '${grade.json!["SzovegesErtekelesRovidNev"]}' != "-" && '${grade.json!["SzovegesErtekelesRovidNev"]}'.replaceAll(RegExp(r'[0123456789]+[%]?'), '') != ""
+              ? '${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,
             ),

filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart

@@ -27,7 +27,6 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
 
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeLeft,
-      DeviceOrientation.landscapeRight,
     ]);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
@@ -51,10 +50,6 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
         (a, b) => math.max(
             a, b.where((l) => l.subject.id != "" || l.isEmpty).length));
 
-    final int minIndex = int.tryParse(everyLesson.first.lessonIndex) ?? 0;
-    final int maxIndex =
-        int.tryParse(everyLesson.last.lessonIndex) ?? maxLessonCount;
-
     const prefixw = 40;
     const padding = prefixw + 6 * 2;
     final colw = (MediaQuery.of(context).size.width - padding) / days.length;
@@ -68,26 +63,19 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
       body: ListView.builder(
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.symmetric(horizontal: 6.0, vertical: 24.0),
-        itemCount: maxIndex + 1,
+        itemCount: maxLessonCount + 1,
         itemBuilder: (context, index) {
           List<Widget> columns = [];
-
           for (int dayIndex = -1; dayIndex < days.length; dayIndex++) {
-            final dayOffset = dayIndex == -1
-                ? 0
-                : (int.tryParse(days[dayIndex].first.lessonIndex) ?? 0) -
-                    minIndex;
-            final lessonIndex = index - 1;
-
             if (dayIndex == -1) {
-              if (lessonIndex >= 0) {
+              if (index >= 1) {
                 columns.add(SizedBox(
                   width: prefixw.toDouble(),
                   height: 40.0,
                   child: Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 8.0),
                     child: Text(
-                      "${minIndex + lessonIndex}.",
+                      (index).toString()+".",
                       style: TextStyle(
                           fontWeight: FontWeight.bold,
                           color: Theme.of(context).colorScheme.secondary),
@@ -105,104 +93,112 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
                 .toList();
 
             if (lessons.isEmpty) continue;
-            if (lessonIndex >= lessons.length) continue;
 
-            if (dayIndex >= days.length ||
+            final dayOffset = int.tryParse(lessons.first.lessonIndex) ?? 0;
-                (lessonIndex + dayOffset) >= lessons.length) {
+
-              columns.add(SizedBox(width: colw));
+            if (index == 0 && dayIndex >= 0) {
+              columns.add(
+                SizedBox(
+                  width: colw,
+                  height: 40.0,
+                  child: Text(
+                    DateFormat("EEEE", I18n.of(context).locale.languageCode)
+                        .format(lessons.first.date)
+                        .capital(),
+                    style: const TextStyle(
+                      fontSize: 24.0,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+              );
               continue;
             }
 
-            if (lessonIndex == -1 && dayIndex >= 0) {
+            final lessonIndex = index - dayOffset;
-              columns.add(SizedBox(
+
-                width: colw,
+            if (lessonIndex < 0 || lessonIndex >= lessons.length) {
-                height: 40.0,
+              columns.add(SizedBox(width: colw));
-                child: Text(
-                  DateFormat("EEEE", I18n.of(context).locale.languageCode)
-                      .format(lessons.first.date)
-                      .capital(),
-                  style: const TextStyle(
-                      fontSize: 24.0, fontWeight: FontWeight.bold),
-                ),
-              ));
               continue;
             }
 
             if (lessons[lessonIndex].isEmpty) {
-              columns.add(SizedBox(
+              columns.add(
-                width: colw,
+                SizedBox(
-                child: Row(
+                  width: colw,
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  child: Row(
-                  children: [
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                    Icon(FeatherIcons.slash,
-                        size: 18.0,
-                        color: AppColors.of(context).text.withOpacity(.3)),
-                    const SizedBox(width: 8.0),
-                    Text(
-                      "Lyukas óra",
-                      style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(.3)),
-                    ),
-                  ],
-                ),
-              ));
-              continue;
-            }
-
-            if (dayOffset > 0 && lessonIndex < dayOffset) {
-              columns.add(SizedBox(width: colw));
-              continue;
-            }
-
-            columns.add(SizedBox(
-              width: colw,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
                     children: [
                       Icon(
-                        SubjectIcon.resolveVariant(
+                        FeatherIcons.slash,
-                            context: context,
-                            subject: lessons[lessonIndex - dayOffset].subject),
                         size: 18.0,
-                        color: AppColors.of(context).text.withOpacity(.7),
+                        color: AppColors.of(context).text.withOpacity(.3),
                       ),
                       const SizedBox(width: 8.0),
-                      Expanded(
+                      Text(
-                        child: Text(
+                        "Lyukas óra",
-                          lessons[lessonIndex - dayOffset].subject.renamedTo ??
+                        style: TextStyle(
-                              lessons[lessonIndex - dayOffset]
+                          color: AppColors.of(context).text.withOpacity(.3),
-                                  .subject
+                        ),
-                                  .name
+                      ),
-                                  .capital(),
+                    ],
-                          maxLines: 1,
+                  ),
-                          style: TextStyle(
+                ),
-                              fontStyle: lessons[lessonIndex - dayOffset]
+              );
+              continue;
+            }
+
+            columns.add(
+              SizedBox(
+                width: colw,
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Icon(
+                          SubjectIcon.resolveVariant(
+                            context: context,
+                            subject: lessons[lessonIndex].subject,
+                          ),
+                          size: 18.0,
+                          color: AppColors.of(context).text.withOpacity(.7),
+                        ),
+                        const SizedBox(width: 8.0),
+                        Expanded(
+                          child: Text(
+                            lessons[lessonIndex].subject.renamedTo ??
+                                lessons[lessonIndex].subject.name.capital(),
+                            maxLines: 1,
+                            style: TextStyle(
+                              fontStyle: lessons[lessonIndex]
                                       .subject
                                       .isRenamed
                                   ? FontStyle.italic
-                                  : null),
+                                  : null,
-                          overflow: TextOverflow.clip,
+                            ),
-                          softWrap: false,
+                            overflow: TextOverflow.clip,
+                            softWrap: false,
+                          ),
+                        ),
+                        const SizedBox(width: 15),
+                      ],
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 26.0),
+                      child: Text(
+                        lessons[lessonIndex].room,
+                        style: TextStyle(
+                          color: AppColors.of(context).text.withOpacity(.5),
+                          overflow: TextOverflow.ellipsis,
                         ),
                       ),
-                      const SizedBox(width: 15),
-                    ],
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 26.0),
-                    child: Text(
-                      lessons[lessonIndex - dayOffset].room,
-                      style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(.5),
-                          overflow: TextOverflow.ellipsis),
                     ),
-                  ),
+                  ],
-                ],
+                ),
               ),
-            ));
+            );
           }
 
           return Row(