Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Properly handle click actions on notifications

Browse Source
This commit is contained in:
Mike Schwörer
2024-07-13 01:05:32 +02:00
parent 74a935f6f1
commit e93d125431
7 changed files with 103 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/pages/channel_message_view/channel_message_view.dart
View File

@@ -94,7 +94,7 @@ class _ChannelMessageViewPageState extends State<ChannelMessageViewPage> {
message: item,
allChannels: {this.widget.channel.channelID: this.widget.channel},
onPressed: () {
Navi.push(context, () => MessageViewPage(message: item));
Navi.push(context, () => MessageViewPage(messageID: item.messageID, preloadedData: (item,)));
},
),
),

2
flutter/lib/pages/debug/debug_actions.dart
View File

@@ -56,7 +56,7 @@ class _DebugActionsPageState extends State<DebugActionsPage> {
SizedBox(height: 20),
UI.button(
big: false,
onPressed: () => Notifier.showLocalNotification('TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null),
onPressed: () => Notifier.showLocalNotification('', 'TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null),
text: 'Show local notification',
),
],

2
flutter/lib/pages/message_list/message_list.dart
View File

@@ -249,7 +249,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
message: item,
allChannels: _channels ?? {},
onPressed: () {
Navi.push(context, () => MessageViewPage(message: item));
Navi.push(context, () => MessageViewPage(messageID: item.messageID, preloadedData: (item,)));
},
),
),

25
flutter/lib/pages/message_view/message_view.dart
View File

@@ -18,9 +18,14 @@ import 'package:simplecloudnotifier/utils/toaster.dart';
import 'package:simplecloudnotifier/utils/ui.dart';
class MessageViewPage extends StatefulWidget {
const MessageViewPage({super.key, required this.message});
const MessageViewPage({
super.key,
required this.messageID,
required this.preloadedData,
});
final SCNMessage message; // Potentially trimmed
final String messageID; // Potentially trimmed
final (SCNMessage,)? preloadedData; // Message is potentially trimmed, whole object is potentially null
@override
State<MessageViewPage> createState() => _MessageViewPageState();
@@ -33,8 +38,14 @@ class _MessageViewPageState extends State<MessageViewPage> {
bool _monospaceMode = false;
SCNMessage? message = null;
@override
void initState() {
if (widget.preloadedData != null) {
message = widget.preloadedData!.$1;
}
mainFuture = fetchData();
super.initState();
}
@@ -47,7 +58,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
final acc = Provider.of<AppAuth>(context, listen: false);
final msg = await APIClient.getMessage(acc, widget.message.messageID);
final msg = await APIClient.getMessage(acc, widget.messageID);
final fut_chn = APIClient.getChannelPreview(acc, msg.channelID);
final fut_key = APIClient.getKeyTokenPreview(acc, msg.usedKeyID);
@@ -89,8 +100,8 @@ class _MessageViewPageState extends State<MessageViewPage> {
return _buildMessageView(context, msg, chn, tok, usr);
} else if (snapshot.hasError) {
return Center(child: Text('${snapshot.error}')); //TODO nice error page
} else if (!widget.message.trimmed) {
return _buildMessageView(context, widget.message, null, null, null);
} else if (message != null && !this.message!.trimmed) {
return _buildMessageView(context, this.message!, null, null, null);
} else {
return const Center(child: CircularProgressIndicator());
}
@@ -100,7 +111,9 @@ class _MessageViewPageState extends State<MessageViewPage> {
}
void _share() async {
var msg = widget.message;
if (this.message == null) return;
var msg = this.message!;
if (mainFutureSnapshot != null) {
(msg, _, _, _) = mainFutureSnapshot!;
}