mirror of
https://github.com/vleeuwenmenno/supplements.git
synced 2025-09-11 18:29:12 +02:00
feat: Implement snooze functionality for notifications
- Added snooze duration setting in SettingsScreen. - Created DebugNotificationsScreen to view pending notifications and logs. - Integrated notification logging with NotificationDebugStore. - Enhanced SimpleNotificationService to handle snooze actions and log notifications. - Removed ProfileSetupScreen as it is no longer needed. - Updated NotificationRouter to manage snooze actions without UI. - Refactored settings provider to include snooze duration management.
This commit is contained in:
@@ -4,6 +4,7 @@ import 'package:timezone/data/latest.dart' as tzdata;
|
||||
import 'package:timezone/timezone.dart' as tz;
|
||||
import 'dart:convert';
|
||||
import 'package:supplements/services/notification_router.dart';
|
||||
import 'package:supplements/services/notification_debug_store.dart';
|
||||
|
||||
import '../models/supplement.dart';
|
||||
|
||||
@@ -33,7 +34,9 @@ class SimpleNotificationService {
|
||||
///
|
||||
/// Note: This does not request runtime permissions. Call [requestPermissions]
|
||||
/// to prompt the user for notification permissions.
|
||||
Future<void> initialize() async {
|
||||
Future<void> initialize({
|
||||
DidReceiveBackgroundNotificationResponseCallback? onDidReceiveBackgroundNotificationResponse,
|
||||
}) async {
|
||||
if (_initialized) return;
|
||||
|
||||
// Initialize timezone database and set a sane default.
|
||||
@@ -52,12 +55,14 @@ class SimpleNotificationService {
|
||||
'single',
|
||||
actions: [
|
||||
DarwinNotificationAction.plain('take_single', 'Take'),
|
||||
DarwinNotificationAction.plain('snooze_single', 'Snooze'),
|
||||
],
|
||||
),
|
||||
DarwinNotificationCategory(
|
||||
'group',
|
||||
actions: [
|
||||
DarwinNotificationAction.plain('take_group', 'Take All'),
|
||||
DarwinNotificationAction.plain('snooze_group', 'Snooze'),
|
||||
],
|
||||
),
|
||||
],
|
||||
@@ -77,6 +82,7 @@ class SimpleNotificationService {
|
||||
onDidReceiveNotificationResponse: (response) {
|
||||
NotificationRouter.instance.handleNotificationResponse(response);
|
||||
},
|
||||
onDidReceiveBackgroundNotificationResponse: onDidReceiveBackgroundNotificationResponse,
|
||||
);
|
||||
|
||||
_initialized = true;
|
||||
@@ -190,9 +196,12 @@ class SimpleNotificationService {
|
||||
|
||||
// Use BigTextStyle/InboxStyle for Android to show multiple lines
|
||||
final bool isSingle = count == 1;
|
||||
final String payloadStr = isSingle
|
||||
? jsonEncode({"type": "single", "id": items.first.id})
|
||||
: jsonEncode({"type": "group", "time": timeKey});
|
||||
// Tag payload with origin meta for debug/inspection
|
||||
final Map<String, dynamic> payloadMap = isSingle
|
||||
? {"type": "single", "id": items.first.id}
|
||||
: {"type": "group", "time": timeKey};
|
||||
payloadMap["meta"] = {"kind": "daily"};
|
||||
final String payloadStr = jsonEncode(payloadMap);
|
||||
|
||||
final androidDetails = AndroidNotificationDetails(
|
||||
_channelDailyId,
|
||||
@@ -220,6 +229,20 @@ class SimpleNotificationService {
|
||||
showsUserInterface: true,
|
||||
cancelNotification: true,
|
||||
),
|
||||
if (isSingle)
|
||||
AndroidNotificationAction(
|
||||
'snooze_single',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
// Removed cancelNotification: true for debugging
|
||||
)
|
||||
else
|
||||
AndroidNotificationAction(
|
||||
'snooze_group',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
// Removed cancelNotification: true for debugging
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
@@ -241,6 +264,22 @@ class SimpleNotificationService {
|
||||
payload: payloadStr,
|
||||
);
|
||||
|
||||
// Log to debug store
|
||||
final createdAtMs = DateTime.now().millisecondsSinceEpoch;
|
||||
await NotificationDebugStore.instance.add(
|
||||
NotificationLogEntry(
|
||||
id: id,
|
||||
kind: 'daily',
|
||||
type: isSingle ? 'single' : 'group',
|
||||
whenEpochMs: when.millisecondsSinceEpoch,
|
||||
createdAtEpochMs: createdAtMs,
|
||||
title: title,
|
||||
payload: payloadStr,
|
||||
singleId: isSingle ? items.first.id as int? : null,
|
||||
timeKey: isSingle ? null : timeKey,
|
||||
),
|
||||
);
|
||||
|
||||
printLog('✅ Scheduled group $timeKey with ID $id');
|
||||
}
|
||||
|
||||
@@ -288,34 +327,204 @@ class SimpleNotificationService {
|
||||
await _plugin.cancelAll();
|
||||
}
|
||||
|
||||
/// Cancel a specific notification by ID.
|
||||
Future<void> cancelById(int id) async {
|
||||
if (!_initialized) {
|
||||
await initialize();
|
||||
}
|
||||
await _plugin.cancel(id);
|
||||
}
|
||||
|
||||
/// Show an immediate notification. Useful for quick diagnostics.
|
||||
Future<void> showInstant({
|
||||
required String title,
|
||||
required String body,
|
||||
String? payload,
|
||||
bool includeSnoozeActions = false, // New parameter
|
||||
bool isSingle = true, // New parameter, defaults to single for instant
|
||||
}) async {
|
||||
if (!_initialized) {
|
||||
await initialize();
|
||||
}
|
||||
|
||||
final androidDetails = AndroidNotificationDetails(
|
||||
'instant_notifications',
|
||||
'Instant Notifications',
|
||||
channelDescription: 'One-off or immediate notifications',
|
||||
importance: Importance.high,
|
||||
priority: Priority.high,
|
||||
actions: includeSnoozeActions
|
||||
? [
|
||||
if (isSingle)
|
||||
AndroidNotificationAction(
|
||||
'take_single',
|
||||
'Take',
|
||||
showsUserInterface: true,
|
||||
cancelNotification: true,
|
||||
)
|
||||
else
|
||||
AndroidNotificationAction(
|
||||
'take_group',
|
||||
'Take All',
|
||||
showsUserInterface: true,
|
||||
cancelNotification: true,
|
||||
),
|
||||
if (isSingle)
|
||||
AndroidNotificationAction(
|
||||
'snooze_single',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
cancelNotification: true,
|
||||
)
|
||||
else
|
||||
AndroidNotificationAction(
|
||||
'snooze_group',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
cancelNotification: true,
|
||||
),
|
||||
]
|
||||
: [], // No actions by default
|
||||
);
|
||||
|
||||
final iosDetails = DarwinNotificationDetails(
|
||||
categoryIdentifier: includeSnoozeActions
|
||||
? (isSingle ? 'single' : 'group')
|
||||
: null, // Use category for actions
|
||||
);
|
||||
|
||||
await _plugin.show(
|
||||
DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
||||
title,
|
||||
body,
|
||||
const NotificationDetails(
|
||||
android: AndroidNotificationDetails(
|
||||
'instant_notifications',
|
||||
'Instant Notifications',
|
||||
channelDescription: 'One-off or immediate notifications',
|
||||
importance: Importance.high,
|
||||
priority: Priority.high,
|
||||
),
|
||||
iOS: DarwinNotificationDetails(),
|
||||
NotificationDetails(
|
||||
android: androidDetails,
|
||||
iOS: iosDetails,
|
||||
),
|
||||
payload: payload,
|
||||
);
|
||||
}
|
||||
|
||||
/// Schedule a one-off (non-repeating) reminder, typically used for Snooze.
|
||||
Future<void> scheduleOneOffReminder({
|
||||
required String title,
|
||||
required String body,
|
||||
required String payload,
|
||||
required bool isSingle,
|
||||
required Duration delay,
|
||||
}) async {
|
||||
if (!_initialized) {
|
||||
await initialize();
|
||||
}
|
||||
|
||||
final when = tz.TZDateTime.now(tz.local).add(delay);
|
||||
final id = DateTime.now().millisecondsSinceEpoch ~/ 1000;
|
||||
|
||||
final androidDetails = AndroidNotificationDetails(
|
||||
_channelDailyId,
|
||||
_channelDailyName,
|
||||
channelDescription: _channelDailyDescription,
|
||||
importance: Importance.high,
|
||||
priority: Priority.high,
|
||||
styleInformation: BigTextStyleInformation(
|
||||
body,
|
||||
contentTitle: title,
|
||||
htmlFormatContentTitle: false,
|
||||
),
|
||||
actions: [
|
||||
if (isSingle)
|
||||
AndroidNotificationAction(
|
||||
'take_single',
|
||||
'Take',
|
||||
showsUserInterface: true,
|
||||
cancelNotification: true,
|
||||
)
|
||||
else
|
||||
AndroidNotificationAction(
|
||||
'take_group',
|
||||
'Take All',
|
||||
showsUserInterface: true,
|
||||
cancelNotification: true,
|
||||
),
|
||||
if (isSingle)
|
||||
AndroidNotificationAction(
|
||||
'snooze_single',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
// Removed cancelNotification: true for debugging
|
||||
)
|
||||
else
|
||||
AndroidNotificationAction(
|
||||
'snooze_group',
|
||||
'Snooze',
|
||||
showsUserInterface: false,
|
||||
// Removed cancelNotification: true for debugging
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
final iosDetails = DarwinNotificationDetails(
|
||||
categoryIdentifier: isSingle ? 'single' : 'group',
|
||||
);
|
||||
|
||||
// Enrich payload with meta for snooze; also capture linkage for logging
|
||||
Map<String, dynamic>? pmap;
|
||||
try {
|
||||
pmap = jsonDecode(payload) as Map<String, dynamic>;
|
||||
} catch (_) {
|
||||
pmap = null;
|
||||
}
|
||||
final createdAtMs = DateTime.now().millisecondsSinceEpoch;
|
||||
String payloadFinal = payload;
|
||||
int? logSingleId;
|
||||
String? logTimeKey;
|
||||
if (pmap != null) {
|
||||
final meta = {
|
||||
'kind': 'snooze',
|
||||
'createdAt': createdAtMs,
|
||||
'delayMin': delay.inMinutes,
|
||||
};
|
||||
pmap['meta'] = meta;
|
||||
if (pmap['type'] == 'single') {
|
||||
final v = pmap['id'];
|
||||
logSingleId = v is int ? v : null;
|
||||
} else if (pmap['type'] == 'group') {
|
||||
logTimeKey = pmap['time'] as String?;
|
||||
}
|
||||
payloadFinal = jsonEncode(pmap);
|
||||
}
|
||||
|
||||
await _plugin.zonedSchedule(
|
||||
id,
|
||||
title,
|
||||
isSingle ? body : 'Tap to see details',
|
||||
when,
|
||||
NotificationDetails(
|
||||
android: androidDetails,
|
||||
iOS: iosDetails,
|
||||
),
|
||||
androidScheduleMode: AndroidScheduleMode.inexactAllowWhileIdle,
|
||||
payload: payloadFinal,
|
||||
);
|
||||
|
||||
// Log to debug store
|
||||
await NotificationDebugStore.instance.add(
|
||||
NotificationLogEntry(
|
||||
id: id,
|
||||
kind: 'snooze',
|
||||
type: isSingle ? 'single' : 'group',
|
||||
whenEpochMs: when.millisecondsSinceEpoch,
|
||||
createdAtEpochMs: createdAtMs,
|
||||
title: title,
|
||||
payload: payloadFinal,
|
||||
singleId: logSingleId,
|
||||
timeKey: logTimeKey,
|
||||
),
|
||||
);
|
||||
|
||||
printLog('⏰ Scheduled one-off reminder (id=$id) at $when, isSingle=$isSingle');
|
||||
}
|
||||
|
||||
Future<NotificationAppLaunchDetails?> getLaunchDetails() async {
|
||||
if (!_initialized) {
|
||||
await initialize();
|
||||
|
||||
Reference in New Issue
Block a user