kasy-cli 1.39.0 → 1.40.0

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

@@ -2,7 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:kasy_kit/components/kasy_bottom_sheet.dart';
+import 'package:kasy_kit/components/kasy_menu.dart';
+import 'package:kasy_kit/components/kasy_popover.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';
@@ -63,118 +64,42 @@ class LanguageSwitcher extends ConsumerWidget {
     WidgetRef ref,
     AppLocale current,
   ) {
-    final String sheetTitle = context.t.settings.language_title;
-    showKasyBottomSheet<void>(
+    showKasyMenu<void>(
       context: context,
-      builder: (sheetContext) => KasySheetSurface(
-        child: Padding(
-          // No horizontal padding: option rows go full-bleed so the highlight
-          // spans the whole sheet (no inset pill). Title and rows carry their
-          // own horizontal inset instead.
-          padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
-                child: Align(
-                  alignment: Alignment.centerLeft,
-                  child: Text(
-                    sheetTitle,
-                    style: sheetContext.textTheme.titleMedium?.copyWith(
-                      color: sheetContext.colors.onSurface,
-                    ),
-                  ),
+      anchorContext: context,
+      // Desktop: hang the menu off the right edge of the settings row, where the
+      // current value sits — a native desktop menu, not a centered modal.
+      desktopAlign: KasyPopoverAlign.end,
+      sections: [
+        KasyMenuSection(
+          label: context.t.settings.language_title,
+          selectionMode: KasyMenuSelectionMode.single,
+          items: AppLocale.values
+              .map(
+                (AppLocale locale) => KasyMenuItem(
+                  title: locale.nativeName,
+                  selected: locale == current,
+                  onTap: () => _applyLocale(ref, locale),
                 ),
-              ),
-              const SizedBox(height: KasySpacing.xs),
-              ...AppLocale.values.map((AppLocale locale) {
-                final bool isSelected = locale == current;
-                return _LocaleOptionTile(
-                  locale: locale,
-                  isSelected: isSelected,
-                  onTap: () async {
-                    // Close the sheet FIRST. Awaiting work before pop
-                    // races with the rebuild triggered by setLocale and
-                    // crashed Navigator.pop with !_debugLocked.
-                    Navigator.pop(sheetContext);
-                    // Await setLocale so the locale bundle finishes loading
-                    // BEFORE the widget tries to read its translations.
-                    // Slang lazy-loads non-base locales and its loadLocale
-                    // returns immediately when another caller (this setLocale)
-                    // is already loading — so a parallel updateForLocale would
-                    // see translations not yet in the map and silently fall
-                    // back to the base locale (English). That was the root
-                    // cause of "first language tap doesn't update the widget".
-                    await LocaleSettings.setLocale(locale);
-                    unawaited(
-                      ref
-                          .read(sharedPreferencesProvider)
-                          .setAppLocale(locale.languageCode),
-                    );
-                    unawaited(
-                      ref
-                          .read(myWidgetHomeWidgetProvider.notifier)
-                          .updateForLocale(locale),
-                    );
-                  },
-                );
-              }),
-            ],
-          ),
+              )
+              .toList(),
         ),
-      ),
+      ],
     );
   }
-}
 
