Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	lib/app.dart
This commit is contained in:
Elias Müller 2024-02-07 21:18:32 +01:00
commit d5344494d7

View File

@ -1,8 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:marianum_mobile/notification/notificationTasks.dart';
import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart'; import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:badges/badges.dart' as badges; import 'package:badges/badges.dart' as badges;
@ -33,6 +35,16 @@ class _AppState extends State<App> {
late Timer refetchChats; late Timer refetchChats;
late Timer updateTimings; late Timer updateTimings;
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
log("AppLifecycle: ${state.toString()}");
if(state == AppLifecycleState.resumed) {
NotificationTasks.updateProviders(context);
}
}
@override @override
void initState() { void initState() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
@ -75,11 +87,11 @@ class _AppState extends State<App> {
navBarStyle: NavBarStyle.style6, navBarStyle: NavBarStyle.style6,
hideNavigationBarWhenKeyboardShows: true, hideNavigationBarWhenKeyboardShows: true,
navBarHeight: MediaQuery.of(context).viewInsets.bottom > 0 ? 0.0 : kBottomNavigationBarHeight, navBarHeight: MediaQuery.of(context).viewInsets.bottom > 0 ? 0.0 : kBottomNavigationBarHeight,
backgroundColor: Theme.of(context).colorScheme.background, backgroundColor: Theme.of(context).colorScheme.surface,
decoration: const NavBarDecoration( decoration: const NavBarDecoration(
border: Border(top: BorderSide(width: 1, color: Colors.grey)), border: Border(top: BorderSide(width: 1, color: Colors.grey)),
), ),
screenTransitionAnimation: const ScreenTransitionAnimation(animateTabTransition: true, curve: Curves.ease, duration: Duration(milliseconds: 150)), screenTransitionAnimation: const ScreenTransitionAnimation(animateTabTransition: true, curve: Curves.ease, duration: Duration(milliseconds: 200)),
screens: const [ screens: const [
Breaker(breaker: BreakerArea.timetable, child: Timetable()), Breaker(breaker: BreakerArea.timetable, child: Timetable()),
Breaker(breaker: BreakerArea.talk, child: ChatList()), Breaker(breaker: BreakerArea.talk, child: ChatList()),