kasy-cli 1.12.1 → 1.14.0

package/templates/firebase/lib/features/notifications/repositories/device_repository.dart

@@ -54,6 +54,9 @@ class DeviceRepository {
     // Without the userId check, a new anonymous user (same device token) would
     // reuse the cached prefs and never register in the database.
     if (device != null && device.token == newDevice.token && cachedUserId == userId) {
+      // Heartbeat — keeps the backend's stale-device filter (60d TTL) from
+      // dropping this active install. Cheap: one Firestore update per launch.
+      await _deviceApi.touch(userId, newDevice.installationId);
       return;
     }
     // Include device properties so the welcome notification fires in the correct locale.
@@ -62,6 +65,12 @@ class DeviceRepository {
     final response = await _deviceApi.register(userId, deviceWithLocale);
     await _saveInPrefs(response);
     await _prefs.setString(_deviceUserIdPrefsKey, userId);
+    // Remove orphan devices left by previous installs on the same physical
+    // device (different installationId, never touched again). Without this,
+    // a re-install (Xcode -> TestFlight, or TestFlight build update with an
+    // uninstall in between) leaves stale tokens that still receive push,
+    // causing duplicated notifications.
+    await _deviceApi.cleanupStaleDevices(userId, newDevice.installationId);
   }
 
   Future<void> unregister(String userId) async {

package/templates/firebase/lib/features/notifications/repositories/notifications_repository.dart

@@ -158,10 +158,7 @@ class AppNotificationsRepository implements NotificationsRepository {
           repository: this,
         );
       case PermissionStatus.permanentlyDenied:
-        return NotificationPermissionDenied(
-          notificationSettings: _notificationSettings,
-          repository: this,
-        );
+        return NotificationPermissionPermanentlyDenied();
       default:
         return NotificationPermissionWaiting(
           notificationSettings: _notificationSettings,

package/templates/firebase/lib/features/notifications/shared/att_permission.dart

@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/api/tracking_api.dart';
 import 'package:kasy_kit/core/icons/kasy_icons.dart';
+import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/components/maybeshow_component.dart';
 import 'package:kasy_kit/core/states/models/event_model.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
@@ -13,15 +14,19 @@ import 'package:permission_handler/permission_handler.dart';
 
 /// Requests App Tracking Transparency (ATT) on iOS if not yet determined.
 ///
-/// This handler always returns `false` so the event chain continues and
-/// [MaybeShowNotificationPermission] can still run in the same app-start cycle.
-///
-/// Placement: add it to [ConditionalWidgetsEvents] immediately before the
-/// notification-permission handler.
+/// Apple only allows the native ATT prompt to be shown once per install, so we
+/// gate the system call behind a soft explanation dialog (KasyDialog) first.
+/// If the user dismisses the soft dialog, we back off and ask again later (up
+/// to [_maxSoftAttempts] times, with [_cooldown] between attempts). After the
+/// last attempt we stop asking forever.
 ///
 /// To remove: delete this file and remove [MaybeShowAttPermission] from
 /// [HomePage]'s event list.
 class MaybeShowAttPermission implements MaybeShowWithRef {
+  static const Duration _settleDelay = Duration(milliseconds: 1500);
+  static const int _maxSoftAttempts = 3;
+  static const Duration _cooldown = Duration(days: 7);
+
   @override
   Future<bool> handle(WidgetRef ref, AppEvent event) async {
     if (kIsWeb) return false;
@@ -32,12 +37,28 @@ class MaybeShowAttPermission implements MaybeShowWithRef {
     // `denied` in permission_handler maps to iOS "notDetermined" — never asked.
     if (!status.isDenied) return false;
 
+    final prefs = ref.read(sharedPreferencesProvider);
+    final attempts = prefs.getAttSoftDismissCount();
+    if (attempts >= _maxSoftAttempts) return false;
+
+    final lastAsked = prefs.getAttSoftLastAskedAt();
+    if (lastAsked != null &&
+        DateTime.now().difference(lastAsked) < _cooldown) {
+      return false;
+    }
+
+    await Future<void>.delayed(_settleDelay);
+    await prefs.setAttSoftLastAskedAt(DateTime.now());
     if (!ref.context.mounted) return false;
 
     final confirmed = await _showExplanationDialog(ref.context);
-    if (!confirmed) return false;
+    if (!confirmed) {
+      await prefs.setAttSoftDismissCount(attempts + 1);
+      return false;
+    }
 
     await Permission.appTrackingTransparency.request();
+    await prefs.setAttSoftDismissCount(_maxSoftAttempts);
 
     final userId = ref.read(userStateNotifierProvider).user.idOrNull;
     if (userId != null) {
@@ -45,8 +66,7 @@ class MaybeShowAttPermission implements MaybeShowWithRef {
       ref.read(facebookEventApiProvider).initUser(userId).ignore();
     }
 
-    // Return false so MaybeShowNotificationPermission also runs.
-    return false;
+    return true;
   }
 
   Future<bool> _showExplanationDialog(BuildContext context) async {

package/templates/firebase/lib/features/notifications/ui/notifications_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/notifications/providers/models/notification.dart'
     as app;
@@ -20,25 +21,39 @@ class NotificationsPage extends ConsumerStatefulWidget {
   ConsumerState<NotificationsPage> createState() => _NotificationsPageState();
 }
 
-class _NotificationsPageState extends ConsumerState<NotificationsPage> {
+class _NotificationsPageState extends ConsumerState<NotificationsPage>
+    with WidgetsBindingObserver {
   final ScrollController _scrollController = ScrollController();
   Timer? _autoReadTimer;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     _scrollController.addListener(_onScrollChange);
     requestReadAll();
   }
 
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
     _autoReadTimer?.cancel();
     _scrollController.removeListener(_onScrollChange);
     _scrollController.dispose();
     super.dispose();
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.resumed && mounted) {
+      // Native permission dialogs push the app to the background briefly. When
+      // we come back, the Bart bottom bar can stay hidden because its internal
+      // visibility state is reset. Force it back so the user is never stranded.
+      kasyShowBottomBar(context);
+    }
+  }
+
   void _onScrollChange() {
     final direction = _scrollController.position.userScrollDirection;
     final isScrollingDown = direction == ScrollDirection.reverse;

package/templates/firebase/lib/features/notifications/ui/widgets/empty_notifications.dart

@@ -1,16 +1,45 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/notifications/providers/models/notification.dart';
 import 'package:kasy_kit/features/notifications/repositories/notifications_repository.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
-class EmptyNotifications extends ConsumerWidget {
+class EmptyNotifications extends ConsumerStatefulWidget {
   const EmptyNotifications({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<EmptyNotifications> createState() => _EmptyNotificationsState();
+}
+
+class _EmptyNotificationsState extends ConsumerState<EmptyNotifications> {
+  late Future<NotificationPermission> _permissionFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _permissionFuture = _loadPermission();
+  }
+
+  Future<NotificationPermission> _loadPermission() {
+    return ref.read(notificationRepositoryProvider).getPermissionStatus();
+  }
+
+  Future<void> _onAskPressed(NotificationPermission permission) async {
+    await permission.maybeAsk();
+    if (!mounted) return;
+    // The native permission dialog pulls the app out of focus; restore the
+    // bottom bar defensively before refreshing the local state.
+    kasyShowBottomBar(context);
+    setState(() {
+      _permissionFuture = _loadPermission();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final tr = context.t.notifications;
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
@@ -50,18 +79,22 @@ class EmptyNotifications extends ConsumerWidget {
           ),
           const SizedBox(height: KasySpacing.xl),
           FutureBuilder<NotificationPermission>(
-            future: ref
-                .read(notificationRepositoryProvider)
-                .getPermissionStatus(),
+            future: _permissionFuture,
             builder: (context, snapshot) {
-              final isGranted = snapshot.data is NotificationPermissionGranted;
-              if (isGranted) return const SizedBox.shrink();
+              final permission = snapshot.data;
+              if (permission == null) return const SizedBox.shrink();
+              if (permission is NotificationPermissionGranted) {
+                return const SizedBox.shrink();
+              }
+              final isLocked =
+                  permission is NotificationPermissionPermanentlyDenied;
               return KasyButton(
-                label: tr.empty_cta,
+                label: isLocked ? tr.empty_cta_open_settings : tr.empty_cta,
                 variant: KasyButtonVariant.soft,
-                icon: KasyIcons.notificationAdd,
-                onPressed: () =>
-                    snapshot.data?.maybeAsk(),
+                icon: isLocked
+                    ? KasyIcons.settings
+                    : KasyIcons.notificationAdd,
+                onPressed: () => _onAskPressed(permission),
               );
             },
           ),

package/templates/firebase/lib/features/onboarding/ui/components/onboarding_features.dart

@@ -5,11 +5,13 @@ import 'package:kasy_kit/i18n/translations.g.dart';
 class OnboardingFeatureOne extends StatelessWidget {
   final String nextRoute;
   final VoidCallback? onSkip;
+  final VoidCallback? onLogin;
 
   const OnboardingFeatureOne({
     super.key,
     required this.nextRoute,
     this.onSkip,
+    this.onLogin,
   });
 
   @override
@@ -25,6 +27,8 @@ class OnboardingFeatureOne extends StatelessWidget {
       progress: 0.1,
       onSkip: onSkip,
       skipLabel: translations.skip,
+      onSecondary: onLogin,
+      secondaryLabel: onLogin != null ? translations.login : null,
     );
   }
 }

package/templates/firebase/lib/features/onboarding/ui/onboarding_page.dart

@@ -33,6 +33,7 @@ class OnboardingPage extends ConsumerWidget {
               onSkip: () => Navigator.of(context).pushReplacementNamed(
                 'skip_loader',
               ),
+              onLogin: () => ref.read(goRouterProvider).go('/signin'),
             ),
             settings: settings,
           ),

package/templates/firebase/lib/features/onboarding/ui/widgets/onboarding_feature.dart

@@ -20,6 +20,8 @@ class OnboardingStep extends StatelessWidget {
   final bool withBg;
   final VoidCallback? onSkip;
   final String? skipLabel;
+  final VoidCallback? onSecondary;
+  final String? secondaryLabel;
 
   const OnboardingStep({
     super.key,
@@ -35,6 +37,8 @@ class OnboardingStep extends StatelessWidget {
     this.image,
     this.onSkip,
     this.skipLabel,
+    this.onSecondary,
+    this.secondaryLabel,
   });
 
   @override
@@ -128,6 +132,15 @@ class OnboardingStep extends StatelessWidget {
             }
           },
         ),
+        if (onSecondary != null && secondaryLabel != null) ...[
+          const SizedBox(height: KasySpacing.xs),
+          KasyButton(
+            label: secondaryLabel!,
+            variant: KasyButtonVariant.link,
+            expand: true,
+            onPressed: onSecondary,
+          ),
+        ],
       ],
     );
 

package/templates/firebase/lib/features/settings/settings_page.dart

@@ -426,35 +426,175 @@ class HapticFeedbackSwitcher extends ConsumerWidget {
   }
 }
 
-class ThemeSwitcher extends StatefulWidget {
+class ThemeSwitcher extends StatelessWidget {
   const ThemeSwitcher({super.key});
 
+  IconData _iconFor(ThemeMode mode) {
+    switch (mode) {
+      case ThemeMode.system:
+        return KasyIcons.phoneAndroid;
+      case ThemeMode.dark:
+        return KasyIcons.darkMode;
+      case ThemeMode.light:
+        return KasyIcons.lightMode;
+    }
+  }
+
   @override
-  State<ThemeSwitcher> createState() => _ThemeSwitcherState();
+  Widget build(BuildContext context) {
+    final tr = context.t.settings;
+    final theme = ThemeProvider.of(context);
+    final options = <({ThemeMode mode, IconData icon, String label})>[
+      (
+        mode: ThemeMode.system,
+        icon: KasyIcons.phoneAndroid,
+        label: tr.theme_option_system,
+      ),
+      (
+        mode: ThemeMode.light,
+        icon: KasyIcons.lightMode,
+        label: tr.theme_option_light,
+      ),
+      (
+        mode: ThemeMode.dark,
+        icon: KasyIcons.darkMode,
+        label: tr.theme_option_dark,
+      ),
+    ];
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Row(
+            children: [
+              Icon(
+                _iconFor(theme.mode),
+                size: 21,
+                color: context.colors.onSurface,
+              ),
+              const SizedBox(width: KasySpacing.sm),
+              Expanded(
+                child: Text(
+                  tr.theme_title,
+                  style: context.textTheme.titleMedium?.copyWith(
+                    color: context.colors.onSurface,
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: KasySpacing.sm),
+          _ThemeModeSegmented(
+            current: theme.mode,
+            options: options,
+            onChanged: theme.setMode,
+          ),
+        ],
+      ),
+    );
+  }
 }
 
-class _ThemeSwitcherState extends State<ThemeSwitcher> {
-  bool darkMode = false;
+class _ThemeModeSegmented extends StatelessWidget {
+  const _ThemeModeSegmented({
+    required this.current,
+    required this.options,
+    required this.onChanged,
+  });
+
+  final ThemeMode current;
+  final List<({ThemeMode mode, IconData icon, String label})> options;
+  final ValueChanged<ThemeMode> onChanged;
 
   @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      darkMode = ThemeProvider.of(context).mode == ThemeMode.dark;
-      setState(() {});
-    });
+  Widget build(BuildContext context) {
+    final trackColor = context.colors.onSurface.withValues(alpha: 0.06);
+    return Container(
+      padding: const EdgeInsets.all(3),
+      decoration: BoxDecoration(
+        color: trackColor,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        children: [
+          for (final opt in options)
+            Expanded(
+              child: _ThemeModeSegment(
+                icon: opt.icon,
+                label: opt.label,
+                selected: current == opt.mode,
+                onTap: () => onChanged(opt.mode),
+              ),
+            ),
+        ],
+      ),
+    );
   }
+}
+
+class _ThemeModeSegment extends StatelessWidget {
+  const _ThemeModeSegment({
+    required this.icon,
+    required this.label,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final IconData icon;
+  final String label;
+  final bool selected;
+  final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
-    return SettingsSwitchTile(
-      icon: darkMode ? KasyIcons.darkMode : KasyIcons.lightMode,
-      title: context.t.settings.theme_title,
-      value: darkMode,
-      onChanged: (value) {
-        setState(() => darkMode = value);
-        ThemeProvider.of(context).toggle();
-      },
+    final selectedBg = context.colors.surface;
+    final selectedFg = context.colors.onSurface;
+    final unselectedFg = context.colors.muted;
+    return Semantics(
+      button: true,
+      selected: selected,
+      label: label,
+      child: GestureDetector(
+        onTap: onTap,
+        behavior: HitTestBehavior.opaque,
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 160),
+          curve: Curves.easeOut,
+          padding: const EdgeInsets.symmetric(vertical: 8),
+          decoration: BoxDecoration(
+            color: selected ? selectedBg : Colors.transparent,
+            borderRadius: BorderRadius.circular(8),
+            boxShadow: selected
+                ? [
+                    BoxShadow(
+                      color: Colors.black.withValues(alpha: 0.06),
+                      blurRadius: 4,
+                      offset: const Offset(0, 1),
+                    ),
+                  ]
+                : const [],
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                icon,
+                size: 18,
+                color: selected ? selectedFg : unselectedFg,
+              ),
+              const SizedBox(height: 2),
+              Text(
+                label,
+                style: context.textTheme.labelSmall?.copyWith(
+                  color: selected ? selectedFg : unselectedFg,
+                  fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }

package/templates/firebase/lib/features/settings/ui/components/admin/admin_bottom_sheet.dart

@@ -11,7 +11,7 @@ import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/toast/toast_service.dart';
 import 'package:kasy_kit/core/web_device_preview/web_device_preview.dart';
 import 'package:kasy_kit/core/widgets/update_bottom_sheet.dart';
-import 'package:kasy_kit/features/notifications/shared/notification_permission_bottom_sheet.dart';
+import 'package:kasy_kit/features/notifications/api/local_notifier.dart';
 import 'package:kasy_kit/features/settings/settings_page.dart';
 import 'package:kasy_kit/features/settings/ui/components/admin/admin_routes.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
@@ -89,30 +89,33 @@ class _AdminSheet extends ConsumerWidget {
                             );
                           },
                         ),
-                        const SettingsDivider(),
-                        ValueListenableBuilder<bool>(
-                          valueListenable: webDevicePreviewEnabledNotifier,
-                          builder: (context, enabled, _) {
-                            return SettingsSwitchTile(
-                              icon: KasyIcons.phoneAndroid,
-                              title: t.settings.admin.device_preview_title,
-                              value: enabled,
-                              onChanged: (v) async {
-                                final navigator = Navigator.of(
-                                  context,
-                                  rootNavigator: true,
-                                );
-                                final p = await SharedPreferences.getInstance();
-                                await p.setBool(
-                                  webDevicePreviewEnabledPrefKey,
-                                  v,
-                                );
-                                webDevicePreviewEnabledNotifier.value = v;
-                                if (v) navigator.pop();
-                              },
-                            );
-                          },
-                        ),
+                        if (kIsWeb) ...[
+                          const SettingsDivider(),
+                          ValueListenableBuilder<bool>(
+                            valueListenable: webDevicePreviewEnabledNotifier,
+                            builder: (context, enabled, _) {
+                              return SettingsSwitchTile(
+                                icon: KasyIcons.phoneAndroid,
+                                title: t.settings.admin.device_preview_title,
+                                value: enabled,
+                                onChanged: (v) async {
+                                  final navigator = Navigator.of(
+                                    context,
+                                    rootNavigator: true,
+                                  );
+                                  final p =
+                                      await SharedPreferences.getInstance();
+                                  await p.setBool(
+                                    webDevicePreviewEnabledPrefKey,
+                                    v,
+                                  );
+                                  webDevicePreviewEnabledNotifier.value = v;
+                                  if (v) navigator.pop();
+                                },
+                              );
+                            },
+                          ),
+                        ],
                         const SettingsDivider(),
                         SettingsTile(
                           icon: KasyIcons.note,
@@ -186,10 +189,9 @@ class _AdminSheet extends ConsumerWidget {
                           title: t.settings.admin.ask_notification,
                           onTap: () {
                             Navigator.pop(context);
-                            showNotificationPermissionSheetIfNeeded(
-                              navigatorKey.currentContext!,
-                              force: true,
-                            );
+                            ref
+                                .read(notificationsSettingsProvider)
+                                .askPermission();
                           },
                         ),
                         const SettingsDivider(),

package/templates/firebase/lib/features/settings/ui/components/language_switcher.dart

@@ -1,5 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/home_widgets/home_widget_mywidget_service.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
@@ -93,12 +96,25 @@ class LanguageSwitcher extends ConsumerWidget {
                 return _LocaleOptionTile(
                   locale: locale,
                   isSelected: isSelected,
-                  onTap: () async {
+                  onTap: () {
+                    // Close the sheet FIRST. Awaiting work before pop
+                    // races with the rebuild triggered by setLocale and
+                    // crashed Navigator.pop with !_debugLocked.
+                    Navigator.pop(sheetContext);
                     LocaleSettings.setLocale(locale);
-                    await ref
-                        .read(sharedPreferencesProvider)
-                        .setAppLocale(locale.languageCode);
-                    if (sheetContext.mounted) Navigator.pop(sheetContext);
+                    // Re-render the home widget in the new language —
+                    // fire-and-forget so the UI doesn't wait on a
+                    // network call (RevenueCat) inside update().
+                    unawaited(
+                      ref
+                          .read(sharedPreferencesProvider)
+                          .setAppLocale(locale.languageCode),
+                    );
+                    unawaited(
+                      ref
+                          .read(myWidgetHomeWidgetProvider.notifier)
+                          .updateForLocale(locale),
+                    );
                   },
                 );
               }),

package/templates/firebase/lib/i18n/en.i18n.json

@@ -175,7 +175,8 @@
             "title": "Subscriptions module",
             "description": "Manage subscriptions with premade paywalls",
             "action": "Continue",
-            "skip": "Skip"
+            "skip": "Skip",
+            "login": "Already have an account? Log in"
         },
         "feature_2": {
             "title": "Authentication module",
@@ -321,7 +322,10 @@
             "cancel": "Cancel"
         },
         "language_title": "Languages",
-        "theme_title": "Light/Dark mode",
+        "theme_title": "Theme",
+        "theme_option_system": "System",
+        "theme_option_light": "Light",
+        "theme_option_dark": "Dark",
         "haptic_feedback_title": "Haptic feedback",
         "section_preferences_label": "PREFERENCES",
         "section_security_label": "SECURITY",
@@ -439,6 +443,7 @@
         "group_yesterday": "Yesterday",
         "group_older": "Older",
         "empty_cta": "Enable notifications",
+        "empty_cta_open_settings": "Open settings",
         "delete_all": "Delete all",
         "delete_all_confirm_title": "Delete all notifications?",
         "delete_all_confirm_message": "This will permanently remove every notification from your account. This cannot be undone.",
@@ -523,8 +528,10 @@
         "greeting_evening": "Good evening",
         "title_with_name": "Hi, $name!",
         "title_default": "Hi there!",
+        "title_logged_out": "We'll be here when you're back",
         "plan_free": "Free plan",
-        "plan_pro": "PRO"
+        "plan_pro": "PRO",
+        "quote": "It always seems impossible until it's done."
     }
 }