Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] notifications

Priyanshu Dangaree021bd0522a5
diff --git a/mobile/apps/photos/lib/services/notification_service.dart b/mobile/apps/photos/lib/services/notification_service.dart
index 47c929e1f9..c0adcaf385 100644
--- a/mobile/apps/photos/lib/services/notification_service.dart
+++ b/mobile/apps/photos/lib/services/notification_service.dart
@@ -1,9 +1,11 @@
import 'dart:io';
+import "package:android_intent_plus/android_intent.dart";
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import "package:flutter_timezone/flutter_timezone.dart";
import "package:logging/logging.dart";
-import "package:photos/services/sync/remote_sync_service.dart";
+import "package:package_info_plus/package_info_plus.dart";
+import "package:permission_handler/permission_handler.dart";
import "package:photos/services/timezone_aliases.dart";
import "package:shared_preferences/shared_preferences.dart";
import 'package:timezone/data/latest_10y.dart' as tzdb;
@@ -12,12 +14,12 @@ import "package:timezone/timezone.dart" as tz;
class NotificationService {
static final NotificationService instance =
NotificationService._privateConstructor();
- static const String keyGrantedNotificationPermission =
- "notification_permission_granted";
static const String keyShouldShowNotificationsForSharedPhotos =
"notifications_enabled_shared_photos";
static const String keyShouldShowSocialNotifications =
"notifications_enabled_social";
+ static const String _androidAppNotificationSettingsAction =
+ "android.settings.APP_NOTIFICATION_SETTINGS";
NotificationService._privateConstructor();
@@ -43,10 +45,6 @@ class NotificationService {
_onNotificationTapped = onNotificationTapped;
await _ensurePluginInitialized();
await _handleLaunchDetailsIfNeeded();
- if (!hasGrantedPermissions() &&
- RemoteSyncService.instance.isFirstRemoteSyncDone()) {
- await requestPermissions();
- }
}
Future<void> initializeForBackground() async {
@@ -165,28 +163,54 @@ class NotificationService {
Future<void> requestPermissions() async {
await _ensurePluginInitialized();
- bool? result;
+ final granted = Platform.isIOS
+ ? await _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ IOSFlutterLocalNotificationsPlugin
+ >()
+ ?.requestPermissions(sound: true, alert: true)
+ : await _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ AndroidFlutterLocalNotificationsPlugin
+ >()
+ ?.requestNotificationsPermission();
+ if (granted == false) await _openNotificationSettings();
+ }
+
+ Future<void> _openNotificationSettings() async {
+ if (!Platform.isAndroid) {
+ await openAppSettings();
+ return;
+ }
+
+ final packageInfo = await PackageInfo.fromPlatform();
+ await AndroidIntent(
+ action: _androidAppNotificationSettingsAction,
+ arguments: {
+ "android.provider.extra.APP_PACKAGE": packageInfo.packageName,
+ },
+ ).launch();
+ }
+
+ Future<bool> hasGrantedPermissions() async {
+ await _ensurePluginInitialized();
+
if (Platform.isIOS) {
- result = await _notificationsPlugin
+ final permissions = await _notificationsPlugin
.resolvePlatformSpecificImplementation<
IOSFlutterLocalNotificationsPlugin
>()
- ?.requestPermissions(sound: true, alert: true);
- } else {
- result = await _notificationsPlugin
- .resolvePlatformSpecificImplementation<
- AndroidFlutterLocalNotificationsPlugin
- >()
- ?.requestNotificationsPermission();
- }
- if (result != null) {
- await _preferences.setBool(keyGrantedNotificationPermission, result);
+ ?.checkPermissions();
+
+ return permissions?.isEnabled ?? false;
}
- }
- bool hasGrantedPermissions() {
- final result = _preferences.getBool(keyGrantedNotificationPermission);
- return result ?? false;
+ return await _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ AndroidFlutterLocalNotificationsPlugin
+ >()
+ ?.areNotificationsEnabled() ??
+ false;
}
bool shouldShowNotificationsForSharedPhotosAndAlbums() {
@@ -266,18 +290,6 @@ class NotificationService {
);
}
await initTimezones();
- if (!hasGrantedPermissions()) {
- _logger.warning("Notification permissions not granted");
- await requestPermissions();
- if (!hasGrantedPermissions()) {
- _logger.severe("Failed to get notification permissions");
- return;
- }
- } else {
- if (logSchedule) {
- _logger.info("Notification permissions already granted");
- }
- }
final androidSpecs = AndroidNotificationDetails(
channelID,
channelName,
diff --git a/mobile/apps/photos/lib/ui/home/memories/craft_memories.dart b/mobile/apps/photos/lib/ui/home/memories/craft_memories.dart
new file mode 100644
index 0000000000..5611e3929a
--- /dev/null
+++ b/mobile/apps/photos/lib/ui/home/memories/craft_memories.dart
@@ -0,0 +1,141 @@
+import "package:ente_components/ente_components.dart";
+import "package:flutter/material.dart";
+import "package:photos/services/notification_service.dart";
+import "package:photos/ui/home/memories/memory_cover_widget.dart";
+import "package:rive/rive.dart" as rive;
+
+class CraftMemories extends StatefulWidget {
+ final double width;
+ final double height;
+ final VoidCallback? onNotificationsPermissionGranted;
+
+ const CraftMemories({
+ super.key,
+ required this.width,
+ required this.height,
+ this.onNotificationsPermissionGranted,
+ });
+
+ @override
+ State<CraftMemories> createState() => _CraftMemoriesState();
+}
+
+class _CraftMemoriesState extends State<CraftMemories> {
+ late final rive.FileLoader _riveFileLoader;
+ bool _isButtonPressed = false;
+
+ @override
+ void initState() {
+ super.initState();
+ _riveFileLoader = rive.FileLoader.fromAsset(
+ "assets/ente_rewind_banner.riv",
+ riveFactory: rive.Factory.flutter,
+ );
+ }
+
+ @override
+ void dispose() {
+ _riveFileLoader.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.all(MemoryCoverWidget.gap / 2.0),
+ child: SizedBox(
+ width: widget.width,
+ height: widget.height,
+ child: ClipRRect(
+ borderRadius: BorderRadius.circular(18),
+ child: Stack(
+ children: [
+ Positioned.fill(
+ child: rive.RiveWidgetBuilder(
+ fileLoader: _riveFileLoader,
+ builder: (BuildContext context, rive.RiveState state) {
+ if (state is rive.RiveLoaded) {
+ return rive.RiveWidget(
+ controller: state.controller,
+ fit: rive.Fit.cover,
+ );
+ }
+ return const SizedBox.shrink();
+ },
+ ),
+ ),
+ Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.end,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const Text(
+ "Crafting",
+ style: TextStyle(
+ fontFamily: "Outfit",
+ package: TextStyles.fontPackage,
+ color: Colors.white,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ const Text(
+ "memories",
+ style: TextStyle(
+ fontFamily: "Outfit",
+ package: TextStyles.fontPackage,
+ color: Colors.white,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ _buildButton(),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildButton() {
+ return GestureDetector(
+ onTap: _requestPermissions,
+ onTapDown: (_) => setState(() => _isButtonPressed = true),
+ onTapUp: (_) => setState(() => _isButtonPressed = false),
+ onTapCancel: () => setState(() => _isButtonPressed = false),
+ child: AnimatedScale(
+ scale: _isButtonPressed ? 0.98 : 1,
+ duration: const Duration(milliseconds: 120),
+ curve: Curves.easeOutCubic,
+ child: DecoratedBox(
+ decoration: BoxDecoration(
+ color: Colors.white.withAlpha(128),
+ borderRadius: BorderRadius.circular(14),
+ ),
+ child: const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+ child: Text(
+ "Notify me",
+ style: TextStyle(
+ fontFamily: "Outfit",
+ package: TextStyles.fontPackage,
+ color: Colors.white,
+ fontSize: 11,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+ Future<void> _requestPermissions() async {
+ await NotificationService.instance.requestPermissions();
+ if (await NotificationService.instance.hasGrantedPermissions()) {
+ widget.onNotificationsPermissionGranted?.call();
+ }
+ }
+}
diff --git a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart b/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
index 5a101da38e..a145641e53 100644
--- a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
@@ -9,6 +9,8 @@ import "package:photos/events/memories_setting_changed.dart";
import "package:photos/events/memory_seen_event.dart";
import "package:photos/models/memories/smart_memory.dart";
import "package:photos/service_locator.dart";
+import "package:photos/services/notification_service.dart";
+import "package:photos/ui/home/memories/craft_memories.dart";
import "package:photos/ui/home/memories/memory_cover_util.dart";
import 'package:photos/ui/home/memories/memory_cover_widget.dart';
import "package:photos/ui/home/memories/memory_video_prefetcher.dart";
@@ -34,10 +36,12 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
int _warmGeneration = 0;
String? _lastWarmSignature;
final _videoPrefetcher = MemoryVideoPrefetcher();
+ late Future<bool> _hasNotificationsPermissions;
@override
void initState() {
super.initState();
+ _refreshNotificationsPermissions();
_memoriesSettingSubscription = Bus.instance
.on<MemoriesSettingChanged>()
.listen((event) {
@@ -61,6 +65,11 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
});
}
+ void _refreshNotificationsPermissions() {
+ _hasNotificationsPermissions = NotificationService.instance
+ .hasGrantedPermissions();
+ }
+
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -206,27 +215,50 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
}
Widget _buildMemories(List<SmartMemory> memories) {
- return SizedBox(
- height: _memoryheight + MemoryCoverWidget.outerStrokeWidth * 2,
- child: ListView.builder(
- padding: const EdgeInsets.symmetric(
- horizontal: MemoryCoverWidget.gap / 2.0,
- ),
- physics: const AlwaysScrollableScrollPhysics(
- parent: BouncingScrollPhysics(),
- ),
- scrollDirection: Axis.horizontal,
- itemCount: memories.length,
- itemBuilder: (context, itemIndex) {
- return MemoryCoverWidget(
- smartMemory: memories[itemIndex],
- allMemories: memories,
- height: _memoryheight,
- width: _memoryWidth,
- currentMemoryIndex: itemIndex,
- );
- },
- ),
+ return FutureBuilder<bool>(
+ future: _hasNotificationsPermissions,
+ builder: (context, snapshot) {
+ final hasNotificationsPermissions = snapshot.data ?? false;
+ return SizedBox(
+ height: _memoryheight + MemoryCoverWidget.outerStrokeWidth * 2,
+ child: ListView.builder(
+ padding: const EdgeInsets.symmetric(
+ horizontal: MemoryCoverWidget.gap / 2.0,
+ ),
+ physics: const AlwaysScrollableScrollPhysics(
+ parent: BouncingScrollPhysics(),
+ ),
+ scrollDirection: Axis.horizontal,
+ itemCount: hasNotificationsPermissions
+ ? memories.length
+ : memories.length + 1,
+ itemBuilder: (context, itemIndex) {
+ if (!hasNotificationsPermissions && itemIndex == 0) {
+ return CraftMemories(
+ width: _memoryWidth * 0.75,
+ height: _memoryheight,
+ onNotificationsPermissionGranted: () {
+ if (!mounted) return;
+ setState(() {
+ _refreshNotificationsPermissions();
+ });
+ },
+ );
+ }
+ final memoryIndex = hasNotificationsPermissions
+ ? itemIndex
+ : itemIndex - 1;
+ return MemoryCoverWidget(
+ smartMemory: memories[memoryIndex],
+ allMemories: memories,
+ height: _memoryheight,
+ width: _memoryWidth,
+ currentMemoryIndex: memoryIndex,
+ );
+ },
+ ),
+ );
+ },
);
}
}
diff --git a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
index 61cf480e61..654be3f262 100644
--- a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
@@ -1,3 +1,5 @@
+import "dart:async";
+
import "package:ente_components/ente_components.dart";
import "package:flutter/material.dart";
import "package:photos/generated/l10n.dart";
@@ -6,102 +8,150 @@ import "package:photos/services/notification_service.dart";
import "package:photos/ui/settings/components/settings_item.dart";
import "package:photos/ui/settings/components/settings_page_scaffold.dart";
-class NotificationSettingsScreen extends StatelessWidget {
+class NotificationSettingsScreen extends StatefulWidget {
const NotificationSettingsScreen({super.key});
+ @override
+ State<NotificationSettingsScreen> createState() =>
+ _NotificationSettingsScreenState();
+}
+
+class _NotificationSettingsScreenState
+ extends State<NotificationSettingsScreen> {
+ bool _hasPermission = false, _isCompletingToggle = false;
+ Future<void> Function()? _pendingToggle;
+ Timer? _permissionTimer;
+
+ @override
+ void initState() {
+ super.initState();
+ _refreshNotificationPermission();
+ }
+
+ @override
+ void dispose() {
+ _permissionTimer?.cancel();
+ super.dispose();
+ }
+
+ Future<bool> _refreshNotificationPermission() async {
+ final granted = await NotificationService.instance.hasGrantedPermissions();
+ if (mounted && _hasPermission != granted) {
+ setState(() => _hasPermission = granted);
+ }
+ return granted;
+ }
+
+ Future<void> _runWithPermission(Future<void> Function() toggle) async {
+ if (_hasPermission) return toggle();
+
+ _pendingToggle = toggle;
+ _permissionTimer ??= Timer.periodic(
+ const Duration(milliseconds: 500),
+ (_) => _completePendingToggle(),
+ );
+ await NotificationService.instance.requestPermissions();
+ await _completePendingToggle();
+ }
+
+ Future<void> _completePendingToggle() async {
+ if (_isCompletingToggle) return;
+ _isCompletingToggle = true;
+
+ try {
+ final toggle = _pendingToggle;
+ if (!(await _refreshNotificationPermission()) || toggle == null) return;
+
+ _pendingToggle = null;
+ _permissionTimer?.cancel();
+ _permissionTimer = null;
+ await toggle();
+ if (mounted) setState(() {});
+ } finally {
+ _isCompletingToggle = false;
+ }
+ }
+
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context);
+ final service = NotificationService.instance;
final showOnlyOnThisDay = isLocalGalleryMode;
return SettingsPageScaffold(
title: l10n.notifications,
children: [
if (!showOnlyOnThisDay) ...[
- _buildNotificationToggleItem(
- context,
+ SettingsItem(
title: l10n.sharedPhotoNotifications,
subtitle: l10n.sharedPhotoNotificationsExplanation,
- value: () =>
- NotificationService.instance.hasGrantedPermissions() &&
- NotificationService.instance
- .shouldShowNotificationsForSharedPhotosAndAlbums(),
- onChanged: () async {
- await NotificationService.instance.requestPermissions();
- await NotificationService.instance
- .setShouldShowNotificationsForSharedPhotosAndAlbums(
- !NotificationService.instance
- .shouldShowNotificationsForSharedPhotosAndAlbums(),
- );
- },
+ subtitleMaxLines: 2,
+ showChevron: false,
+ trailing: ToggleSwitchComponent.async(
+ value: () =>
+ _hasPermission &&
+ service.shouldShowNotificationsForSharedPhotosAndAlbums(),
+ onChanged: () => _runWithPermission(
+ () =>
+ service.setShouldShowNotificationsForSharedPhotosAndAlbums(
+ !service
+ .shouldShowNotificationsForSharedPhotosAndAlbums(),
+ ),
+ ),
+ showStateIcon: false,
+ ),
),
const SizedBox(height: 8),
- _buildNotificationToggleItem(
- context,
+ SettingsItem(
title: l10n.socialNotifications,
subtitle: l10n.socialNotificationsExplanation,
- value: () =>
- NotificationService.instance.hasGrantedPermissions() &&
- NotificationService.instance.shouldShowSocialNotifications(),
- onChanged: () async {
- await NotificationService.instance.requestPermissions();
- await NotificationService.instance
- .setShouldShowSocialNotifications(
- !NotificationService.instance
- .shouldShowSocialNotifications(),
- );
- },
+ subtitleMaxLines: 2,
+ showChevron: false,
+ trailing: ToggleSwitchComponent.async(
+ value: () =>
+ _hasPermission && service.shouldShowSocialNotifications(),
+ onChanged: () => _runWithPermission(
+ () => service.setShouldShowSocialNotifications(
+ !service.shouldShowSocialNotifications(),
+ ),
+ ),
+ showStateIcon: false,
+ ),
),
const SizedBox(height: 8),
],
- _buildNotificationToggleItem(
- context,
+ SettingsItem(
title: l10n.onThisDayMemories,
subtitle: l10n.onThisDayNotificationExplanation,
- value: () =>
- NotificationService.instance.hasGrantedPermissions() &&
- localSettings.isOnThisDayNotificationsEnabled,
- onChanged: () async {
- await NotificationService.instance.requestPermissions();
- await memoriesCacheService.toggleOnThisDayNotifications();
- },
+ subtitleMaxLines: 2,
+ showChevron: false,
+ trailing: ToggleSwitchComponent.async(
+ value: () =>
+ _hasPermission && localSettings.isOnThisDayNotificationsEnabled,
+ onChanged: () => _runWithPermission(
+ memoriesCacheService.toggleOnThisDayNotifications,
+ ),
+ showStateIcon: false,
+ ),
),
if (!showOnlyOnThisDay) ...[
const SizedBox(height: 8),
- _buildNotificationToggleItem(
- context,
+ SettingsItem(
title: l10n.birthdays,
subtitle: l10n.receiveRemindersOnBirthdays,
- value: () =>
- NotificationService.instance.hasGrantedPermissions() &&
- localSettings.birthdayNotificationsEnabled,
- onChanged: () async {
- await NotificationService.instance.requestPermissions();
- await memoriesCacheService.toggleBirthdayNotifications();
- },
+ subtitleMaxLines: 2,
+ showChevron: false,
+ trailing: ToggleSwitchComponent.async(
+ value: () =>
+ _hasPermission && localSettings.birthdayNotificationsEnabled,
+ onChanged: () => _runWithPermission(
+ memoriesCacheService.toggleBirthdayNotifications,
+ ),
+ showStateIcon: false,
+ ),
),
],
],
);
}
-
- SettingsItem _buildNotificationToggleItem(
- BuildContext context, {
- required String title,
- required String subtitle,
- required bool Function() value,
- required Future<void> Function() onChanged,
- }) {
- return SettingsItem(
- title: title,
- subtitle: subtitle,
- subtitleMaxLines: 2,
- showChevron: false,
- trailing: ToggleSwitchComponent.async(
- value: value,
- onChanged: onChanged,
- showStateIcon: false,
- ),
- );
- }
}
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index e54bf72211..03c7938eb4 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -260,13 +260,6 @@ class _HomeWidgetState extends State<HomeWidget> {
if (mounted) {
setState(() {});
syncWidget();
- if (!NotificationService.instance.hasGrantedPermissions() &&
- isLocalGalleryMode &&
- !Configuration.instance.hasConfiguredAccount()) {
- Future.delayed(const Duration(seconds: 2), () {
- NotificationService.instance.requestPermissions().ignore();
- });
- }
}
});
}