Merge branch 'main' into prod/festapp

lib/appConfig.dart

@@ -18,7 +18,7 @@ class AppConfig {
   static const int organization = 1;
   //setup occasion id to force occasion
   static const String? forceOccasionLink = null;
-  static const bool forceSendingNotificationAsTest = false;
+  static const bool isPublicNotificationSendingDisabled = false;
 
   static const String webLink = "https://live.festapp.net";
   static const String appStoreLink = "https://apps.apple.com/us/app/festapp/id6474078383";

lib/components/timeline/ScheduleTabView.dart

@@ -67,7 +67,7 @@ class _ScheduleTabViewState extends State<ScheduleTabView> {
               for (var e in datedEvents)
                 Tab(
                   child: Text(
-                    e.dateTime!.weekdayToString(context),
+                    StylesConfig.formatDateTimeForTab(context, e.dateTime!),
                     style: StylesConfig.timeLineTabNameTextStyle,
                     maxLines: 1,
                   ),

lib/components/timeline/ScheduleTimeline.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:fstapp/components/timeline/ScheduleTimelineHelper.dart';
 import 'package:fstapp/styles/StylesConfig.dart';
 import 'package:fstapp/themeConfig.dart';
-import 'package:timelines/timelines.dart';
+import 'package:timelines_plus/timelines_plus.dart';
 
 class ScheduleTimeline extends StatefulWidget {
   final Function(int)? onEventPressed;

lib/pages/CheckPage.dart

@@ -165,7 +165,6 @@ class _CheckPageState extends State<CheckPage> {
           formats: [BarcodeFormat.qrCode],
           detectionSpeed: DetectionSpeed.noDuplicates);
 
-  @override
   @override
   Widget build(BuildContext context) {
     const minChildSize = 0.25;

lib/pages/NewsFormPage.dart

@@ -54,7 +54,7 @@ class _NewsFormPageState extends State<NewsFormPage> {
     Navigator.pop(context);
   }
 
-  Future<void> _sendPressed({bool isTest = AppConfig.forceSendingNotificationAsTest, bool process = false}) async {
+  Future<void> _sendPressed({bool isTest = false, bool process = false}) async {
     var htmlContent = await _controller.getText();
     htmlContent = HtmlHelper.removeColor(htmlContent);
     if (process == true) {
@@ -65,9 +65,8 @@ class _NewsFormPageState extends State<NewsFormPage> {
         "content": htmlContent,
         "heading": _formKey.currentState?.fields["heading"]!.value,
         "heading_default": _currentUser!.name,
-        "with_notification":
-            _formKey.currentState?.fields["with_notification"]!.value,
-        if (isTest) "to": [AuthService.currentUserId()],
+        "with_notification": _formKey.currentState?.fields["with_notification"]!.value,
+        if (isTest || AppConfig.isPublicNotificationSendingDisabled) "to": [AuthService.currentUserId()],
         if (isTest) "add_to_news": false,
       };
       Navigator.pop(context, toReturn);

lib/styles/StylesConfig.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:fstapp/services/TimeHelper.dart';
 import 'package:fstapp/themeConfig.dart';
+import 'package:intl/intl.dart';
 
 class StylesConfig {
   // Text styles
@@ -32,4 +34,8 @@ class StylesConfig {
         backgroundColor: ThemeConfig.seed2,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       );
+
+  static String formatDateTimeForTab(BuildContext context, DateTime time){
+    return time.weekdayToString(context);
+  }
 }

lib/widgets/ScheduleTimeline.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:fstapp/dataModels/EventModel.dart';
 import 'package:fstapp/styles/StylesConfig.dart';
 import 'package:fstapp/themeConfig.dart';
-import 'package:timelines/timelines.dart';
+import 'package:timelines_plus/timelines_plus.dart';
 
 
 enum DotType {

pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_svg: ^2.0.16
-  fluttertoast: ^8.2.8
+  fluttertoast: ^8.2.10
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -43,9 +43,9 @@ dependencies:
   flutter_map_marker_popup: ^7.0.0
 #  flutter_map_marker_popup:
 #    path: ./pckgs/flutter_map_marker_popup-master
-  supabase_flutter: ^2.8.1
+  supabase_flutter: ^2.8.2
   flutter_secure_storage: ^9.2.2
-  timelines: ^0.1.0
+  timelines_plus: ^1.0.4
   intl: ^0.19.0
   search_page: ^2.3.0
   badges: ^3.1.1
@@ -63,7 +63,7 @@ dependencies:
   path_provider: ^2.1.5
   select_dialog: ^2.0.1
   onesignal_flutter: ^5.2.7
-  package_info_plus: ^8.1.1
+  package_info_plus: ^8.1.2
   flutter_animate: ^4.5.2
   easy_localization: ^3.0.7
   flutter_map_cancellable_tile_provider: ^3.0.2
@@ -79,7 +79,7 @@ dependencies:
   flutter_map_animations: ^0.8.0
   auto_route: ^9.2.2
   adaptive_theme: ^3.6.0
-  connectivity_plus: ^6.1.0
+  connectivity_plus: ^6.1.1
 
 dev_dependencies:
   auto_route_generator: ^9.0.0