Updated dependencies

2024-03-23 23:38:20 +01:00
parent e7192008c0
commit 1374666858
9 changed files with 101 additions and 89 deletions
--- a/lib/app.dart
+++ b/lib/app.dart
@ -5,7 +5,7 @@ import 'dart:developer';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
-import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:provider/provider.dart';
 import 'package:badges/badges.dart' as badges;

@ -93,67 +93,75 @@ class _AppState extends State<App> with WidgetsBindingObserver {
  @override
  Widget build(BuildContext context) {
    return PersistentTabView(
-      context,
      controller: App.bottomNavigator,
-      navBarStyle: NavBarStyle.style6,
-      hideNavigationBarWhenKeyboardShows: true,
-      navBarHeight: MediaQuery.of(context).viewInsets.bottom > 0 ? 0.0 : kBottomNavigationBarHeight,
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      decoration: const NavBarDecoration(
-        border: Border(top: BorderSide(width: 1, color: Colors.grey)),
-      ),
-      screenTransitionAnimation: const ScreenTransitionAnimation(animateTabTransition: true, curve: Curves.ease, duration: Duration(milliseconds: 200)),
-      screens: const [
-        Breaker(breaker: BreakerArea.timetable, child: Timetable()),
-        Breaker(breaker: BreakerArea.talk, child: ChatList()),
-        Breaker(breaker: BreakerArea.files, child: Files([])),
-        Breaker(breaker: BreakerArea.more, child: Overhang()),
-      ],
-      items: [
-        PersistentBottomNavBarItem(
-          activeColorPrimary: Theme.of(context).primaryColor,
-          inactiveColorPrimary: Theme.of(context).colorScheme.secondary,
-          icon: const Icon(Icons.calendar_month),
-          title: "Vertretung"
-        ),
-        PersistentBottomNavBarItem(
-          activeColorPrimary: Theme.of(context).primaryColor,
-          inactiveColorPrimary: Theme.of(context).colorScheme.secondary,
-          icon: Consumer<ChatListProps>(
-            builder: (context, value, child) {
-              if(value.primaryLoading()) return const Icon(Icons.chat);
-              int messages = value.getRoomsResponse.data.map((e) => e.unreadMessages).reduce((a, b) => a+b);
-              return badges.Badge(
-                showBadge: messages > 0,
-                position: badges.BadgePosition.topEnd(top: -3, end: -3),
-                stackFit: StackFit.loose,
-                badgeStyle: badges.BadgeStyle(
-                  padding: const EdgeInsets.all(3),
-                  badgeColor: Theme.of(context).primaryColor,
-                  elevation: 1,
-                ),
-                badgeContent: Text("$messages", style: const TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold)),
-                child: const Icon(Icons.chat),
-              );
-            },
-          ),
-          title: "Talk",
-        ),
-        PersistentBottomNavBarItem(
-          activeColorPrimary: Theme.of(context).primaryColor,
-          inactiveColorPrimary: Theme.of(context).colorScheme.secondary,
-          icon: const Icon(Icons.folder),
-          title: "Dateien"
-        ),
-        PersistentBottomNavBarItem(
-          activeColorPrimary: Theme.of(context).primaryColor,
-          inactiveColorPrimary: Theme.of(context).colorScheme.secondary,
-          icon: const Icon(Icons.apps),
-          title: "Mehr"
-        ),
-      ],
-    );
+      gestureNavigationEnabled: true,
+      navBarOverlap: const NavBarOverlap.none(),
+      backgroundColor: Theme.of(context).colorScheme.primary,

+      screenTransitionAnimation: const ScreenTransitionAnimation(curve: Curves.easeOutQuad, duration: Duration(milliseconds: 200)),
+      tabs: [
+        PersistentTabConfig(
+          screen: const Breaker(breaker: BreakerArea.timetable, child: Timetable()),
+          item: ItemConfig(
+            activeForegroundColor: Theme.of(context).primaryColor,
+            inactiveForegroundColor: Theme.of(context).colorScheme.secondary,
+            icon: const Icon(Icons.calendar_month),
+            title: "Vertretung"
+          ),
+        ),
+        PersistentTabConfig(
+          screen: const Breaker(breaker: BreakerArea.talk, child: ChatList()),
+          item: ItemConfig(
+            activeForegroundColor: Theme.of(context).primaryColor,
+            inactiveForegroundColor: Theme.of(context).colorScheme.secondary,
+            icon: Consumer<ChatListProps>(
+              builder: (context, value, child) {
+                if(value.primaryLoading()) return const Icon(Icons.chat);
+                int messages = value.getRoomsResponse.data.map((e) => e.unreadMessages).reduce((a, b) => a+b);
+                return badges.Badge(
+                  showBadge: messages > 0,
+                  position: badges.BadgePosition.topEnd(top: -3, end: -3),
+                  stackFit: StackFit.loose,
+                  badgeStyle: badges.BadgeStyle(
+                    padding: const EdgeInsets.all(3),
+                    badgeColor: Theme.of(context).primaryColor,
+                    elevation: 1,
+                  ),
+                  badgeContent: Text("$messages", style: const TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold)),
+                  child: const Icon(Icons.chat),
+                );
+              },
+            ),
+            title: "Talk",
+          ),
+        ),
+        PersistentTabConfig(
+          screen: const Breaker(breaker: BreakerArea.files, child: Files([])),
+          item: ItemConfig(
+              activeForegroundColor: Theme.of(context).primaryColor,
+              inactiveForegroundColor: Theme.of(context).colorScheme.secondary,
+              icon: const Icon(Icons.folder),
+              title: "Dateien"
+          ),
+        ),
+        PersistentTabConfig(
+          screen: const Breaker(breaker: BreakerArea.more, child: Overhang()),
+          item: ItemConfig(
+              activeForegroundColor: Theme.of(context).primaryColor,
+              inactiveForegroundColor: Theme.of(context).colorScheme.secondary,
+              icon: const Icon(Icons.apps),
+              title: "Mehr"
+          ),
+        ),
+      ],
+      navBarBuilder: (config) => Style6BottomNavBar(
+        navBarConfig: config,
+        navBarDecoration: NavBarDecoration(
+          border: const Border(top: BorderSide(width: 1, color: Colors.grey)),
+          color: Theme.of(context).colorScheme.surface,
+        ),
+      ),
+    );
  }

  @override
