ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: Enhance message display with rich sender names and replace SnackBars with ToastLogger for notifications

Browse Source
This commit is contained in:
Janez T
2025-10-15 20:15:13 +02:00
parent f5a6e1f9ab
commit 2849ab92aa
4 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/widgets/contacts/contact_tile.dart
View File

@@ -9,6 +9,7 @@ import '../../providers/connection_provider.dart';
import '../../providers/map_provider.dart';
import 'direct_message_sheet.dart';
import 'room_login_sheet.dart';
import '../../utils/toast_logger.dart';
class ContactTile extends StatelessWidget {
final Contact contact;
@@ -301,15 +302,11 @@ class ContactTile extends StatelessWidget {
final hasPath = contact.hasPath;
// Show initial notification reflecting the method being used
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
hasPath
? 'Pinging ${contact.displayName} (direct via path)...'
: 'Pinging ${contact.displayName} (flooding - no path)...',
),
duration: const Duration(seconds: 6),
),
ToastLogger.info(
context,
hasPath
? 'Pinging ${contact.displayName} (direct via path)...'
: 'Pinging ${contact.displayName} (flooding - no path)...',
);
// Use smart ping with automatic fallback
@@ -319,14 +316,9 @@ class ContactTile extends StatelessWidget {
onRetryWithFlooding: () {
// Called when retrying with flooding after direct timeout
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Direct ping timeout - retrying ${contact.displayName} with flooding...',
),
duration: const Duration(seconds: 3),
backgroundColor: Colors.orange,
),
ToastLogger.warning(
context,
'Direct ping timeout - retrying ${contact.displayName} with flooding...',
);
}
},
@@ -334,17 +326,17 @@ class ContactTile extends StatelessWidget {
// Show final result
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
result.success
? 'Ping successful to ${contact.displayName}${result.retriedWithFlooding ? ' (via flooding fallback)' : ''}'
: 'Ping failed to ${contact.displayName} - no response received',
),
duration: const Duration(seconds: 2),
backgroundColor: result.success ? Colors.green : Colors.red,
),
);
if (result.success) {
ToastLogger.success(
context,
'Ping successful to ${contact.displayName}${result.retriedWithFlooding ? ' (via flooding fallback)' : ''}',
);
} else {
ToastLogger.error(
context,
'Ping failed to ${contact.displayName} - no response received',
);
}
}
},
),
@@ -600,12 +592,7 @@ class ContactTile extends StatelessWidget {
onPressed: () {
final connectionProvider = context.read<ConnectionProvider>();
connectionProvider.requestTelemetry(contact.publicKey, zeroHop: true);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Requesting telemetry from ${contact.displayName}...'),
duration: const Duration(seconds: 2),
),
);
ToastLogger.info(context, 'Requesting telemetry from ${contact.displayName}...');
},
icon: const Icon(Icons.refresh, size: 18),
label: const Text('Refresh'),
@@ -665,12 +652,7 @@ class ContactTile extends StatelessWidget {
child: OutlinedButton.icon(
onPressed: () {
connectionProvider.resetPath(contact.publicKey);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Path reset for ${contact.displayName}. Next message will find a new route.'),
duration: const Duration(seconds: 3),
),
);
ToastLogger.info(context, 'Path reset for ${contact.displayName}. Next message will find a new route.');
},
icon: const Icon(Icons.route),
label: const Text('Reset Path (Re-route)'),

23
lib/widgets/contacts/direct_message_sheet.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../../models/contact.dart';
import '../../providers/connection_provider.dart';
import '../../utils/toast_logger.dart';
class DirectMessageSheet extends StatefulWidget {
final Contact contact;
@@ -46,12 +47,7 @@ class _DirectMessageSheetState extends State<DirectMessageSheet> {
if (!connectionProvider.deviceInfo.isConnected) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Not connected to device'),
backgroundColor: Colors.red,
),
);
ToastLogger.error(context, 'Not connected to device');
return;
}
@@ -69,21 +65,10 @@ class _DirectMessageSheetState extends State<DirectMessageSheet> {
if (!mounted) return;
Navigator.pop(context); // Close the dialog
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Direct message sent to ${widget.contact.displayName}'),
backgroundColor: Colors.green,
duration: const Duration(seconds: 2),
),
);
ToastLogger.success(context, 'Direct message sent to ${widget.contact.displayName}');
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Failed to send: $e'),
backgroundColor: Colors.red,
),
);
ToastLogger.error(context, 'Failed to send: $e');
}
}