inex/FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Implement forwarding messages

Browse source
This commit is contained in:
Christian Pauly 2020-01-17 11:37:02 +01:00
parent bd36e3039e
commit 72dce3ac1d
4 changed files with 72 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/components/list_items/chat_list_item.dart
View file

@ -6,6 +6,7 @@ import 'package:fluffychat/utils/room_name_calculator.dart';
import 'package:fluffychat/views/chat.dart';
import 'package:flutter/material.dart';
import 'package:toast/toast.dart';
import 'package:pedantic/pedantic.dart';
import '../avatar.dart';
import '../matrix.dart';
@ -67,6 +68,10 @@ class ChatListItem extends StatelessWidget {
}
if (room.membership == Membership.join) {
if (Matrix.of(context).shareContent != null) {
unawaited(room.sendEvent(Matrix.of(context).shareContent));
Matrix.of(context).shareContent = null;
}
await Navigator.pushAndRemoveUntil(
context,
AppRoute.defaultRoute(context, Chat(room.id)),

13
lib/components/list_items/message.dart
View file

@ -72,6 +72,15 @@ class Message extends StatelessWidget {
);
}
if (!event.redacted) {
popupMenuList.add(
const PopupMenuItem<String>(
value: "forward",
child: Text('Forward'),
),
);
}
if (ownMessage && event.status == -1) {
popupMenuList.add(
const PopupMenuItem<String>(
@ -108,6 +117,10 @@ class Message extends StatelessWidget {
case "copy":
await Clipboard.setData(ClipboardData(text: event.body));
break;
case "forward":
Matrix.of(context).shareContent = event.content;
Navigator.of(context).popUntil((r) => r.isFirst);
break;
}
},
itemBuilder: (BuildContext context) => popupMenuList,

1
lib/components/matrix.dart
View file

@ -42,6 +42,7 @@ class MatrixState extends State<Matrix> {
FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin =
FlutterLocalNotificationsPlugin();
Map<String, dynamic> shareContent;
String activeRoomId;

89
lib/views/chat_list.dart
View file

@ -12,6 +12,8 @@ import 'package:fluffychat/views/settings.dart';
import 'package:flutter/material.dart';
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
enum SelectMode { normal, multi_select, share }
class ChatListView extends StatelessWidget {
@override
Widget build(BuildContext context) {
@ -39,6 +41,7 @@ class _ChatListState extends State<ChatList> {
bool searchMode = false;
StreamSubscription sub;
final TextEditingController searchController = TextEditingController();
SelectMode selectMode = SelectMode.normal;
Future<bool> waitForFirstSync(BuildContext context) async {
Client client = Matrix.of(context).client;
@ -68,6 +71,11 @@ class _ChatListState extends State<ChatList> {
@override
Widget build(BuildContext context) {
if (Matrix.of(context).shareContent != null) {
selectMode = SelectMode.share;
} else if (selectMode == SelectMode.share) {
setState(() => selectMode = SelectMode.normal);
}
return Scaffold(
appBar: AppBar(
title: searchMode
@ -81,7 +89,7 @@ class _ChatListState extends State<ChatList> {
),
)
: Text(
"FluffyChat",
selectMode == SelectMode.share ? "Share" : "FluffyChat",
),
leading: searchMode
? IconButton(
@ -97,41 +105,50 @@ class _ChatListState extends State<ChatList> {
icon: Icon(Icons.search),
onPressed: () => setState(() => searchMode = true),
),
PopupMenuButton(
onSelected: (String choice) {
switch (choice) {
case "settings":
Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
SettingsView(),
),
(r) => r.isFirst,
);
break;
case "archive":
Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
Archive(),
),
(r) => r.isFirst,
);
break;
}
},
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<String>>[
const PopupMenuItem<String>(
value: "archive",
child: Text('Archive'),
),
const PopupMenuItem<String>(
value: "settings",
child: Text('Settings'),
),
],
),
if (selectMode == SelectMode.share)
IconButton(
icon: Icon(Icons.close),
onPressed: () {
Matrix.of(context).shareContent = null;
setState(() => selectMode = SelectMode.normal);
},
),
if (selectMode == SelectMode.normal)
PopupMenuButton(
onSelected: (String choice) {
switch (choice) {
case "settings":
Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
SettingsView(),
),
(r) => r.isFirst,
);
break;
case "archive":
Navigator.of(context).pushAndRemoveUntil(
AppRoute.defaultRoute(
context,
Archive(),
),
(r) => r.isFirst,
);
break;
}
},
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<String>>[
const PopupMenuItem<String>(
value: "archive",
child: Text('Archive'),
),
const PopupMenuItem<String>(
value: "settings",
child: Text('Settings'),
),
],
),
],
),
floatingActionButton: SpeedDial(