--- a/lib/view/pages/files/files.dart
+++ b/lib/view/pages/files/files.dart
@ -238,6 +238,7 @@ class _FilesState extends State<Files> {
            return Future.delayed(const Duration(seconds: 3));
          },
          child: ListView.builder(
+            padding: EdgeInsets.zero,
            itemCount: files.length,
            itemBuilder: (context, index) {
              CacheableFile file = files.toList()[index];
--- a/lib/view/pages/overhang.dart
+++ b/lib/view/pages/overhang.dart
@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:in_app_review/in_app_review.dart';
 import 'package:marianum_mobile/extensions/renderNotNull.dart';
-import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';

 import '../../widget/ListItem.dart';
 import '../../widget/centeredLeading.dart';
@ -27,7 +27,7 @@ class Overhang extends StatelessWidget {
      appBar: AppBar(
        title: const Text("Mehr"),
        actions: [
-          IconButton(onPressed: () => pushNewScreen(context, screen: const Settings(), withNavBar: false), icon: const Icon(Icons.settings))
+          IconButton(onPressed: () => pushScreen(context, screen: const Settings(), withNavBar: false), icon: const Icon(Icons.settings))
        ],
      ),
      body: ListView(
@ -55,20 +55,17 @@ class Overhang extends StatelessWidget {
                return null;
              }

-              return Visibility(
-                visible: snapshot.requireData,
-                child: ListTile(
-                  leading: const CenteredLeading(Icon(Icons.star_rate_outlined)),
-                  title: const Text("App Bewerten"),
-                  subtitle: getPlatformStoreName().wrapNullable((data) => Text("Im $data")),
-                  trailing: const Icon(Icons.arrow_right),
-                  onTap: () {
-                    InAppReview.instance.openStoreListing(appStoreId: "6458789560").then(
-                      (value) => InfoDialog.show(context, "Vielen Dank!"),
+              return ListTile(
+                leading: const CenteredLeading(Icon(Icons.star_rate_outlined)),
+                title: const Text("App Bewerten"),
+                subtitle: getPlatformStoreName().wrapNullable((data) => Text("Im $data")),
+                trailing: const Icon(Icons.arrow_right),
+                onTap: () {
+                  InAppReview.instance.openStoreListing(appStoreId: "6458789560").then(
+                          (value) => InfoDialog.show(context, "Vielen Dank!"),
                      onError: (error) => InfoDialog.show(context, error.toString())
-                    );
-                  },
-                ),
+                  );
+                },
              );
            },
          ),
--- a/lib/view/pages/talk/chatList.dart
+++ b/lib/view/pages/talk/chatList.dart
@ -136,7 +136,10 @@ class _ChatListState extends State<ChatList> {
                _query(renew: true);
                return Future.delayed(const Duration(seconds: 3));
              },
-              child: ListView(children: chats),
+              child: ListView(
+                padding: EdgeInsets.zero,
+                children: chats
+              ),
            );
          },
        ),
