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

Finished SplitView for Tablet devices

Browse Source
This commit is contained in:
Elias Müller
2023-09-12 09:31:34 +02:00
parent 482bf8dd0b
commit 6bc4d4d2ed
10 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/notification/notifyUpdater.dart
View File

@@ -6,12 +6,12 @@ import 'dart:developer';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:fast_rsa/fast_rsa.dart'; import 'package:fast_rsa/fast_rsa.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:marianum_mobile/storage/base/settingsProvider.dart';
import '../api/mhsl/notify/register/notifyRegister.dart'; import '../api/mhsl/notify/register/notifyRegister.dart';
import '../api/mhsl/notify/register/notifyRegisterParams.dart'; import '../api/mhsl/notify/register/notifyRegisterParams.dart';
import '../model/accountData.dart'; import '../model/accountData.dart';
import '../model/endpointData.dart'; import '../model/endpointData.dart';
import '../storage/base/settingsProvider.dart';
import '../widget/confirmDialog.dart'; import '../widget/confirmDialog.dart';
class NotifyUpdater { class NotifyUpdater {

5
lib/view/pages/talk/chatList.dart
View File

@@ -12,7 +12,8 @@ import '../../../notification/notifyUpdater.dart';
import '../../../storage/base/settingsProvider.dart'; import '../../../storage/base/settingsProvider.dart';
import '../../../widget/confirmDialog.dart'; import '../../../widget/confirmDialog.dart';
import '../../../widget/loadingSpinner.dart'; import '../../../widget/loadingSpinner.dart';
import 'chatTile.dart'; import 'components/chatTile.dart';
import 'components/splitViewPlaceholder.dart';
import 'joinChat.dart'; import 'joinChat.dart';
import 'searchChat.dart'; import 'searchChat.dart';
@@ -74,6 +75,8 @@ class _ChatListState extends State<ChatList> {
ChatListProps? latestData; ChatListProps? latestData;
return SplitView.material( return SplitView.material(
placeholder: const SplitViewPlaceholder(),
breakpoint: 1000,
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
title: const Text("Talk"), title: const Text("Talk"),

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

@@ -11,8 +11,8 @@ import '../../../theming/appTheme.dart';
import '../../../model/chatList/chatProps.dart'; import '../../../model/chatList/chatProps.dart';
import '../../../widget/loadingSpinner.dart'; import '../../../widget/loadingSpinner.dart';
import '../../../widget/userAvatar.dart'; import '../../../widget/userAvatar.dart';
import 'chatBubble.dart'; import 'components/chatBubble.dart';
import 'chatTextfield.dart'; import 'components/chatTextfield.dart';
class ChatView extends StatefulWidget { class ChatView extends StatefulWidget {
final GetRoomResponseObject room; final GetRoomResponseObject room;

24
lib/view/pages/talk/chatBubble.dart → lib/view/pages/talk/components/chatBubble.dart
View File

@@ -6,19 +6,19 @@ import 'package:flutter/services.dart';
import 'package:jiffy/jiffy.dart'; import 'package:jiffy/jiffy.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../api/marianumcloud/talk/chat/getChatResponse.dart'; import '../../../../api/marianumcloud/talk/chat/getChatResponse.dart';
import '../../../api/marianumcloud/talk/deleteMessage/deleteMessage.dart'; import '../../../../api/marianumcloud/talk/deleteMessage/deleteMessage.dart';
import '../../../api/marianumcloud/talk/deleteReactMessage/deleteReactMessage.dart'; import '../../../../api/marianumcloud/talk/deleteReactMessage/deleteReactMessage.dart';
import '../../../api/marianumcloud/talk/deleteReactMessage/deleteReactMessageParams.dart'; import '../../../../api/marianumcloud/talk/deleteReactMessage/deleteReactMessageParams.dart';
import '../../../api/marianumcloud/talk/reactMessage/reactMessage.dart'; import '../../../../api/marianumcloud/talk/reactMessage/reactMessage.dart';
import '../../../api/marianumcloud/talk/reactMessage/reactMessageParams.dart'; import '../../../../api/marianumcloud/talk/reactMessage/reactMessageParams.dart';
import '../../../api/marianumcloud/talk/room/getRoomResponse.dart'; import '../../../../api/marianumcloud/talk/room/getRoomResponse.dart';
import '../../../model/chatList/chatProps.dart'; import '../../../../model/chatList/chatProps.dart';
import '../../../theming/appTheme.dart'; import '../../../../theming/appTheme.dart';
import '../../../widget/debug/debugTile.dart'; import '../../../../widget/debug/debugTile.dart';
import '../files/fileElement.dart'; import '../../files/fileElement.dart';
import 'chatMessage.dart'; import 'chatMessage.dart';
import 'messageReactions.dart'; import '../messageReactions.dart';
class ChatBubble extends StatefulWidget { class ChatBubble extends StatefulWidget {
final BuildContext context; final BuildContext context;

8
lib/view/pages/talk/chatMessage.dart → lib/view/pages/talk/components/chatMessage.dart
View File

@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:url_launcher/url_launcher_string.dart'; import 'package:url_launcher/url_launcher_string.dart';
import '../../../api/marianumcloud/talk/chat/getChatResponse.dart'; import '../../../../api/marianumcloud/talk/chat/getChatResponse.dart';
import '../../../api/marianumcloud/talk/chat/richObjectStringProcessor.dart'; import '../../../../api/marianumcloud/talk/chat/richObjectStringProcessor.dart';
import '../../../model/accountData.dart'; import '../../../../model/accountData.dart';
import '../../../model/endpointData.dart'; import '../../../../model/endpointData.dart';
class ChatMessage { class ChatMessage {
String originalMessage; String originalMessage;

18
lib/view/pages/talk/chatTextfield.dart → lib/view/pages/talk/components/chatTextfield.dart
View File

@@ -2,18 +2,18 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:loader_overlay/loader_overlay.dart'; import 'package:loader_overlay/loader_overlay.dart';
import 'package:marianum_mobile/storage/base/settingsProvider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
import '../../../api/marianumcloud/files-sharing/fileSharingApi.dart'; import '../../../../api/marianumcloud/files-sharing/fileSharingApi.dart';
import '../../../api/marianumcloud/files-sharing/fileSharingApiParams.dart'; import '../../../../api/marianumcloud/files-sharing/fileSharingApiParams.dart';
import '../../../api/marianumcloud/talk/sendMessage/sendMessage.dart'; import '../../../../api/marianumcloud/talk/sendMessage/sendMessage.dart';
import '../../../api/marianumcloud/talk/sendMessage/sendMessageParams.dart'; import '../../../../api/marianumcloud/talk/sendMessage/sendMessageParams.dart';
import '../../../api/marianumcloud/webdav/webdavApi.dart'; import '../../../../api/marianumcloud/webdav/webdavApi.dart';
import '../../../model/chatList/chatProps.dart'; import '../../../../model/chatList/chatProps.dart';
import '../../../widget/filePick.dart'; import '../../../../storage/base/settingsProvider.dart';
import '../files/fileUploadDialog.dart'; import '../../../../widget/filePick.dart';
import '../../files/fileUploadDialog.dart';
class ChatTextfield extends StatefulWidget { class ChatTextfield extends StatefulWidget {
final String sendToToken; final String sendToToken;

38
lib/view/pages/talk/chatTile.dart → lib/view/pages/talk/components/chatTile.dart
View File

@@ -2,20 +2,21 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_split_view/flutter_split_view.dart'; import 'package:flutter_split_view/flutter_split_view.dart';
import 'package:jiffy/jiffy.dart'; import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/widget/userAvatar.dart'; import 'package:persistent_bottom_nav_bar/persistent_tab_view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../../../api/marianumcloud/talk/chat/richObjectStringProcessor.dart'; import '../../../../api/marianumcloud/talk/chat/richObjectStringProcessor.dart';
import '../../../api/marianumcloud/talk/leaveRoom/leaveRoom.dart'; import '../../../../api/marianumcloud/talk/leaveRoom/leaveRoom.dart';
import '../../../api/marianumcloud/talk/room/getRoomResponse.dart'; import '../../../../api/marianumcloud/talk/room/getRoomResponse.dart';
import '../../../api/marianumcloud/talk/setFavorite/setFavorite.dart'; import '../../../../api/marianumcloud/talk/setFavorite/setFavorite.dart';
import '../../../api/marianumcloud/talk/setReadMarker/setReadMarker.dart'; import '../../../../api/marianumcloud/talk/setReadMarker/setReadMarker.dart';
import '../../../api/marianumcloud/talk/setReadMarker/setReadMarkerParams.dart'; import '../../../../api/marianumcloud/talk/setReadMarker/setReadMarkerParams.dart';
import '../../../model/chatList/chatProps.dart'; import '../../../../model/chatList/chatProps.dart';
import '../../../widget/confirmDialog.dart'; import '../../../../widget/confirmDialog.dart';
import '../../../widget/debug/debugTile.dart'; import '../../../../widget/debug/debugTile.dart';
import 'chatView.dart'; import '../../../../widget/userAvatar.dart';
import '../chatView.dart';
class ChatTile extends StatefulWidget { class ChatTile extends StatefulWidget {
final GetRoomResponseObject data; final GetRoomResponseObject data;
@@ -58,7 +59,7 @@ class _ChatTileState extends State<ChatTile> {
return Consumer<ChatProps>(builder: (context, chatData, child) { return Consumer<ChatProps>(builder: (context, chatData, child) {
return ListTile( return ListTile(
style: ListTileStyle.list, style: ListTileStyle.list,
tileColor: chatData.currentToken() == widget.data.token tileColor: chatData.currentToken() == widget.data.token && SplitView.of(context).pageCount > 1
? Theme.of(context).primaryColor.withAlpha(100) ? Theme.of(context).primaryColor.withAlpha(100)
: null, : null,
leading: Stack( leading: Stack(
@@ -117,14 +118,13 @@ class _ChatTileState extends State<ChatTile> {
), ),
onTap: () async { onTap: () async {
setCurrentAsRead(); setCurrentAsRead();
SplitView.of(context).setSecondary(ChatView(room: widget.data, selfId: username, avatar: circleAvatar)); ChatView view = ChatView(room: widget.data, selfId: username, avatar: circleAvatar);
if(SplitView.of(context).isSecondaryVisible) {
SplitView.of(context).setSecondary(view);
} else {
PersistentNavBarNavigator.pushNewScreen(context, screen: view, withNavBar: false);
}
Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.data.token); Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.data.token);
// PersistentNavBarNavigator.pushNewScreen(
// context,
// screen: ChatView(room: widget.data, selfId: username, avatar: circleAvatar),
// withNavBar: false
// );
}, },
onLongPress: () { onLongPress: () {
if(widget.disableContextActions) return; if(widget.disableContextActions) return;

22
lib/view/pages/talk/components/splitViewPlaceholder.dart Normal file
View File

@@ -0,0 +1,22 @@
import 'package:flutter/material.dart';
class SplitViewPlaceholder extends StatelessWidget {
const SplitViewPlaceholder({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(),
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset("assets/logo/icon.png", height: 200),
const SizedBox(height: 30),
const Text("Marianum Fulda\nTalk", textAlign: TextAlign.center, style: TextStyle(fontSize: 30)),
],
),
)
);
}
}

2
lib/view/pages/talk/messageReactions.dart
View File

@@ -1,7 +1,6 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/userAvatar.dart';
import '../../../api/marianumcloud/talk/getReactions/getReactions.dart'; import '../../../api/marianumcloud/talk/getReactions/getReactions.dart';
import '../../../api/marianumcloud/talk/getReactions/getReactionsResponse.dart'; import '../../../api/marianumcloud/talk/getReactions/getReactionsResponse.dart';
@@ -10,6 +9,7 @@ import '../../../widget/centeredLeading.dart';
import '../../../widget/loadingSpinner.dart'; import '../../../widget/loadingSpinner.dart';
import '../../../widget/placeholderView.dart'; import '../../../widget/placeholderView.dart';
import '../../../widget/unimplementedDialog.dart'; import '../../../widget/unimplementedDialog.dart';
import '../../../widget/userAvatar.dart';
class MessageReactions extends StatefulWidget { class MessageReactions extends StatefulWidget {
final String token; final String token;

2
lib/view/pages/talk/searchChat.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../api/marianumcloud/talk/room/getRoomResponse.dart'; import '../../../api/marianumcloud/talk/room/getRoomResponse.dart';
import 'chatTile.dart'; import 'components/chatTile.dart';
class SearchChat extends SearchDelegate { class SearchChat extends SearchDelegate {
List<GetRoomResponseObject> chats; List<GetRoomResponseObject> chats;