Merge pull request #69 from refilc/dev

69-es szamu pr haha 😏

filcnaplo/android/app/src/main/res/layout/widget_timetable.xml

@@ -136,7 +136,7 @@
             android:layout_below="@id/iv_1"
             android:layout_marginHorizontal="15dp"
             android:fontFamily="@font/montserrat_medium"
-            android:text="A widget használatához, bejelentkezés szükséges."
+            android:text="A widget használatához bejelentkezés szükséges."
             android:textColor="@color/black"
             android:paddingTop="10dp"
             android:textSize="17sp"

filcnaplo/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -39,5 +39,8 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
   end
 end

filcnaplo/lib/api/providers/live_card_provider.dart

@@ -51,7 +51,7 @@ class LiveCardProvider extends ChangeNotifier {
       _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
         // Console log
         if (kDebugMode) {
-          print("Live card enabled: $value");
+          print("iOS LiveActivity enabled: $value");
         }
 
         if (value) {
@@ -62,13 +62,13 @@ class LiveCardProvider extends ChangeNotifier {
           });
         }
       });
-
-      _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
-      _delay = settings.bellDelayEnabled
-          ? Duration(seconds: settings.bellDelay)
-          : Duration.zero;
-      update();
     }
+
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
+    _delay = settings.bellDelayEnabled
+        ? Duration(seconds: settings.bellDelay)
+        : Duration.zero;
+    update();
   }
 
   @override
@@ -196,7 +196,7 @@ class LiveCardProvider extends ChangeNotifier {
               }
             } catch (e) {
               if (kDebugMode) {
-                print('ERROR: Unable to create or update iOS LiveCard!');
+                print('ERROR: Unable to create or update iOS LiveActivity!');
               }
             }
           }

filcnaplo/lib/api/providers/status_provider.dart

@@ -79,11 +79,12 @@ class StatusProvider extends ChangeNotifier {
       }
     }
 
-    if (_stack.contains(Status.network)) return;
-    if (res.body == "invalid_grant" ||
+    if (res.body == 'invalid_grant' ||
         res.body.replaceAll(' ', '') == '' ||
         res.statusCode == 400) {
-      if (!_stack.contains(Status.apiError)) {
+      if (!_stack.contains(Status.apiError) &&
+          !_stack.contains(Status.network)) {
+        if (res.statusCode == 401) return;
         _stack.insert(0, Status.apiError);
         notifyListeners();
       }

filcnaplo/lib/app.dart

@@ -131,6 +131,7 @@ class App extends StatelessWidget {
           create: (context) => HomeworkProvider(
             context: context,
             database: database,
+            user: user,
           ),
         ),
         ChangeNotifierProvider<MessageProvider>(

filcnaplo/lib/helpers/notification_helper.dart

@@ -195,7 +195,7 @@ class NotificationsHelper {
           if (userProvider.getUsers().length == 1) {
             await flutterLocalNotificationsPlugin.show(
               absence.id.hashCode,
-              "title_absence".i18n,
+              "title_absence".i18n, // https://discord.com/channels/1111649116020285532/1153273625206591528
               "body_absence".i18n.fill(
                 [
                   DateFormat("yyyy-MM-dd").format(absence.date),
@@ -210,7 +210,7 @@ class NotificationsHelper {
           } else {
             await flutterLocalNotificationsPlugin.show(
               absence.id.hashCode,
-              "title_absence".i18n,
+              "title_absence".i18n, // https://discord.com/channels/1111649116020285532/1153273625206591528
               "body_absence_multiuser".i18n.fill(
                 [
                   userProvider.displayName!,

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.3.0+226
+version: 4.3.1+230
 
 environment:
   sdk: ">=2.17.0 <3.0.0"