-class _LocaleOptionTile extends StatelessWidget {
-  const _LocaleOptionTile({
-    required this.locale,
-    required this.isSelected,
-    required this.onTap,
-  });
-
-  final AppLocale locale;
-  final bool isSelected;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    final Color primary = context.colors.primary;
-    final Color fg = isSelected ? primary : context.colors.onSurface;
-
-    return KasyHover(
-      onTap: onTap,
-      focusable: true,
-      // Full-bleed rectangular highlight (default radius): the sheet rounds its
-      // own corners, so options span edge-to-edge like a native menu/list.
-      padding: const EdgeInsets.symmetric(
-        horizontal: KasySpacing.md,
-        vertical: KasySpacing.smd,
-      ),
-      child: Row(
-        children: <Widget>[
-          Expanded(
-            child: Text(
-              locale.nativeName,
-              style: context.textTheme.bodyLarge?.copyWith(
-                color: fg,
-                fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
-              ),
-            ),
-          ),
-          if (isSelected)
-            Container(
-              width: 10,
-              height: 10,
-              decoration: BoxDecoration(
-                color: primary,
-                shape: BoxShape.circle,
-              ),
-            ),
-        ],
-      ),
+  // The menu closes itself before this runs (KasyMenuItem pops first), so the
+  // awaited setLocale never races the rebuild it triggers. setLocale is awaited
+  // so Slang finishes loading the locale bundle before any widget reads its
+  // translations — otherwise a parallel updateForLocale sees an unloaded map and
+  // silently falls back to English (the old "first tap doesn't update" bug).
+  Future<void> _applyLocale(WidgetRef ref, AppLocale locale) async {
+    await LocaleSettings.setLocale(locale);
+    unawaited(
+      ref.read(sharedPreferencesProvider).setAppLocale(locale.languageCode),
+    );
+    unawaited(
+      ref.read(myWidgetHomeWidgetProvider.notifier).updateForLocale(locale),
     );
   }
 }

package/templates/firebase/lib/features/subscriptions/ui/widgets/comparison_table.dart

@@ -137,30 +137,30 @@ class _ComparisonTable extends StatelessWidget {
       return const SizedBox.shrink();
     }
 
-    return Material(
+    // Flat bordered surface (no elevation), clipped to the rounded shape so the
+    // tinted header corners follow the radius. No Material wrapper: the Container
+    // paints the surface, border and radius itself.
+    return ClipRRect(
       borderRadius: KasyRadius.lgBorderRadius,
-      child: ClipRRect(
-        borderRadius: KasyRadius.lgBorderRadius,
-        child: Container(
-          decoration: BoxDecoration(
-            color: context.colors.surface,
-            borderRadius: KasyRadius.lgBorderRadius,
-            border: Border.all(
-              color: context.colors.onBackground.withValues(alpha: 0.3),
-            ),
+      child: Container(
+        decoration: BoxDecoration(
+          color: context.colors.surface,
+          borderRadius: KasyRadius.lgBorderRadius,
+          border: Border.all(
+            color: context.colors.onBackground.withValues(alpha: 0.3),
           ),
-          child: Column(
-            children: [
-              _buildHeader(context),
-              ...rows.asMap().entries.map(
-                (entry) => _buildRow(
-                  context,
-                  entry.value,
-                  isLast: entry.key == rows.length - 1,
-                ),
+        ),
+        child: Column(
+          children: [
+            _buildHeader(context),
+            ...rows.asMap().entries.map(
+              (entry) => _buildRow(
+                context,
+                entry.value,
+                isLast: entry.key == rows.length - 1,
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       ),
     );

package/templates/firebase/lib/features/subscriptions/ui/widgets/premium_close_button.dart

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
+import 'package:kasy_kit/core/widgets/kasy_pressable_depth.dart';
+import 'package:kasy_kit/i18n/translations.g.dart';
 
 class AppCloseButtonComponent extends ConsumerWidget {
   final ValueNotifier<bool> showCloseBtn;
@@ -36,34 +37,41 @@ class AppCloseButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final VoidCallback? onClose = onTap;
-    return Material(
-      color: Colors.transparent,
-      child: KasyFocusRing(
-        enabled: onClose != null,
-        onActivate: onClose,
-        borderRadius: BorderRadius.circular(999),
-        child: InkWell(
-          canRequestFocus: false,
-          onTapUp: (_) {
-            onClose?.call();
-          },
-          child: Ink(
-            width: 32,
-            height: 32,
-            decoration: BoxDecoration(
-              shape: BoxShape.circle,
-              color: context.colors.onBackground.withValues(alpha: 0.6),
-            ),
-            child: Center(
-              child: Icon(
-                KasyIcons.close,
-                color: context.colors.background,
-                size: KasyIconSize.lg,
-              ),
-            ),
-          ),
+
+    // Dark translucent scrim keeps the glyph readable over any hero image.
+    final Widget circle = Container(
+      width: 32,
+      height: 32,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: context.colors.onBackground.withValues(alpha: 0.6),
+      ),
+      child: Center(
+        child: Icon(
+          KasyIcons.close,
+          color: context.colors.background,
+          size: KasyIconSize.lg,
         ),
       ),
     );
+
+    // Disabled (no handler): render the inert scrim, no interaction.
+    if (onClose == null) {
+      return circle;
+    }
+
+    // KasyPressableDepth gives the kit's press-in depth, a web hover highlight
+    // and a keyboard focus ring (no Material ripple), plus a 44x44 tap target
+    // around the 32px visual. A light veil lifts the dark scrim on hover/press.
+    final BorderRadius pill = BorderRadius.circular(999);
+    return KasyPressableDepth(
+      onPressed: onClose,
+      semanticLabel: t.common.close,
+      focusable: true,
+      clipBorderRadius: pill,
+      focusBorderRadius: pill,
+      pressOverlayColor: context.colors.background.withValues(alpha: 0.2),
+      child: circle,
+    );
   }
 }

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_col.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
+import 'package:kasy_kit/core/widgets/kasy_hover.dart';
 import 'package:kasy_kit/features/subscriptions/ui/widgets/selectable_row.dart';
 
 
@@ -65,24 +65,29 @@ class _SelectableColGroupState<T> extends State<SelectableColGroup<T>> {
         children: [
           for (var i = 0; i < widget.items.length; i++)
             Expanded(
-              child: KasyFocusRing(
-                onActivate: () => _selectIndex(i),
+              child: KasyHover(
+                onTap: () => _selectIndex(i),
+                focusable: true,
                 borderRadius: KasyRadius.lgBorderRadius,
-                child: GestureDetector(
-                  onTap: () => _selectIndex(i),
-                  child: Animate(
-                    effects: [
-                      FadeEffect(
-                        delay: Duration(milliseconds: 100 + 100 * i),
-                        duration: const Duration(milliseconds: 500),
-                      ),
-                    ],
-                    child: SelectableCol.fromOption(
-                      key: ValueKey('item_$i'),
-                      widget.items[i],
-                      selected: selectedIndex == i,
-                      brightness: widget.brightness,
+                // The card paints its own animated selection border, so suppress
+                // the hover/press fill: KasyHover only adds the web click cursor
+                // and the keyboard focus ring. The heavy selection haptic is
+                // fired by _selectIndex, so opt out of the default tap haptic.
+                hapticEnabled: false,
+                hoverEnabled: false,
+                pressEnabled: false,
+                child: Animate(
+                  effects: [
+                    FadeEffect(
+                      delay: Duration(milliseconds: 100 + 100 * i),
+                      duration: const Duration(milliseconds: 500),
                     ),
+                  ],
+                  child: SelectableCol.fromOption(
+                    key: ValueKey('item_$i'),
+                    widget.items[i],
+                    selected: selectedIndex == i,
+                    brightness: widget.brightness,
                   ),
                 ),
               ),

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_row.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
+import 'package:kasy_kit/core/widgets/kasy_hover.dart';
 
 typedef OnSelectItem<T> = void Function(T data);
 
@@ -51,12 +51,18 @@ class _SelectableRowGroupState<T> extends State<SelectableRowGroup<T>> {
     return Column(
       children: [
         for (var i = 0; i < widget.items.length; i++)
-          KasyFocusRing(
-            onActivate: () => _selectIndex(i),
+          KasyHover(
+            onTap: () => _selectIndex(i),
+            focusable: true,
             borderRadius: KasyRadius.mdBorderRadius,
-            child: GestureDetector(
-              onTap: () => _selectIndex(i),
-              child: Padding(
+            // The card paints its own animated selection border, so suppress the
+            // hover/press fill: KasyHover only contributes the web click cursor
+            // and the keyboard focus ring. The heavy selection haptic is fired
+            // by _selectIndex, so opt out of the default tap haptic.
+            hapticEnabled: false,
+            hoverEnabled: false,
+            pressEnabled: false,
+            child: Padding(
               padding: EdgeInsets.only(
                 bottom: i == widget.items.length - 1 ? 0 : KasySpacing.sm,
               ),
@@ -75,7 +81,6 @@ class _SelectableRowGroupState<T> extends State<SelectableRowGroup<T>> {
                 ),
               ),
             ),
-            ),
           ),
       ],
     );

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

@@ -460,8 +460,12 @@
     "cancel_button": "Cancel"
   },
   "review_popup": {
-    "title": "Enjoying the app?",
-    "description": "If the app has been helpful, a store review makes all the difference. It takes a few seconds and really helps us grow.",
+    "question_title": "Enjoying the app?",
+    "question_description": "Your answer helps us improve.",
+    "question_positive": "Yes, I am",
+    "question_negative": "Could be better",
+    "title": "Glad you like it!",
+    "description": "A store review makes all the difference. It takes a few seconds and really helps us grow.",
     "rate_button": "Write a review"
   },
   "navigation": {

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

@@ -460,8 +460,12 @@
     "cancel_button": "Cancelar"
   },
   "review_popup": {
-    "title": "¿Te gusta la app?",
-    "description": "Si la app te ha sido útil, una reseña en la tienda marca la diferencia. Toma unos segundos y nos ayuda mucho a crecer.",
+    "question_title": "¿Te gusta la app?",
+    "question_description": "Tu respuesta nos ayuda a mejorar.",
+    "question_positive": "Sí, me gusta",
+    "question_negative": "Podría mejorar",
+    "title": "¡Qué bueno que te guste!",
+    "description": "Una reseña en la tienda marca la diferencia. Toma unos segundos y nos ayuda mucho a crecer.",
     "rate_button": "Escribir una reseña"
   },
   "navigation": {

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

@@ -460,8 +460,12 @@
     "cancel_button": "Cancelar"
   },
   "review_popup": {
-    "title": "Está gostando do app?",
-    "description": "Se o app tem te ajudado, uma avaliação na loja faz toda a diferença. Leva poucos segundos e ajuda demais a gente a crescer.",
+    "question_title": "Está gostando do app?",
+    "question_description": "Sua resposta ajuda a gente a melhorar.",
+    "question_positive": "Sim, estou gostando",
+    "question_negative": "Poderia melhorar",
+    "title": "Que bom que curtiu!",
+    "description": "Uma avaliação na loja faz toda a diferença. Leva poucos segundos e ajuda demais a gente a crescer.",
     "rate_button": "Escrever uma avaliação"
   },
   "navigation": {

package/templates/firebase/lib/router.dart

@@ -9,6 +9,7 @@ import 'package:kasy_kit/core/data/api/analytics_api.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/navigation/kasy_navigation_config.dart';
 import 'package:kasy_kit/core/navigation/kasy_page_transition.dart';
+import 'package:kasy_kit/core/navigation/kasy_route_observer.dart';
 import 'package:kasy_kit/core/security/biometric_guard.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
@@ -156,6 +157,7 @@ GoRouter generateRouter({
     observers: [
       AnalyticsObserver(analyticsApi: MixpanelAnalyticsApi.instance()),
       KasyChromeVisibilityObserver(),
+      kasyRouteObserver,
 
       ...?observers,
     ],

package/templates/firebase/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+66
+version: 1.0.0+70
 
 environment:
   sdk: ^3.11.0

package/templates/firebase/test/app_bar_config_test.dart

@@ -0,0 +1,70 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:kasy_kit/components/components.dart';
+
+/// The per-screen desktop bar override is just data: a screen transforms the
+/// shell default into its own [KasyAppBarConfig]. These lock that logic.
+void main() {
+  group('KasyAppBarConfig', () {
+    test('bare config shows every element (mirrors the shell default)', () {
+      const KasyAppBarConfig c = KasyAppBarConfig();
+      expect(c.showSearch, isTrue);
+      expect(c.showThemeToggle, isTrue);
+      expect(c.showNotifications, isTrue);
+      expect(c.showCreate, isTrue);
+      expect(c.showAvatar, isTrue);
+    });
+
+    test('only() shows just the listed elements but keeps their wiring', () {
+      void bell() {}
+      void toggle() {}
+      final KasyAppBarConfig base = KasyAppBarConfig(
+        onNotifications: bell,
+        onToggleTheme: toggle,
+      );
+
+      final KasyAppBarConfig cfg = base.only(notifications: true, themeToggle: true);
+
+      expect(cfg.showNotifications, isTrue);
+      expect(cfg.showThemeToggle, isTrue);
+      expect(cfg.showSearch, isFalse);
+      expect(cfg.showCreate, isFalse);
+      expect(cfg.showAvatar, isFalse);
+      // The shell's bell/theme callbacks survive the override.
+      expect(cfg.onNotifications, same(bell));
+      expect(cfg.onToggleTheme, same(toggle));
+    });
+
+    test('search preset = search + theme only', () {
+      const KasyAppBarConfig cfg = KasyAppBarConfig.search();
+      expect(cfg.showSearch, isTrue);
+      expect(cfg.showThemeToggle, isTrue);
+      expect(cfg.showNotifications, isFalse);
+      expect(cfg.showCreate, isFalse);
+      expect(cfg.showAvatar, isFalse);
+    });
+
+    test('minimal preset = theme toggle only', () {
+      const KasyAppBarConfig cfg = KasyAppBarConfig.minimal();
+      expect(cfg.showThemeToggle, isTrue);
+      expect(cfg.showSearch, isFalse);
+      expect(cfg.showNotifications, isFalse);
+      expect(cfg.showCreate, isFalse);
+      expect(cfg.showAvatar, isFalse);
+    });
+
+    test('copyWith with no changes is value-equal (no churn on the bar)', () {
+      const KasyAppBarConfig a = KasyAppBarConfig();
+      final KasyAppBarConfig b = a.copyWith();
+      expect(a, equals(b));
+      expect(a.hashCode, equals(b.hashCode));
+    });
+
+    test('copyWith changes only the named field', () {
+      const KasyAppBarConfig a = KasyAppBarConfig();
+      final KasyAppBarConfig b = a.copyWith(showSearch: false);
+      expect(b.showSearch, isFalse);
+      expect(b.showCreate, isTrue);
+      expect(a == b, isFalse);
+    });
+  });
+}

package/templates/firebase/lib/features/subscriptions/ui/widgets/premium_banner.dart

@@ -1,81 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
-
-typedef PremiumWideBannerOnTap = void Function();
-
-class PremiumWideBanner extends StatelessWidget {
-  final Color bgColor;
-  final String imagePath;
-  final String smallText;
-  final String title;
-  final PremiumWideBannerOnTap onTap;
-
-  const PremiumWideBanner({
-    super.key,
-    required this.bgColor,
-    required this.imagePath,
-    required this.smallText,
-    required this.title,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
-      return Material(
-        color: Colors.transparent,
-        child: Ink(
-          // height: 116,
-          width: constraints.maxWidth,
-          decoration: BoxDecoration(
-            color: bgColor,
-            // border: Border.all(color: borderColor),
-          ),
-          child: KasyFocusRing(
-            onActivate: () => onTap(),
-            borderRadius: BorderRadius.zero,
-            child: InkWell(
-              canRequestFocus: false,
-              onTap: () => onTap(),
-              child: Row(
-              children: [
-                Image.asset(
-                  imagePath,
-                  width: constraints.maxWidth * 0.32,
-                  // height: 116,
-                  fit: BoxFit.cover,
-                ),
-                const SizedBox(width: KasySpacing.lg),
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Text(
-                        smallText.toUpperCase(),
-                        style: context.kasyTextTheme.sectionLabel.copyWith(
-                          color: context.colors.premiumBannerText,
-                        ),
-                      ),
-                      const SizedBox(height: KasySpacing.sm),
-                      Text(
-                        title,
-                        style: context.textTheme.titleLarge?.copyWith(
-                          color: context.colors.onPrimary,
-                        ),
-                        overflow: TextOverflow.clip,
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: KasySpacing.lg),
-              ],
-            ),
-            ),
-          ),
-        ),
-      );
-    });
-  }
-}