kasy-cli 1.17.0 → 1.19.0

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

@@ -1,4 +1,5 @@
 import 'package:bart/bart.dart' as bart;
+import 'package:bart/bart/bart_bottombar_actions.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -8,22 +9,92 @@ import 'package:kasy_kit/core/sidebar/kasy_sidebar.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/responsive_layout.dart';
 
-/// This bottom menu is powered by Bart packages
-/// https://pub.dev/packages/bart
-/// It allows you to create a bottom menu with a router and handle
-/// all tabs navigation separately.
-/// See the bottom_router.dart file to add tabs or subpages to show on tabs
-class BottomMenu extends StatelessWidget {
+/// Bottom navigation host powered by Bart (https://pub.dev/packages/bart).
+///
+/// Bart stores its bottom-bar visibility inside a [ValueNotifier] created in
+/// the [bart.BartScaffold] constructor. Because [ResponsiveLayout] recreates
+/// one of three [bart.BartScaffold]s on every rebuild (breakpoint change,
+/// theme toggle, device-preview resize), that notifier resets to its initial
+/// value and a previously-hidden bar can come back wrong — or, when returning
+/// from a native overlay (FaceID, photo picker, permission dialog), Bart's
+/// internal state ends up out of sync with the visible route.
+///
+/// This widget owns visibility end-to-end so feature pages never need to
+/// touch it. The rules are simple:
+///   * Bottom-bar tab (1 path segment) → bar visible.
+///   * Inner route (multi-segment, or [bart.BartMenuRoute.showBottomBar] =
+///     false) → bar hidden.
+///
+/// Sync points: [onRouteChanged], post-frame after every [build] (catches
+/// scaffold rebuilds), and [didChangeAppLifecycleState] on resume.
+class BottomMenu extends StatefulWidget {
   final String? initialRoute;
 
   const BottomMenu({super.key, this.initialRoute});
 
+  @override
+  State<BottomMenu> createState() => _BottomMenuState();
+}
+
+class _BottomMenuState extends State<BottomMenu>
+    with WidgetsBindingObserver, BartNotifier {
+  String? _currentRoutePath;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    _currentRoutePath = _resolveInitialRoute(widget.initialRoute);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.resumed) {
+      _scheduleSync();
+    }
+  }
+
+  void _onRouteChanged(bart.BartMenuRoute route) {
+    _currentRoutePath = route.path;
+    _scheduleSync();
+  }
+
+  void _scheduleSync() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      _applyVisibility();
+    });
+  }
+
+  void _applyVisibility() {
+    if (_shouldShowBottomBar(_currentRoutePath)) {
+      showBottomBar(context);
+    } else {
+      hideBottomBar(context);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final String? resolvedInitialRoute = _resolveInitialRoute(initialRoute);
-    final bool showBottomBarOnStart = _showBottomBarOnStart(
-      resolvedInitialRoute,
+    // Re-assert visibility after every rebuild: the Bart scaffold underneath
+    // may have been freshly instantiated (see class doc).
+    _scheduleSync();
+
+    final String? resolvedInitialRoute = _resolveInitialRoute(
+      widget.initialRoute,
+    );
+    final bool showBottomBarOnStart = _shouldShowBottomBar(resolvedInitialRoute);
+    final scaffoldOptions = bart.ScaffoldOptions(
+      backgroundColor: context.colors.background,
     );
+
     return AnnotatedRegion<SystemUiOverlayStyle>(
       value: switch (Theme.brightnessOf(context)) {
         Brightness.dark => SystemUiOverlayStyle.light,
@@ -35,13 +106,8 @@ class BottomMenu extends StatelessWidget {
           bottomBar: kasyPaddedSurfaceBottomBar(),
           initialRoute: resolvedInitialRoute,
           showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: bart.ScaffoldOptions(
-            backgroundColor: context.colors.background,
-          ),
-          onRouteChanged: (route) {
-            // If you want to log tab events to analytics
-            // MixpanelAnalyticsApi.instance().logEvent('home/$route', {});
-          },
+          scaffoldOptions: scaffoldOptions,
+          onRouteChanged: _onRouteChanged,
         ),
         // medium (768–1024 px): icon-only collapsed rail
         medium: bart.BartScaffold(
@@ -49,16 +115,11 @@ class BottomMenu extends StatelessWidget {
           bottomBar: kasyPaddedSurfaceBottomBar(),
           initialRoute: resolvedInitialRoute,
           showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: bart.ScaffoldOptions(
-            backgroundColor: context.colors.background,
-          ),
+          scaffoldOptions: scaffoldOptions,
           sideBarOptions: bart.CustomSideBarOptions(
             sideBarBuilder: kasySidebarCollapsedBuilder,
           ),
-          onRouteChanged: (route) {
-            // If you want to log tab events to analytics
-            // MixpanelAnalyticsApi.instance().logEvent('home/$route', {});
-          },
+          onRouteChanged: _onRouteChanged,
         ),
         // large (1024 px+): full expanded sidebar
         large: bart.BartScaffold(
@@ -66,16 +127,11 @@ class BottomMenu extends StatelessWidget {
           bottomBar: kasyPaddedSurfaceBottomBar(),
           initialRoute: resolvedInitialRoute,
           showBottomBarOnStart: showBottomBarOnStart,
-          scaffoldOptions: bart.ScaffoldOptions(
-            backgroundColor: context.colors.background,
-          ),
+          scaffoldOptions: scaffoldOptions,
           sideBarOptions: bart.CustomSideBarOptions(
             sideBarBuilder: kasySidebarBuilder,
           ),
-          onRouteChanged: (route) {
-            // If you want to log tab events to analytics
-            // MixpanelAnalyticsApi.instance().logEvent('home/$route', {});
-          },
+          onRouteChanged: _onRouteChanged,
         ),
       ),
     );
@@ -114,14 +170,11 @@ class BottomMenu extends StatelessWidget {
     return path;
   }
 
-  bool _showBottomBarOnStart(String? route) {
+  bool _shouldShowBottomBar(String? route) {
     if (route == null) {
       return true;
     }
     final segments = Uri.parse(route).pathSegments;
-    if (segments.length < 2) {
-      return true;
-    }
-    return false;
+    return segments.length < 2;
   }
 }

package/templates/firebase/lib/core/bottom_menu/bottom_router.dart

@@ -2,7 +2,6 @@ import 'package:bart/bart.dart';
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/components/kasy_app_bar.dart';
 import 'package:kasy_kit/core/bottom_menu/bart_inner_paths.dart';
-import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/bottom_menu/notification_bottom_item.dart';
 import 'package:kasy_kit/core/navigation/kasy_navigation_config.dart';
 import 'package:kasy_kit/core/navigation/kasy_route_transition.dart';
@@ -110,53 +109,18 @@ List<BartMenuRoute> subRoutes() {
   ];
 }
 
-class _HomeInnerRoute extends StatefulWidget {
+/// Marker wrapper for inner home routes. Visibility is owned by
+/// [BottomMenu] (see [BottomMenu._onRouteChanged] + [BartMenuRoute.innerRoute]
+/// `showBottomBar: false`); this widget exists for symmetry with the dashboard
+/// cards and to keep `HomeFeaturesPage` / `HomeComponentsPage` / etc. agnostic
+/// of how they were pushed.
+class _HomeInnerRoute extends StatelessWidget {
   final Widget child;
 
   const _HomeInnerRoute({required this.child});
 
   @override
-  State<_HomeInnerRoute> createState() => _HomeInnerRouteState();
-}
-
-class _HomeInnerRouteState extends State<_HomeInnerRoute> {
-  ModalRoute<Object?>? _route;
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final ModalRoute<Object?>? route = ModalRoute.of(context);
-    if (_route != route) {
-      _route?.animation?.removeStatusListener(_onRouteAnimStatus);
-      _route = route;
-      final Animation<double>? anim = route?.animation;
-      if (anim != null && !anim.isCompleted) {
-        anim.addStatusListener(_onRouteAnimStatus);
-      }
-    }
-    kasyHideBottomBar(context);
-  }
-
-  void _onRouteAnimStatus(AnimationStatus status) {
-    if (mounted && status == AnimationStatus.completed) {
-      kasyHideBottomBar(context);
-    }
-  }
-
-  @override
-  void dispose() {
-    _route?.animation?.removeStatusListener(_onRouteAnimStatus);
-    super.dispose();
-  }
-
-  @override
-  void reassemble() {
-    super.reassemble();
-    kasyHideBottomBar(context);
-  }
-
-  @override
-  Widget build(BuildContext context) => widget.child;
+  Widget build(BuildContext context) => child;
 }
 
 /// Placeholder page for the wishlist tab.

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

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:kasy_kit/core/dev_inspector/dev_inspector_info.dart';
 import 'package:kasy_kit/core/dev_inspector/dev_inspector_service.dart';
@@ -12,6 +13,10 @@ import 'package:kasy_kit/core/theme/providers/theme_provider.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+const Color _highlightColor = Color(0xFFD2F51E);
+const double _highlightStrokeWidth = 2.0;
+const double _highlightCornerRadius = 4.0;
+
 final GlobalKey<ScaffoldMessengerState> devInspectorRootScaffoldMessengerKey =
     GlobalKey<ScaffoldMessengerState>(debugLabel: 'devInspectorRoot');
 
@@ -31,6 +36,12 @@ final ValueNotifier<bool> devInspectorRevealNowNotifier =
 final ValueNotifier<bool> devInspectorCopyTriggerNotifier =
     ValueNotifier<bool>(false);
 
+/// Active state of the custom inspector. Toggled by the FAB (native) and by
+/// the Web Device Preview pill; observed by [DevInspector] to mount the
+/// tap-absorbing overlay and the highlight.
+final ValueNotifier<bool> devInspectorActiveNotifier =
+    ValueNotifier<bool>(false);
+
 class DevInspector extends StatefulWidget {
   const DevInspector({super.key, required this.child});
 
@@ -45,7 +56,8 @@ class DevInspector extends StatefulWidget {
   State<DevInspector> createState() => _DevInspectorState();
 }
 
-class _DevInspectorState extends State<DevInspector> {
+class _DevInspectorState extends State<DevInspector>
+    with SingleTickerProviderStateMixin {
   static const Duration _fabRevealDelay = Duration(seconds: 2);
   static const Duration _fabDeemphasizeDelay = Duration(seconds: 2);
   static const Duration _fabOpacityAnimation = Duration(milliseconds: 700);
@@ -71,11 +83,15 @@ class _DevInspectorState extends State<DevInspector> {
   bool _fabFadeIn = false;
   bool _fabEmphasized = false;
 
+  DevInspectorInfo? _selectedInfo;
+  RenderObject? _selectedRender;
+  Rect? _highlightRect;
+  Ticker? _highlightTicker;
+
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.debugShowWidgetInspectorOverrideNotifier
-        .addListener(_handleInspectorOverrideChanged);
+    devInspectorActiveNotifier.addListener(_handleActiveChanged);
     devInspectorFabEnabledNotifier.addListener(_onFabEnabledNotifierChanged);
     devInspectorRevealNowNotifier.addListener(_onRevealNow);
     devInspectorCopyTriggerNotifier.addListener(_onCopyTriggered);
@@ -87,13 +103,13 @@ class _DevInspectorState extends State<DevInspector> {
     _revealTimer?.cancel();
     _fabDeemphasizeTimer?.cancel();
     _copyFeedbackTimer?.cancel();
+    _highlightTicker?.dispose();
     devInspectorFabEnabledNotifier.removeListener(_onFabEnabledNotifierChanged);
     devInspectorRevealNowNotifier.removeListener(_onRevealNow);
     devInspectorCopyTriggerNotifier.removeListener(_onCopyTriggered);
-    WidgetsBinding.instance.debugShowWidgetInspectorOverrideNotifier
-        .removeListener(_handleInspectorOverrideChanged);
-    if (_active) {
-      WidgetsBinding.instance.debugShowWidgetInspectorOverride = false;
+    devInspectorActiveNotifier.removeListener(_handleActiveChanged);
+    if (devInspectorActiveNotifier.value) {
+      devInspectorActiveNotifier.value = false;
     }
     super.dispose();
   }
@@ -141,7 +157,7 @@ class _DevInspectorState extends State<DevInspector> {
     if (!mounted) return;
     if (!enabled) {
       if (_active) {
-        WidgetsBinding.instance.debugShowWidgetInspectorOverride = false;
+        devInspectorActiveNotifier.value = false;
       }
       _copyFeedbackTimer?.cancel();
       setState(() {
@@ -152,6 +168,7 @@ class _DevInspectorState extends State<DevInspector> {
         _dragging = false;
         _copyFeedbackText = null;
         _copyFeedbackIsError = false;
+        _clearSelection();
       });
       _copyFeedbackTimer?.cancel();
       return;
@@ -192,17 +209,62 @@ class _DevInspectorState extends State<DevInspector> {
   }
 
   void _setInspectorActive(bool value) {
-    setState(() => _active = value);
-    WidgetsBinding.instance.debugShowWidgetInspectorOverride = value;
+    devInspectorActiveNotifier.value = value;
     HapticFeedback.lightImpact();
   }
 
-  void _handleInspectorOverrideChanged() {
-    final bool override =
-        WidgetsBinding.instance.debugShowWidgetInspectorOverride;
-    if (_active == override) return;
+  void _handleActiveChanged() {
+    final bool active = devInspectorActiveNotifier.value;
+    if (_active == active) return;
     if (!mounted) return;
-    setState(() => _active = override);
+    setState(() {
+      _active = active;
+      if (!active) _clearSelection();
+    });
+  }
+
+  void _clearSelection() {
+    _selectedInfo = null;
+    _selectedRender = null;
+    _highlightRect = null;
+    _stopHighlightTicker();
+  }
+
+  void _onInspectorTap(Offset globalPosition) {
+    final picked = DevInspectorService.pickAt(globalPosition);
+    if (picked == null) {
+      HapticFeedback.heavyImpact();
+      return;
+    }
+    setState(() {
+      _selectedInfo = picked.info;
+      _selectedRender = picked.renderObject;
+      _highlightRect = picked.info.boundingBox;
+    });
+    _startHighlightTicker();
+    HapticFeedback.selectionClick();
+  }
+
+  void _startHighlightTicker() {
+    _highlightTicker ??= createTicker(_onHighlightTick);
+    if (!_highlightTicker!.isActive) _highlightTicker!.start();
+  }
+
+  void _stopHighlightTicker() {
+    if (_highlightTicker?.isActive ?? false) _highlightTicker!.stop();
+  }
+
+  void _onHighlightTick(Duration _) {
+    final RenderObject? target = _selectedRender;
+    if (target == null) return;
+    final Rect? rect = DevInspectorService.remeasure(target);
+    if (rect == null) {
+      setState(_clearSelection);
+      return;
+    }
+    if (_highlightRect != rect) {
+      setState(() => _highlightRect = rect);
+    }
   }
 
   String? _extractRouteHint(DevInspectorInfo info) {
@@ -233,7 +295,7 @@ class _DevInspectorState extends State<DevInspector> {
     if (!_active || _copyBusy) return;
     _copyBusy = true;
     try {
-      final DevInspectorInfo? info = DevInspectorService.inspectSelected();
+      final DevInspectorInfo? info = _selectedInfo;
       if (!mounted) return;
       if (info == null) {
         _showCopyFeedback(t.devInspector.selectWidgetFirst, isError: true);
@@ -308,6 +370,20 @@ class _DevInspectorState extends State<DevInspector> {
               clipBehavior: Clip.none,
               children: <Widget>[
                 widget.child,
+                if (_active)
+                  Positioned.fill(
+                    child: Listener(
+                      behavior: HitTestBehavior.opaque,
+                      onPointerDown: (PointerDownEvent ev) =>
+                          _onInspectorTap(ev.position),
+                      child: IgnorePointer(
+                        child: CustomPaint(
+                          painter: _HighlightPainter(rect: _highlightRect),
+                          size: Size.infinite,
+                        ),
+                      ),
+                    ),
+                  ),
                 if (_fabLayerMounted &&
                     devInspectorFabEnabledNotifier.value)
                   Positioned(
@@ -462,3 +538,29 @@ class _EntryFab extends StatelessWidget {
     );
   }
 }
+
+class _HighlightPainter extends CustomPainter {
+  _HighlightPainter({required this.rect});
+
+  final Rect? rect;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final Rect? r = rect;
+    if (r == null || r.isEmpty) return;
+    final Paint paint = Paint()
+      ..color = _highlightColor
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = _highlightStrokeWidth;
+    final Rect outer = r.inflate(_highlightStrokeWidth / 2);
+    final RRect rrect = RRect.fromRectAndRadius(
+      outer,
+      const Radius.circular(_highlightCornerRadius),
+    );
+    canvas.drawRRect(rrect, paint);
+  }
+
+  @override
+  bool shouldRepaint(_HighlightPainter oldDelegate) =>
+      oldDelegate.rect != rect;
+}

package/templates/firebase/lib/core/dev_inspector/dev_inspector_service.dart

@@ -280,23 +280,12 @@ class DevInspectorService {
     );
   }
 
-  /// Reads the widget currently selected in Flutter's native inspector.
-  static DevInspectorInfo? inspectSelected() {
-    if (!kDebugMode) return null;
-    try {
-      // ignore: invalid_use_of_visible_for_testing_member
-      final RenderObject? renderObject =
-          WidgetInspectorService.instance.selection.current;
-      if (renderObject == null) return null;
-      return _extractFromRenderObject(renderObject);
-    } catch (_) {
-      return null;
-    }
-  }
-
-  /// Inspects the widget at a global position, syncs the native inspector
-  /// selection (tooltip + highlight), and return the info.
-  static DevInspectorInfo? inspectAndSelect(Offset globalPosition) {
+  /// Hit-tests at [globalPosition] and returns the inspector info plus the
+  /// underlying render object so the caller can re-measure the bounds during
+  /// animations.
+  static ({DevInspectorInfo info, RenderObject renderObject})? pickAt(
+    Offset globalPosition,
+  ) {
     if (!kDebugMode) return null;
     try {
       final result = BoxHitTestResult();
@@ -308,9 +297,7 @@ class DevInspectorService {
         final RenderObject candidate = entry.target as RenderObject;
         final DevInspectorInfo? info = _extractFromRenderObject(candidate);
         if (info != null) {
-          // ignore: invalid_use_of_protected_member
-          WidgetInspectorService.instance.setSelection(candidate, 'kit_inspector');
-          return info;
+          return (info: info, renderObject: candidate);
         }
       }
       return null;
@@ -318,4 +305,11 @@ class DevInspectorService {
       return null;
     }
   }
+
+  /// Re-measures the global bounding rect of a previously picked render
+  /// object. Returns null if it became detached from the tree.
+  static Rect? remeasure(RenderObject target) {
+    if (!target.attached) return null;
+    return _globalBoundingRect(target);
+  }
 }

package/templates/firebase/lib/core/home_widgets/home_widget_mywidget_service.dart

@@ -71,12 +71,12 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     final user = ref.read(userStateNotifierProvider).user;
 
     // Slang lazy-loads non-base locales: AppLocale.pt.translations falls back
-    // silently to the base locale (en) until the locale's bundle is loaded
-    // into memory. setLocale() kicks off that load asynchronously, so a tap
-    // on "Português" immediately followed by updateForLocale(pt) would push
-    // English text to the widget on the first try and the correct one on
-    // the retry. Awaiting loadLocale here removes the race.
-    await LocaleSettings.instance.loadLocale(locale);
+    // silently to the base locale (en) if the bundle isn't in the translation
+    // map yet. The async loadLocale() can't be used here as a safety net
+    // because it short-circuits ("already loading") when setLocale() is in
+    // flight in parallel — leaving us reading translations that aren't loaded
+    // yet. loadLocaleSync forces the bundle into the map right now, no race.
+    LocaleSettings.instance.loadLocaleSync(locale);
     final t = locale.translations;
 
     // "Logged out" = no user id at all (post-logout in authRequired mode, or
@@ -111,6 +111,7 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
         ? ''
         : (isPro ? t.home_widget.plan_pro : t.home_widget.plan_free);
     final quote = t.home_widget.quote;
+    final quoteAuthor = t.home_widget.quote_author;
 
     logger.d(
       'Widget payload → greeting: "$greeting", title: "$title", '
@@ -123,6 +124,7 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       'planText': planText,
       'isPro': isPro.toString(),
       'quote': quote,
+      'quoteAuthor': quoteAuthor,
     });
   }
 
@@ -164,6 +166,10 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     await HomeWidget.saveWidgetData<String>('planText', data['planText'] ?? '');
     await HomeWidget.saveWidgetData<String>('isPro', data['isPro'] ?? 'false');
     await HomeWidget.saveWidgetData<String>('quote', data['quote'] ?? '');
+    await HomeWidget.saveWidgetData<String>(
+      'quoteAuthor',
+      data['quoteAuthor'] ?? '',
+    );
 
     await HomeWidget.updateWidget(
       name: _androidWidgetName,
@@ -171,18 +177,6 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     );
   }
 
-  Future<Map<String, dynamic>> getWidgetData() async {
-    return {
-      'greeting': await HomeWidget.getWidgetData<String>('greeting'),
-      'title': await HomeWidget.getWidgetData<String>('title'),
-      'planText': await HomeWidget.getWidgetData<String>('planText'),
-      'isPro': await HomeWidget.getWidgetData<String>(
-        'isPro',
-        defaultValue: 'false',
-      ),
-    };
-  }
-
   /// Time-of-day greeting in the app language (matches what the user sees
   /// inside the app, not the device language).
   static String _greeting(Translations t) {