kasy-cli 1.38.0 → 1.39.1

package/templates/firebase/lib/core/rating/widgets/review_popup.dart

@@ -4,18 +4,25 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/api/analytics_api.dart';
+import 'package:kasy_kit/core/rating/models/review.dart';
 import 'package:kasy_kit/core/rating/providers/rating_repository.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 import 'package:logger/logger.dart';
 
-/// Shows the in-app review dialog. Prefer a stable [context] (not a sheet that
+/// Shows the in-app review funnel. Prefer a stable [context] (not a sheet that
 /// will be popped before the async work finishes).
 ///
-/// A clean [KasyDialog]: a title, a short message and two stacked actions
-/// (write a review / suggest improvements). Dismissing via the dialog's own
-/// close button just defers the next ask and keeps the user where they are.
+/// Two-step "rating protection" funnel:
+///   1. A sentiment gate ("Enjoying the app?") with a positive / negative pick.
+///   2a. Positive → a gold-star [KasyDialog] that sends the user to the store
+///       (App Store / Play Store) to write a public review.
+///   2b. Negative → the private `/feedback` screen, so an unhappy user vents to
+///       us instead of leaving a low public rating.
+///
+/// Dismissing any step just defers the next ask and keeps the user where they
+/// are. Returns true once the funnel was shown (regardless of the branch taken).
 Future<bool> showReviewDialog(
   BuildContext context,
   WidgetRef ref, {
@@ -23,7 +30,7 @@ Future<bool> showReviewDialog(
 }) async {
   // Store reviews are native-only (App Store / Play Store). In production the
   // auto prompt never shows on web (nowhere to send the user). But a forced
-  // call — the admin preview — still shows the dialog on web so its design can
+  // call — the admin preview — still shows the funnel on web so its design can
   // be reviewed there; only the store action won't do anything.
   if (kIsWeb && !force) {
     return false;
@@ -46,54 +53,112 @@ Future<bool> showReviewDialog(
     return false;
   }
 
-  final bool? openFeedback = await showKasyDialog<bool>(
+  // Defer the next ask up front, so any outcome (dismiss, positive, negative)
+  // counts as "asked" and we don't pester the user again right away.
+  await rating.delay();
+  analytics.logEvent('rating_funnel_open', {});
+  if (!context.mounted) {
+    return false;
+  }
+
+  // Step 1 — sentiment gate.
+  final bool? enjoying = await _askEnjoying(context, analytics);
+  if (enjoying == null) {
+    return true; // dismissed without choosing
+  }
+
+  // Step 2b — negative branch: keep the bad review private.
+  if (!enjoying) {
+    analytics.logEvent('rating_funnel_negative', {});
+    if (context.mounted) {
+      await context.push('/feedback');
+    }
+    return true;
+  }
+
+  // Step 2a — positive branch: send the happy user to the store.
+  analytics.logEvent('rating_funnel_positive', {});
+  if (!context.mounted) {
+    return true;
+  }
+  await _askStoreReview(context, ratingRepository, rating, analytics);
+  return true;
+}
+
+/// Step 1: the sentiment gate. Returns true (enjoying), false (could be better)
+/// or null (dismissed without choosing).
+Future<bool?> _askEnjoying(BuildContext context, AnalyticsApi analytics) {
+  return showKasyDialog<bool>(
     context: context,
-    barrierDismissible: false,
     builder: (dialogContext) {
-      ratingRepository.delay();
-      final translations = Translations.of(dialogContext).review_popup;
+      final t = Translations.of(dialogContext).review_popup;
       return KasyDialog(
-        leadingIcon: KasyIcons.star,
+        leadingIcon: KasyIcons.favorite,
         iconTone: KasyDialogIconTone.info,
-        title: translations.title,
+        title: t.question_title,
         titleCentered: true,
-        message: translations.description,
+        message: t.question_description,
         onClose: () {
-          analytics.logEvent('rating_popup_close', {});
-          rating.delay();
+          analytics.logEvent('rating_funnel_dismiss', {});
           Navigator.of(dialogContext).pop();
         },
         footer: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             KasyButton(
-              label: translations.rate_button,
+              label: t.question_positive,
               expand: true,
-              onPressed: () {
-                analytics.logEvent('rating_popup_show', {});
-                ratingRepository.rate().then((_) => rating.review()).then(
-                  (_) {
-                    if (!dialogContext.mounted) return;
-                    Navigator.of(dialogContext).pop();
-                  },
-                );
-              },
+              onPressed: () => Navigator.of(dialogContext).pop(true),
             ),
             const SizedBox(height: KasySpacing.sm),
             KasyButton(
-              label: translations.cancel_button,
+              label: t.question_negative,
               variant: KasyButtonVariant.soft,
               expand: true,
-              onPressed: () => Navigator.of(dialogContext).pop(true),
+              onPressed: () => Navigator.of(dialogContext).pop(false),
             ),
           ],
         ),
       );
     },
   );
+}
 
-  if (openFeedback == true && context.mounted) {
-    await context.push('/feedback');
-  }
-  return true;
+/// Step 2a (positive branch): the celebratory store-review dialog.
+Future<void> _askStoreReview(
+  BuildContext context,
+  RatingRepository ratingRepository,
+  Review rating,
+  AnalyticsApi analytics,
+) {
+  return showKasyDialog<void>(
+    context: context,
+    builder: (dialogContext) {
+      final t = Translations.of(dialogContext).review_popup;
+      return KasyDialog(
+        leadingIcon: KasyIcons.star,
+        // Gold/amber star via KasyDialog's default `warning` tone — the design
+        // system's amber (#F5A524 light / #F7B750 dark), the natural colour for
+        // a rating star.
+        title: t.title,
+        titleCentered: true,
+        message: t.description,
+        onClose: () {
+          analytics.logEvent('rating_popup_close', {});
+          Navigator.of(dialogContext).pop();
+        },
+        footer: KasyButton(
+          label: t.rate_button,
+          expand: true,
+          onPressed: () {
+            analytics.logEvent('rating_popup_show', {});
+            ratingRepository.rate().then((_) => rating.review()).then((_) {
+              if (!dialogContext.mounted) return;
+              Navigator.of(dialogContext).pop();
+            });
+          },
+        ),
+      );
+    },
+  );
 }

package/templates/firebase/lib/core/shared_preferences/shared_preferences.dart

@@ -105,4 +105,15 @@ class SharedPreferencesBuilder implements OnStartService {
   Future<void> setAttSoftLastAskedAt(DateTime when) async {
     await prefs.setInt('att_soft_last_asked_at', when.millisecondsSinceEpoch);
   }
+
+  /// Whether we've already fired the one-time native push-permission prompt the
+  /// first time the user opened the notifications screen. iOS only ever shows
+  /// the native prompt once, so we must never auto-fire it more than once.
+  bool getPushAutoRequested() {
+    return prefs.getBool('push_auto_requested') ?? false;
+  }
+
+  Future<void> setPushAutoRequested(bool value) async {
+    await prefs.setBool('push_auto_requested', value);
+  }
 }

package/templates/firebase/lib/core/states/logout_action.dart

@@ -4,6 +4,7 @@ import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
+import 'package:kasy_kit/router.dart';
 
 /// Standardized logout flow — the single source of truth for signing out.
 ///
@@ -25,5 +26,14 @@ Future<void> confirmLogout(BuildContext context, WidgetRef ref) {
     // forget: that closed the dialog instantly and left the old screen frozen.)
     onConfirmAsync: () =>
         ref.read(userStateNotifierProvider.notifier).onLogout(),
-  );
+  ).whenComplete(() {
+    // The confirm dialog is a pageless route on the ROOT navigator, so the
+    // redirect that fires when onLogout flips the state to anonymous runs while
+    // the dialog still sits on top — go_router keeps the current page (Settings)
+    // mounted underneath and the move to /signin never lands. Now that the
+    // dialog has popped, re-run the redirect so the (now unauthenticated) user
+    // is sent to sign-in. Harmless on cancel: the redirect keeps an
+    // authenticated user exactly where they are.
+    if (context.mounted) ref.read(goRouterProvider).refresh();
+  });
 }