--- a/lib/view/pages/talk/chatView.dart
+++ b/lib/view/pages/talk/chatView.dart
@ -129,7 +129,10 @@ class _ChatViewState extends State<ChatView> {
                ),
                Container(
                  color: Theme.of(context).colorScheme.background,
-                  child: SafeArea(child: ChatTextfield(widget.room.token)),
+                  child: TalkNavigator.isSecondaryVisible(context)
+                      ? ChatTextfield(widget.room.token)
+                      : SafeArea(child: ChatTextfield(widget.room.token)
+                  ),
                )
              ],
            ),
--- a/lib/view/pages/talk/talkNavigator.dart
+++ b/lib/view/pages/talk/talkNavigator.dart
@ -1,7 +1,7 @@

 import 'package:flutter/material.dart';
 import 'package:flutter_split_view/flutter_split_view.dart';
-import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';

 class TalkNavigator {
  static bool hasSplitViewState(BuildContext context) => context.findAncestorStateOfType<SplitViewState>() != null;
@ -12,7 +12,7 @@ class TalkNavigator {
      SplitViewState splitView = SplitView.of(context);
      overrideToSingleSubScreen ? splitView.setSecondary(view) : splitView.push(view);
    } else {
-      pushNewScreen(context, screen: view, withNavBar: false);
+      pushScreen(context, screen: view, withNavBar: false);
    }
  }
 }
--- a/lib/view/pages/timetable/appointmentDetails.dart
+++ b/lib/view/pages/timetable/appointmentDetails.dart
@ -5,7 +5,7 @@ import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:jiffy/jiffy.dart';
-import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:provider/provider.dart';
 import 'package:rrule/rrule.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
@ -103,7 +103,7 @@ class AppointmentDetails {
              trailing: IconButton(
                icon: const Icon(Icons.house_outlined),
                onPressed: () {
-                  pushNewScreen(context, withNavBar: false, screen: const Roomplan());
+                  pushScreen(context, withNavBar: false, screen: const Roomplan());
                },
              ),
            ),
--- a/lib/widget/ListItem.dart
+++ b/lib/widget/ListItem.dart
@ -1,6 +1,6 @@

 import 'package:flutter/material.dart';
-import 'package:persistent_bottom_nav_bar_v2/persistent-tab-view.dart';
+import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';

 class ListItemNavigator extends StatelessWidget {
  const ListItemNavigator({super.key, required this.icon, required this.text, required this.target, this.onLongPress, this.arrow = true});
@ -15,7 +15,7 @@ class ListItemNavigator extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    onTabAction() => pushNewScreen(context, withNavBar: false, screen: target); //Navigator.push(context, MaterialPageRoute(builder: (context) => target));
+    onTabAction() => pushScreen(context, withNavBar: false, screen: target); //Navigator.push(context, MaterialPageRoute(builder: (context) => target));
    onLongPressAction() => onLongPress;

    return ListTile(