kasy-cli 1.21.8 → 1.22.0

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

@@ -1,36 +1,46 @@
 import 'package:bart/bart.dart' as bart;
 import 'package:bart/bart/bart_model.dart';
 import 'package:bart/bart/router_delegate.dart';
-import 'package:bart/bart/widgets/bottom_bar/styles/bottom_bar_cupertino.dart';
 import 'package:bart/bart/widgets/bottom_bar/styles/bottom_bar_custom.dart';
-import 'package:bart/bart/widgets/bottom_bar/styles/bottom_bar_material.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 
-/// Breathing room under the top hairline so icons/labels are not glued to it.
-const double kasyBottomBarTopPadding = 6;
+/// Side breathing room so the floating bar never touches the screen edges.
+const double _kFloatingSideMargin = 16;
 
-const double _kBottomBarHeightMaterial3 = 88;
-const double _kBottomBarHeightCupertino = 56;
+/// Gap above the bar (separates it from the page content).
+const double _kFloatingTopGap = 6;
 
-/// [BartScaffold] requires a [bart.BartBottomBar]. This factory draws the same
-/// Material / Cupertino bars as [bart.BartBottomBar.adaptive], with extra top
-/// inset inside the chrome (not only a taller bar).
+/// Minimum gap under the bar when the device has no bottom safe-area inset
+/// (Android with gesture nav / no system bar). On notched devices the real
+/// inset is used instead so the home indicator stays clear.
+const double _kFloatingMinBottomGap = 16;
+
+/// Corner radius of the floating pill (HeroUI `rounded-3xl`).
+const double _kFloatingRadius = KasyRadius.rounded3xl;
+
+/// Bar (pill) inner height — the row of tab items.
+const double _kBarHeight = 72;
+
+/// Tab icon size.
+const double _kNavIconSize = 24;
+
+/// Gap between a tab's icon and its label.
+const double _kNavLabelGap = 3;
+
+/// Selection color-fade timing (muted ↔ primary highlight).
+const Duration _kSelectDuration = Duration(milliseconds: 200);
+const Curve _kSelectCurve = Curves.easeOut;
+
+/// [BartScaffold] requires a [bart.BartBottomBar]. This factory draws a single,
+/// custom navigation bar (same look on iOS and Android) wrapped in a floating,
+/// fully rounded surface that hovers above the screen edges with a safe-area
+/// aware gap underneath (iPhone home indicator / Android nav). Each tab is an
+/// icon over its label; the selected one is highlighted in the primary color.
 final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
   const KasyPaddedSurfaceBottomBarFactory();
 