package/templates/firebase/lib/core/states/user_state_notifier.dart

@@ -187,6 +187,7 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     // Biometric lock is a per-account preference, not a device-wide one.
     // The next user signing in on this install should start without it set.
     await ref.read(sharedPreferencesProvider).setBiometricEnabled(false);
+    await _clearWebGuestPass();
     // Forget the last bottom-bar tab so the next login lands on the default tab
     // (Home) instead of wherever the previous account left off.
     forgetActiveTab();
@@ -285,7 +286,18 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
   /// It will delete the user account and logout the user
   Future<void> deleteAccount() async {
     _stopRoleListener();
-    final userId = state.user.idOrThrow;
+    final userId = state.user.idOrNull;
+    // No backend identity (a guest with no account): there is nothing to delete
+    // server-side. Just clear the local session so we never throw a generic
+    // error that strands the user on Settings — the UI hides the delete button
+    // in this case, this is only a safety net.
+    if (userId == null) {
+      await _authenticationRepository.logout();
+      await _clearWebGuestPass();
+      forgetActiveTab();
+      state = const UserState(user: User.anonymous());
+      return;
+    }
     _deviceRepository.removeTokenUpdateListener();
     try {
       await _deviceRepository.unregister(userId);
@@ -294,6 +306,7 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     }
     await _userRepository.delete();
     await _authenticationRepository.logout();
+    await _clearWebGuestPass();
     // Same as onLogout: forget the last bottom-bar tab so the next account that
     // signs in lands on Home, not wherever the deleted account left off (the
     // user deletes from Settings, so without this the next login reopens it).
@@ -304,6 +317,20 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     // continue as a guest.
   }
 
