kasy-cli 1.39.1 → 1.40.1

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/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+67
+version: 1.0.0+70
 
 environment:
   sdk: ^3.11.0

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),
-              ],
-            ),
-            ),
-          ),
-        ),
-      );
-    });
-  }
-}