Merge branch 'refs/heads/main' into prod/festapp

vkh-cr · Jul 30, 2024 · 6501fe8 · 6501fe8
2 parents c3f1c0a + 16c69d2
commit 6501fe8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -40,7 +40,6 @@ Future<void> initializeEverything() async {
   print('Initialization started');
   GoRouter.optionURLReflectsImperativeAPIs = true;
   WidgetsFlutterBinding.ensureInitialized();
-  StylesHelper.setMetaThemeColor(Colors.red);
   print('Widgets binding initialized');
 
   try {

diff --git a/lib/pages/HomePage.dart b/lib/pages/HomePage.dart
@@ -19,6 +19,7 @@ import 'package:fstapp/pages/TimetablePage.dart';
 import 'package:fstapp/pages/UserPage.dart';
 import 'package:fstapp/components/timeline/ScheduleTimelineHelper.dart';
 import 'package:fstapp/services/NotificationHelper.dart';
+import 'package:fstapp/services/StylesHelper.dart';
 import 'package:fstapp/services/TimeHelper.dart';
 import 'package:fstapp/services/ToastHelper.dart';
 import 'package:fstapp/styles/Styles.dart';
@@ -65,6 +66,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
+    StylesHelper.setMetaThemeColor(AppConfig.backgroundColor);
     loadData();
   }
 

diff --git a/lib/pages/UserPage.dart b/lib/pages/UserPage.dart
@@ -16,6 +16,7 @@ import 'package:fstapp/pages/MapPage.dart';
 import 'package:fstapp/pages/SettingsPage.dart';
 import 'package:fstapp/services/DialogHelper.dart';
 import 'package:fstapp/components/timeline/ScheduleTimelineHelper.dart';
+import 'package:fstapp/services/StylesHelper.dart';
 import 'package:fstapp/services/ToastHelper.dart';
 import 'package:fstapp/styles/Styles.dart';
 import 'package:fstapp/widgets/ButtonsHelper.dart';
@@ -401,6 +402,7 @@ class _UserPageState extends State<UserPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
+    StylesHelper.setMetaThemeColor(AppConfig.color1);
     if (!DataService.isLoggedIn()) {
       RouterService.navigateOccasion(context, LoginPage.ROUTE);
     }

diff --git a/web/index.html b/web/index.html
@@ -72,11 +72,6 @@
    async function requestNotificationPermission(callback, errorCallback) {
        try {
            await OneSignal.Notifications.requestPermission()
-           //var permission = await Notification.requestPermission();
-           //var granted = permission === "granted";
-           //if (granted) {
-           // OneSignal.Notifications.requestPermission();
-           //}
            console.log("Notification permission request sent.");
            if (callback) callback(getNotificationPermission());
        } catch (error) {