+  /// On WEB the auth redirect treats "onboarding done" as "this guest is allowed
+  /// to stay" (`ready = hasIdentity || isOnboarded || onboardingDone`). After a
+  /// logout / account deletion the flag is still true, so the redirect would
+  /// keep the just-signed-out user on the current screen instead of sending them
+  /// to /signin — and whether it happened to work depended on leftover browser
+  /// state. Clearing it on web makes the session boundary land on /signin every
+  /// time. No-op on native, where this flag only skips the (native-only)
+  /// onboarding screen and logout already routes correctly via hasIdentity, so
+  /// clearing it would wrongly show onboarding again.
+  Future<void> _clearWebGuestPass() async {
+    if (!kIsWeb) return;
+    await ref.read(sharedPreferencesProvider).setOnboardingCompleted(false);
+  }
+
   // -------------------------------
   // ROLE LISTENER
   // -------------------------------

package/templates/firebase/lib/core/theme/texts.dart

@@ -147,19 +147,34 @@ class KasyTextTheme extends ThemeExtension<KasyTextTheme> {
   /// Top-level page title (auth, paywall, full-screen flows). 24 / w700.
   TextStyle get pageTitle => headlineMedium;
 
-  /// Section or master-detail pane title (Settings detail, grouped areas). 16 / w600.
+  /// Section or master-detail pane title (Settings detail, grouped areas).
+  /// 18 / w600 — a visible step above the content rows it heads.
   TextStyle get sectionTitle => titleMedium;
 
   /// Small header above a grouped list (e.g. "PREFERENCES"). 12 / w600, lightly tracked.
   TextStyle get sectionLabel =>
       bodySmall.copyWith(fontWeight: FontWeight.w600, letterSpacing: 0.5);
 
-  /// Primary text of a list / settings row. 14 / w500.
+  /// Primary text of a DENSE navigation / list row — sidebar, tabs, admin
+  /// tables. 14 / w500. For full-width CONTENT rows (Settings, a messaging /
+  /// conversation inbox) use [listRowTitle] (16) instead.
   TextStyle get rowTitle => titleSmall;
 
-  /// Secondary / value text in a row (apply a muted colour at the call site). 14 / w400.
+  /// Secondary / value text in a dense row (apply a muted colour at the call
+  /// site). 14 / w400.
   TextStyle get rowValue => bodyMedium;
 
+  /// EMPHASIS text of a CONTENT list row — the row's label/title (Settings, and
+  /// other iOS-style lists where each row is primary content). 16 / w500. Pairs
+  /// with [listRowValue] (14) so the label clearly outranks its value.
+  TextStyle get listRowTitle =>
+      bodyLarge.copyWith(fontWeight: FontWeight.w500);
+
+  /// INFO text of a content list row — the value beside the label (apply a muted
+  /// colour at the call site). 14 / w400, deliberately one step below
+  /// [listRowTitle] so label vs value reads as a hierarchy, not a flat pair.
+  TextStyle get listRowValue => bodyMedium;
+
   /// Card title. 14 / w500.
   TextStyle get cardTitle => titleSmall;
 
@@ -188,17 +203,17 @@ class KasyTextTheme extends ThemeExtension<KasyTextTheme> {
       headlineMedium: _fromRamp(FontWeight.w700, KasyTypeScale.heading2, device),
       headlineSmall: _fromRamp(FontWeight.w600, KasyTypeScale.heading3, device),
 
-      // Title → Heading 3 / Heading 4 / Body sm medium.
+      // Title → Heading 3 / Heading 4 / Body sm (dense title 14, w500).
       titleLarge: _fromRamp(FontWeight.w600, KasyTypeScale.heading3, device),
       titleMedium: _fromRamp(FontWeight.w600, KasyTypeScale.heading4, device),
       titleSmall: _fromRamp(FontWeight.w500, KasyTypeScale.bodySm, device),
 
-      // Body → Body base / Body sm / Body xs.
+      // Body → Body base (16) / Body sm (14) / Body xs (12).
       bodyLarge: _fromRamp(FontWeight.w400, KasyTypeScale.bodyBase, device),
       bodyMedium: _fromRamp(FontWeight.w400, KasyTypeScale.bodySm, device),
       bodySmall: _fromRamp(FontWeight.w400, KasyTypeScale.bodyXs, device),
 
-      // Label → Button sm / Body xs medium.
+      // Label → Body sm (14, w500) / Body xs (12, w500).
       labelLarge: _fromRamp(FontWeight.w500, KasyTypeScale.bodySm, device),
       labelMedium: _fromRamp(FontWeight.w500, KasyTypeScale.bodyXs, device),
       labelSmall: _fromRamp(FontWeight.w500, KasyTypeScale.bodyXs, device),

package/templates/firebase/lib/core/theme/type_scale.dart

@@ -2,15 +2,25 @@ import 'package:kasy_kit/core/widgets/responsive_layout.dart';
 
 /// Responsive type scale — explicit font size per role, per breakpoint.
 ///
-/// Single source of truth for typography sizes. Instead of a blind global
-/// multiplier, every role declares its own size at each breakpoint — the way a
-/// design tool (Figma variables / modes) or a fluid web scale does it.
+/// Single source of truth for typography sizes, and the ONLY place breakpoints
+/// touch type. There is no global multiplier and no per-component scaling: every
+/// role declares its own size at each breakpoint here, exactly like design-tool
+/// modes (Figma variables) or platform text styles. Components only read the
+/// resolved theme role (`context.textTheme.*`); they never scale text themselves
+/// by width. (The `WebViewportScale` zoom is a separate, web-only UI alignment
+/// fix — it scales the whole canvas, not these type sizes.)
 ///
-/// The professional pattern this follows: **headings are largest on desktop and
-/// compress on smaller viewports** (a 36px title would feel huge and wrap badly
-/// on a phone), while **body and label text stay constant** for stable,
-/// comfortable reading on every device. Desktop is the authored reference;
-/// tablet and mobile step the headings down.
+/// The ladder is harmonious and SEMANTIC — each role one clear step from the
+/// next, and each maps to a PURPOSE, not a guessed size:
+/// - **Headings & display SCALE with the viewport** (this is where real
+///   responsiveness lives): big on desktop, stepping down on mobile so a hero or
+///   page title never wraps badly on a phone.
+/// - **Body & labels are STABLE across breakpoints** — one comfortable reading
+///   size per role, the Material/Apple model. The body ladder uses MARKED 2px
+///   steps so hierarchy is actually visible: section/card title 18, content-row
+///   title / body 16, secondary / value / nav 14, caption 12. No 1px in-between
+///   levels — a 15-vs-16 difference reads as identical, so it isn't a hierarchy.
+///   A row's LABEL (16) and its VALUE (14) are deliberately different sizes.
 ///
 /// To re-tune the whole app's typography, edit the numbers here — nothing else.
 /// The live ramp is visible under Design System -> Typography (tabs per
@@ -51,27 +61,36 @@ class RampSize {
 class KasyTypeScale {
   const KasyTypeScale._();
 
-  // Hero / display — large, compress hard on the way down.
+  // Hero / display — scale with space: large on desktop, compress hard toward
+  // mobile so a hero headline never wraps awkwardly on a phone.
   static const displayLarge =
-      RampSize(mobile: 40, tablet: 48, desktop: 57, lineHeightRatio: 64 / 57);
+      RampSize(mobile: 36, tablet: 46, desktop: 57, lineHeightRatio: 64 / 57);
   static const displayMedium =
-      RampSize(mobile: 34, tablet: 40, desktop: 45, lineHeightRatio: 52 / 45);
+      RampSize(mobile: 32, tablet: 38, desktop: 45, lineHeightRatio: 52 / 45);
 
-  // Headings — largest on desktop, step down on tablet then mobile.
+  // Headings — scale with space. Mobile anchors on the iOS title ladder
+  // (Title1 28 / Title2 22 / Title3 20); desktop grows for the wider canvas.
   static const heading1 =
       RampSize(mobile: 28, tablet: 32, desktop: 36, lineHeightRatio: 40 / 36);
   static const heading2 =
       RampSize(mobile: 22, tablet: 23, desktop: 24, lineHeightRatio: 32 / 24);
   static const heading3 =
-      RampSize(mobile: 18, tablet: 19, desktop: 20, lineHeightRatio: 28 / 20);
+      RampSize(mobile: 20, tablet: 20, desktop: 20, lineHeightRatio: 28 / 20);
+  // Section / card title — 18 (Tailwind text-lg): a visible step above body.
   static const heading4 =
-      RampSize(mobile: 16, tablet: 16, desktop: 16, lineHeightRatio: 24 / 16);
+      RampSize(mobile: 18, tablet: 18, desktop: 18, lineHeightRatio: 26 / 18);
 
-  // Body & labels — constant across breakpoints for stable, comfortable reading.
+  // Body & labels — STABLE, with MARKED 2px steps so hierarchy is visible.
+  // Mirrors Material's body/label tiers (16 / 14 / 12); no 1px in-between levels
+  // (a 15-vs-16 difference reads as identical, so it isn't a hierarchy). Weight
+  // and purpose differentiate roles that share a size (Material does the same).
+  // Content-row title, body paragraphs, chat message:
   static const bodyBase =
       RampSize(mobile: 16, tablet: 16, desktop: 16, lineHeightRatio: 24 / 16);
+  // Secondary / value, dense nav row, card title, labels:
   static const bodySm =
       RampSize(mobile: 14, tablet: 14, desktop: 14, lineHeightRatio: 20 / 14);
+  // Caption, timestamp, fine print:
   static const bodyXs =
       RampSize(mobile: 12, tablet: 12, desktop: 12, lineHeightRatio: 16 / 12);
 }

package/templates/firebase/lib/core/web_device_preview/web_device_preview.dart

@@ -32,6 +32,15 @@ final ValueNotifier<bool> webDevicePreviewEnabledNotifier = ValueNotifier<bool>(
   false,
 );
 
+/// True only once the device frame is actually ON SCREEN (not the instant the
+/// toggle flips — the frame takes a moment to build). The web viewport scale
+/// reads THIS, not [webDevicePreviewEnabledNotifier], so the scale drops to
+/// native 1.0 only when the frame is up — otherwise the toggle would flash a
+/// big, unframed, unscaled app while the frame builds.
+final ValueNotifier<bool> webDevicePreviewActiveNotifier = ValueNotifier<bool>(
+  false,
+);
+
 // Kit primary/accent (HeroUI blue). The chrome lives above the MaterialApp, so
 // it can't read context.colors — mirror the design-system value here. Used to
 // highlight active toggles so it's obvious at a glance what's turned on.
@@ -241,14 +250,55 @@ class _WebDevicePreviewState extends State<WebDevicePreview>
         if (mounted) setState(() => _controlsVisible = true);
       });
       setState(() {}); // rebuild DevicePreview with enabled: true
+      // [webDevicePreviewActiveNotifier] flips to true only once the frame is
+      // actually built — see [_buildFramedContent] — so the web scale stays put
+      // until then (no big-unframed-app flash during the build).
     } else {
       _controlsTimer?.cancel();
+      // Leaving the frame: restore the web scale immediately.
+      webDevicePreviewActiveNotifier.value = false;
       setState(() => _controlsVisible = false);
     }
   }
 
   void _onBgChanged() => setState(() {});
 