-  bool _useCupertino(BuildContext context) {
-    if (kIsWeb) {
-      return false;
-    }
-    return switch (defaultTargetPlatform) {
-      TargetPlatform.iOS => true,
-      _ => false,
-    };
-  }
-
   @override
   Widget create({
     required BuildContext context,
@@ -45,11 +55,7 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
   }
 
   Widget _build(BuildContext context) {
-    final KasyColors colors = context.colors;
     final MenuRouter menuRouter = MenuRouter.of(context);
-    final BorderSide topEdge = BorderSide(
-      color: colors.outline.withValues(alpha: 0.35),
-    );
     void handleTap(int index) {
       if (menuRouter.indexNotifier.value == index &&
           menuRouter.routingTypeNotifier.value ==
@@ -64,82 +70,176 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
       }
     }
 
-    if (_useCupertino(context)) {
-      return Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          DecoratedBox(
-            decoration: BoxDecoration(
-              color: colors.surface,
-              border: Border(top: topEdge),
-            ),
-            child: const SizedBox(
-              height: kasyBottomBarTopPadding,
-              width: double.infinity,
-            ),
-          ),
-          BartCupertinoBottomBar(
-            routes: menuRouter.routesBuilder(),
-            theme: CupertinoBottomBarTheme(
-              bgColor: colors.surface,
-              height: _kBottomBarHeightCupertino - kasyBottomBarTopPadding,
-            ),
-            currentIndexNotifier: menuRouter.indexNotifier,
-            onTap: handleTap,
+    final Widget barCore = SizedBox(
+      height: _kBarHeight,
+      child: ValueListenableBuilder<int>(
+        valueListenable: menuRouter.indexNotifier,
+        builder: (context, currentIndex, _) {
+          // [currentIndex] / [handleTap] address the full route list, so map each
+          // tab back to its full-list index (robust to any non-tab route).
+          final List<BartMenuRoute> allRoutes = menuRouter.routesBuilder();
+          final List<BartMenuRoute> navRoutes = allRoutes
+              .where((r) => r.type == BartMenuRouteType.bottomNavigation)
+              .toList();
+          return Row(
+            children: [
+              for (final route in navRoutes)
+                Expanded(
+                  child: _KasyNavItem(
+                    route: route,
+                    selected: allRoutes.indexOf(route) == currentIndex,
+                    onTap: () => handleTap(allRoutes.indexOf(route)),
+                  ),
+                ),
+            ],
+          );
+        },
+      ),
+    );
+
+    return _floating(context, barCore);
+  }
+
+  /// Wraps [barCore] in a floating, fully rounded surface with side margins and
+  /// a safe-area-aware bottom gap, over a fade that lets scrolling content melt
+  /// into the page background before it reaches the bar.
+  Widget _floating(BuildContext context, Widget barCore) {
+    final KasyColors colors = context.colors;
+    // Real bottom safe area (home indicator / system nav). [viewPaddingOf] keeps
+    // reporting it even though we strip it from the inner bar below.
+    final double safeBottom = MediaQuery.viewPaddingOf(context).bottom;
+    final double bottomGap =
+        safeBottom > 0 ? safeBottom : _kFloatingMinBottomGap;
+    const BorderRadius radius = BorderRadius.all(
+      Radius.circular(_kFloatingRadius),
+    );
+
+    final Widget pill = Container(
+      decoration: BoxDecoration(
+        color: colors.surface,
+        borderRadius: radius,
+        // Single, very light shadow — just enough to lift the pill off the canvas.
+        boxShadow: [
+          KasyShadows.component(
+            context,
+            blurRadius: 12,
+            spreadRadius: -7,
+            offset: const Offset(0, 3),
           ),
         ],
-      );
-    }
-    return Material(
-      color: colors.surface,
-      elevation: 2,
-      shadowColor: Colors.black.withValues(alpha: 0.12),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const SizedBox(
-            height: kasyBottomBarTopPadding,
-            width: double.infinity,
+      ),
+      // Border drawn on top of the child so the clip never eats the hairline.
+      foregroundDecoration: BoxDecoration(
+        borderRadius: radius,
+        border: Border.all(
+          color: colors.outline.withValues(alpha: 0.35),
+        ),
+      ),
+      child: ClipRRect(
+        borderRadius: radius,
+        child: barCore,
+      ),
+    );
+
+    // Low bottom-up fade in the page background color: opaque at the very bottom
+    // (hides content scrolling under the bar), fully transparent again around the
+    // pill's mid-height so it stays a discreet wash low on the bar rather than a
+    // tall veil. Follows light/dark via the background token; same RGB at both
+    // ends so there is no grey halo.
+    final Widget fade = IgnorePointer(
+      child: DecoratedBox(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.bottomCenter,
+            end: Alignment.topCenter,
+            colors: [
+              colors.background,
+              colors.background,
+              colors.background.withValues(alpha: 0),
+            ],
+            stops: const [0.0, 0.33, 0.66],
           ),
-          Theme(
-            data: Theme.of(context).copyWith(
-              splashFactory: NoSplash.splashFactory,
-              splashColor: Colors.transparent,
-              highlightColor: Colors.transparent,
-              navigationBarTheme: NavigationBarTheme.of(context).copyWith(
-                backgroundColor: Colors.transparent,
-                elevation: 0,
-                shadowColor: Colors.transparent,
-                surfaceTintColor: Colors.transparent,
-                indicatorColor: Colors.transparent,
-                iconTheme: WidgetStateProperty.resolveWith((states) {
-                  final selected = states.contains(WidgetState.selected);
-                  return IconThemeData(
-                    color: selected ? colors.primary : colors.muted,
-                  );
-                }),
-                labelTextStyle: WidgetStateProperty.resolveWith((states) {
-                  final selected = states.contains(WidgetState.selected);
-                  final base = Theme.of(context).textTheme.labelMedium ??
-                      const TextStyle();
-                  return base.copyWith(
-                    color: selected ? colors.primary : colors.muted,
-                  );
-                }),
-              ),
-            ),
-            child: BartMaterial3BottomBar(
-              routes: menuRouter.routesBuilder(),
-              theme: Material3BottomBarTheme(
-                bgColor: Colors.transparent,
-                elevation: 0,
-                height: _kBottomBarHeightMaterial3 - kasyBottomBarTopPadding,
-              ),
-              currentIndexNotifier: menuRouter.indexNotifier,
-              onTap: handleTap,
-            ),
+        ),
+      ),
+    );
+
+    return Stack(
+      children: [
+        Positioned.fill(child: fade),
+        Padding(
+          padding: EdgeInsets.only(
+            left: _kFloatingSideMargin,
+            right: _kFloatingSideMargin,
+            top: _kFloatingTopGap,
+            bottom: bottomGap,
           ),
-        ],
+          child: pill,
+        ),
+      ],
+    );
+  }
+}
+
+/// A single bottom-bar tab: icon over its label. Selected is highlighted in the
+/// primary color (icon + label); unselected is muted. Selection fades the color.
+class _KasyNavItem extends StatelessWidget {
+  final BartMenuRoute route;
+  final bool selected;
+  final VoidCallback onTap;
+
+  const _KasyNavItem({
+    required this.route,
+    required this.selected,
+    required this.onTap,
+  });
+
+  Widget _icon(BuildContext context, Color color) {
+    final Widget raw = route.iconBuilder != null
+        ? route.iconBuilder!(context, selected)
+        : Icon(route.icon);
+    return IconTheme.merge(
+      data: IconThemeData(color: color, size: _kNavIconSize),
+      child: raw,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final KasyColors colors = context.colors;
+    final TextStyle labelBase =
+        context.textTheme.labelMedium ?? const TextStyle();
+    final String label = route.label ?? '';
+
+    return Semantics(
+      button: true,
+      selected: selected,
+      label: label,
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Center(
+          child: TweenAnimationBuilder<double>(
+            tween: Tween<double>(end: selected ? 1.0 : 0.0),
+            duration: _kSelectDuration,
+            curve: _kSelectCurve,
+            builder: (context, t, _) {
+              final Color color = Color.lerp(colors.muted, colors.primary, t)!;
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  _icon(context, color),
+                  const SizedBox(height: _kNavLabelGap),
+                  Text(
+                    label,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: labelBase.copyWith(color: color),
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
       ),
     );
   }

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

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:kasy_kit/components/kasy_web_header.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/core/widgets/responsive_layout.dart';
+
+/// On desktop (≥ [DeviceType.large]) this puts the [KasyWebHeader] at the top of
+/// the content area, above the routed page. On phone/tablet it is transparent
+/// (returns the page untouched) — there the page keeps its own [KasyAppBar].
+///
+/// Wrap each routed page with this in the bottom router so the header is present
+/// across navigation without touching individual pages.
+class WebContentWrapper extends StatelessWidget {
+  final Widget child;
+
+  const WebContentWrapper({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    final bool isDesktop =
+        MediaQuery.sizeOf(context).width >= DeviceType.large.breakpoint;
+    if (!isDesktop) return child;
+
+    return ColoredBox(
+      color: context.colors.background,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          // The sidebar carries the user profile here, so the header drops its
+          // avatar (showAvatar: false) to avoid duplicating the account chip.
+          KasyWebHeader(
+            onToggleTheme: () => ThemeProvider.of(context).toggle(),
+            onNotifications: () {},
+            onCreate: () {},
+            showAvatar: false,
+          ),
+          Expanded(child: child),
+        ],
+      ),
+    );
+  }
+}

package/templates/firebase/lib/core/config/app_env.dart

@@ -16,9 +16,6 @@ const String _kRcAndroidApiKeyFromDefine = String.fromEnvironment(
 const String _kRcIosApiKeyFromDefine = String.fromEnvironment(
   'RC_IOS_API_KEY',
 );
-const String _kRcWebApiKeyFromDefine = String.fromEnvironment(
-  'RC_WEB_API_KEY',
-);
 const String _kMixpanelTokenFromDefine = String.fromEnvironment(
   'MIXPANEL_TOKEN',
 );
@@ -28,8 +25,8 @@ const String _kSentryDsnFromDefine = String.fromEnvironment(
 const String _kAppStoreIdFromDefine = String.fromEnvironment(
   'APP_STORE_ID',
 );
-const String _kLlmChatEndpointFromDefine = String.fromEnvironment(
-  'LLM_CHAT_ENDPOINT',
+const String _kAiChatEndpointFromDefine = String.fromEnvironment(
+  'AI_CHAT_ENDPOINT',
 );
 
 // ignore: avoid_classes_with_only_static_members
@@ -68,9 +65,6 @@ class AppEnv {
   static String get rcIosApiKey =>
       _resolve(key: 'RC_IOS_API_KEY', dartDefineValue: _kRcIosApiKeyFromDefine);
 
-  static String get rcWebApiKey =>
-      _resolve(key: 'RC_WEB_API_KEY', dartDefineValue: _kRcWebApiKeyFromDefine);
-
   static String get mixpanelToken => _resolve(
     key: 'MIXPANEL_TOKEN',
     dartDefineValue: _kMixpanelTokenFromDefine,
@@ -82,9 +76,9 @@ class AppEnv {
   static String get appStoreId =>
       _resolve(key: 'APP_STORE_ID', dartDefineValue: _kAppStoreIdFromDefine);
 
-  static String get llmChatEndpoint => _resolve(
-    key: 'LLM_CHAT_ENDPOINT',
-    dartDefineValue: _kLlmChatEndpointFromDefine,
+  static String get aiChatEndpoint => _resolve(
+    key: 'AI_CHAT_ENDPOINT',
+    dartDefineValue: _kAiChatEndpointFromDefine,
   );
 
   static String _resolve({

package/templates/firebase/lib/core/config/features.dart

@@ -2,14 +2,15 @@
 /// When false, the router skips that feature's routes and the guard ignores it.
 // ignore_for_file: avoid_redundant_argument_values
 const bool withOnboarding = true;
-const bool withLlmChat    = true;
+const bool withAiChat    = true;
 const bool withFeedback            = true;
 const bool withRevenuecat          = true;
-const bool withLocalNotifications  = true;
+const bool withLocalReminders  = true;
 /// When true, the app includes web support:
 ///   - anonymous sign-up is disabled on web (user is redirected to /signin)
 ///   - onboarding is skipped on web
 ///   - home widgets and background fetch are no-ops on web
 const bool withWeb = true;
-/// When true, RevenueCat Web Billing is enabled for subscriptions on web.
-const bool revenuecatWeb = true;
+/// When true, the Stripe web-subscription module is included (web checkout +
+/// customer portal). Independent from RevenueCat (which stays mobile-only).
+const bool withStripe = true;

package/templates/firebase/lib/core/data/api/analytics_api.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/initializer/onstart_service.dart';
-import 'package:kasy_kit/environnements.dart';
+import 'package:kasy_kit/environments.dart';
 import 'package:mixpanel_flutter/mixpanel_flutter.dart';
 
 final analyticsApiProvider = Provider<AnalyticsApi>(

package/templates/firebase/lib/core/data/api/http_client.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:kasy_kit/environnements.dart';
+import 'package:kasy_kit/environments.dart';
 
 final httpClientProvider = Provider<HttpClient>((ref) {
   return HttpClient.fromEnv();

package/templates/firebase/lib/core/data/entities/user_entity.dart

@@ -24,6 +24,9 @@ sealed class UserEntity with _$UserEntity {
     String? avatarPath,
     bool? onboarded,
     String? locale,
+    // User role for access control. Null/absent = normal user. Set to "admin"
+    // manually in the Firebase/Supabase console to unlock server-side admin data.
+    String? role,
   }) = UserEntityData;
 
   const UserEntity._();

package/templates/firebase/lib/core/data/models/entitlement.dart

@@ -0,0 +1,35 @@
+/// Provider-agnostic subscription entitlement (an access right granted to the
+/// user by an active subscription).
+///
+/// This decouples the subscription core from any specific payment SDK:
+/// RevenueCat's `EntitlementInfo` (mobile) and a Stripe subscription (web) both
+/// map to this kit-owned type. That way a web-only app using the Stripe module
+/// compiles and runs without the `purchases_flutter` package.
+class Entitlement {
+  /// Entitlement identifier (e.g. `premium`).
+  final String identifier;
+
+  /// Whether the entitlement is currently active.
+  final bool isActive;
+
+  /// Whether the subscription is currently in a free-trial period.
+  final bool isInTrial;
+
+  /// Whether the subscription is set to auto-renew.
+  final bool willRenew;
+
+  /// Store product id backing this entitlement, when known.
+  final String? productId;
+
+  /// When the entitlement expires, when known.
+  final DateTime? expirationDate;
+
+  const Entitlement({
+    required this.identifier,
+    this.isActive = true,
+    this.isInTrial = false,
+    this.willRenew = false,
+    this.productId,
+    this.expirationDate,
+  });
+}