From fc72391a75662e2b127b9b4d544357c9c83f9807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Tue, 7 May 2024 09:01:30 +0200
Subject: [PATCH] fixed bug when changing accounts

---
 lib/app.dart                            | 7 ++++---
 lib/main.dart                           | 3 +++
 lib/notification/notificationTasks.dart | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/app.dart b/lib/app.dart
index 11ea0ac..a250380 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -11,6 +11,7 @@ import 'package:badges/badges.dart' as badges;
 
 import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import 'api/mhsl/server/userIndex/update/updateUserindex.dart';
+import 'main.dart';
 import 'model/breakers/Breaker.dart';
 import 'model/breakers/BreakerProps.dart';
 import 'model/chatList/chatListProps.dart';
@@ -28,13 +29,12 @@ import 'view/pages/timetable/timetable.dart';
 class App extends StatefulWidget {
   const App({super.key});
 
-  static PersistentTabController bottomNavigator = PersistentTabController(initialIndex: 0);
-
   @override
   State<App> createState() => _AppState();
 }
 
 class _AppState extends State<App> with WidgetsBindingObserver {
+
   late Timer refetchChats;
   late Timer updateTimings;
 
@@ -58,6 +58,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
 
   @override
   void initState() {
+    Main.bottomNavigator = PersistentTabController(initialIndex: 0);
     WidgetsBinding.instance.addObserver(this);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       Provider.of<BreakerProps>(context, listen: false).run();
@@ -95,7 +96,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
 
   @override
   Widget build(BuildContext context) => PersistentTabView(
-      controller: App.bottomNavigator,
+      controller: Main.bottomNavigator,
       navBarOverlap: const NavBarOverlap.none(),
       backgroundColor: Theme.of(context).colorScheme.primary,
 
diff --git a/lib/main.dart b/lib/main.dart
index 10b741b..0e1aa43 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:loader_overlay/loader_overlay.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 
@@ -74,6 +75,8 @@ Future<void> main() async {
 
 class Main extends StatefulWidget {
   const Main({super.key});
+  static PersistentTabController bottomNavigator = PersistentTabController(initialIndex: 0);
+
 
   @override
   State<Main> createState() => _MainState();
diff --git a/lib/notification/notificationTasks.dart b/lib/notification/notificationTasks.dart
index 9719b67..b5d50cd 100644
--- a/lib/notification/notificationTasks.dart
+++ b/lib/notification/notificationTasks.dart
@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter_app_badger/flutter_app_badger.dart';
 import 'package:provider/provider.dart';
 
-import '../app.dart';
+import '../main.dart';
 import '../model/chatList/chatListProps.dart';
 import '../model/chatList/chatProps.dart';
 
@@ -18,6 +18,6 @@ class NotificationTasks {
   }
 
   static void navigateToTalk() {
-    App.bottomNavigator.jumpToTab(1);
+    Main.bottomNavigator.jumpToTab(1);
   }
 }