MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Updated feedback to include screenshot and drawings

Browse Source
This commit is contained in:
Elias Müller
2024-03-16 21:28:28 +01:00
parent eb361febf8
commit 7b3c0b4885
17 changed files with 186 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/view/pages/talk/chatView.dart
View File

@ -92,7 +92,6 @@ class _ChatViewState extends State<ChatView> {
}
return Scaffold(
backgroundColor: const Color(0xffefeae2),
appBar: ClickableAppBar(
onTap: () {
TalkNavigator.pushSplitView(context, ChatInfo(widget.room));

2
lib/view/pages/talk/components/chatTile.dart
View File

@ -121,7 +121,7 @@ class _ChatTileState extends State<ChatTile> {
onTap: () async {
setCurrentAsRead();
ChatView view = ChatView(room: widget.data, selfId: username, avatar: circleAvatar);
TalkNavigator.pushSplitView(context, view, overrideToSingleSubScreen: true);
TalkNavigator.pushSplitView(context, view, onSecondaryScreen: true);
Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.data.token);
},
onLongPress: () {

7
lib/view/pages/talk/talkNavigator.dart
View File

@ -1,18 +1,17 @@
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';
class TalkNavigator {
static bool hasSplitViewState(BuildContext context) => context.findAncestorStateOfType<SplitViewState>() != null;
static bool isSecondaryVisible(BuildContext context) => hasSplitViewState(context) && SplitView.of(context).isSecondaryVisible;
static void pushSplitView(BuildContext context, Widget view, {bool overrideToSingleSubScreen = false}) {
static void pushSplitView(BuildContext context, Widget view, {bool onSecondaryScreen = false}) {
if(isSecondaryVisible(context)) {
SplitViewState splitView = SplitView.of(context);
overrideToSingleSubScreen ? splitView.setSecondary(view) : splitView.push(view);
onSecondaryScreen ? splitView.setSecondary(view) : splitView.push(view);
} else {
pushNewScreen(context, screen: view, withNavBar: false);
Navigator.of(context).push(MaterialPageRoute(builder: (context) => view));
}
}
}