+  /// Builds the app content placed INSIDE the device frame. DevicePreview calls
+  /// this as it brings the framed environment up, so it doubles as the "frame is
+  /// on screen now" signal: after this paints we flip
+  /// [webDevicePreviewActiveNotifier], which is what lets the web viewport scale
+  /// drop to native 1.0 — and only then, so the toggle never shows a flash of
+  /// big, unframed, unscaled app while the frame is still building.
+  Widget _buildFramedContent(BuildContext context) {
+    if (webDevicePreviewEnabledNotifier.value &&
+        !webDevicePreviewActiveNotifier.value) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted && webDevicePreviewEnabledNotifier.value) {
+          webDevicePreviewActiveNotifier.value = true;
+        }
+      });
+    }
+    return ListenableBuilder(
+      listenable: _textScaleNotifier,
+      builder: (ctx, _) => MediaQuery(
+        data: MediaQuery.of(ctx).copyWith(
+          textScaler: TextScaler.linear(_textScaleNotifier.value),
+          // DevicePreview hard-codes platformBrightness to light inside the
+          // simulated frame, which breaks MaterialApp's ThemeMode.system.
+          // Forward the real host brightness so "system" tracks the OS.
+          platformBrightness:
+              WidgetsBinding.instance.platformDispatcher.platformBrightness,
+        ),
+        child: _DeviceSwitchBridge(
+          deviceNotifier: _deviceNotifier,
+          frameVisibleNotifier: _frameVisibleNotifier,
+          landscapeNotifier: _landscapeNotifier,
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+
   Future<void> _bootstrap() async {
     final prefs = await SharedPreferences.getInstance();
 
@@ -449,25 +499,7 @@ class _WebDevicePreviewState extends State<WebDevicePreview>
       storage: DevicePreviewStorage.none(),
       defaultDevice: _currentDevice,
       devices: [..._iosDevices, ..._androidDevices, ..._iPadDevices],
-      builder: (context) => ListenableBuilder(
-        listenable: _textScaleNotifier,
-        builder: (ctx, _) => MediaQuery(
-          data: MediaQuery.of(ctx).copyWith(
-            textScaler: TextScaler.linear(_textScaleNotifier.value),
-            // DevicePreview hard-codes platformBrightness to light inside the
-            // simulated frame, which breaks MaterialApp's ThemeMode.system.
-            // Forward the real host brightness so "system" tracks the OS.
-            platformBrightness:
-                WidgetsBinding.instance.platformDispatcher.platformBrightness,
-          ),
-          child: _DeviceSwitchBridge(
-            deviceNotifier: _deviceNotifier,
-            frameVisibleNotifier: _frameVisibleNotifier,
-            landscapeNotifier: _landscapeNotifier,
-            child: widget.child,
-          ),
-        ),
-      ),
+      builder: _buildFramedContent,
     );
 
     if (!enabled) return preview;