kasy-cli 1.13.0 → 1.15.0

package/templates/firebase/lib/components/kasy_tabs.dart

@@ -0,0 +1,431 @@
+import 'package:flutter/material.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Data model
+// ─────────────────────────────────────────────────────────────────────────────
+
+/// Data model for a single tab item.
+class KasyTabItem {
+  final String label;
+  final IconData? icon;
+  final bool enabled;
+
+  const KasyTabItem({
+    required this.label,
+    this.icon,
+    this.enabled = true,
+  });
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Enums
+// ─────────────────────────────────────────────────────────────────────────────
+
+/// Visual style for [KasyTabs].
+enum KasyTabsVariant {
+  /// Sliding white pill on a gray container.
+  primary,
+
+  /// Blue underline indicator with a bottom divider.
+  secondary,
+}
+
+/// Sizing mode for [KasyTabs].
+enum KasyTabsMode {
+  /// Wraps content (intrinsic width tabs).
+  hug,
+
+  /// Each tab stretches to fill the available width equally.
+  fill,
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// KasyTabs
+// ─────────────────────────────────────────────────────────────────────────────
+
+/// Animated tab bar with primary (pill) and secondary (underline) variants.
+///
+/// Usage:
+/// ```dart
+/// KasyTabs(
+///   tabs: ['General', 'Appearance', 'Notifications'],
+///   selectedIndex: _index,
+///   onTabSelected: (i) => setState(() => _index = i),
+/// )
+/// ```
+///
+/// Supports [KasyTabItem] for per-tab icons and disabled state. The short-form
+/// constructor accepts plain [String] labels.
+class KasyTabs extends StatefulWidget {
+  /// Plain-string convenience constructor.
+  ///
+  /// Converts each string to a [KasyTabItem] with default settings.
+  KasyTabs({
+    super.key,
+    required List<String> tabs,
+    required this.selectedIndex,
+    required this.onTabSelected,
+    this.variant = KasyTabsVariant.primary,
+    this.mode = KasyTabsMode.hug,
+  }) : items = tabs.map((l) => KasyTabItem(label: l)).toList();
+
+  /// Full constructor accepting [KasyTabItem] instances (supports icons/disabled).
+  const KasyTabs.items({
+    super.key,
+    required this.items,
+    required this.selectedIndex,
+    required this.onTabSelected,
+    this.variant = KasyTabsVariant.primary,
+    this.mode = KasyTabsMode.hug,
+  });
+
+  final List<KasyTabItem> items;
+
+  /// Index of the currently selected tab.
+  final int selectedIndex;
+
+  /// Called when the user taps an enabled tab.
+  final ValueChanged<int> onTabSelected;
+
+  final KasyTabsVariant variant;
+  final KasyTabsMode mode;
+
+  @override
+  State<KasyTabs> createState() => _KasyTabsState();
+}
+
+class _KasyTabsState extends State<KasyTabs> {
+  // One GlobalKey per tab to measure position/size after layout.
+  late List<GlobalKey> _keys;
+
+  // Indicator geometry (left offset, width) resolved from measured keys.
+  double _indicatorLeft = 0;
+  double _indicatorWidth = 0;
+
+  // Whether we have a valid measurement yet.
+  bool _measured = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _keys = List.generate(
+      widget.items.length,
+      (_) => GlobalKey(),
+    );
+    WidgetsBinding.instance.addPostFrameCallback((_) => _measure());
+  }
+
+  @override
+  void didUpdateWidget(KasyTabs old) {
+    super.didUpdateWidget(old);
+    // Rebuild keys list if tab count changes.
+    if (old.items.length != widget.items.length) {
+      _keys = List.generate(
+        widget.items.length,
+        (_) => GlobalKey(),
+      );
+      _measured = false;
+    }
+    // Re-measure whenever selected index changes or keys were rebuilt.
+    WidgetsBinding.instance.addPostFrameCallback((_) => _measure());
+  }
+
+  void _measure() {
+    if (!mounted) return;
+    if (widget.items.isEmpty) return;
+
+    final int clampedIndex = widget.selectedIndex.clamp(
+      0,
+      widget.items.length - 1,
+    );
+
+    final RenderBox? containerBox =
+        context.findRenderObject() as RenderBox?;
+    if (containerBox == null) return;
+
+    final GlobalKey key = _keys[clampedIndex];
+    final RenderBox? tabBox =
+        key.currentContext?.findRenderObject() as RenderBox?;
+    if (tabBox == null) return;
+
+    final Offset tabOffset = tabBox.localToGlobal(
+      Offset.zero,
+      ancestor: containerBox,
+    );
+
+    final double newLeft = tabOffset.dx;
+    final double newWidth = tabBox.size.width;
+
+    if (!_measured ||
+        (_indicatorLeft - newLeft).abs() > 0.1 ||
+        (_indicatorWidth - newWidth).abs() > 0.1) {
+      setState(() {
+        _indicatorLeft = newLeft;
+        _indicatorWidth = newWidth;
+        _measured = true;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.items.isEmpty) return const SizedBox.shrink();
+
+    return widget.variant == KasyTabsVariant.primary
+        ? _buildPrimary(context)
+        : _buildSecondary(context);
+  }
+
+  // ── Primary (pill indicator) ───────────────────────────────────────────────
+
+  Widget _buildPrimary(BuildContext context) {
+    final KasyColors c = context.colors;
+    final bool isDark = context.isDark;
+
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        color: c.avatarFallbackFill,
+        borderRadius: BorderRadius.circular(KasyRadius.full),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(4),
+        child: Stack(
+          children: [
+            // Animated pill background.
+            if (_measured)
+              AnimatedPositioned(
+                duration: const Duration(milliseconds: 250),
+                curve: Curves.easeInOut,
+                left: _indicatorLeft,
+                top: 0,
+                bottom: 0,
+                width: _indicatorWidth,
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    color: c.surface,
+                    borderRadius: BorderRadius.circular(KasyRadius.full),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Colors.black.withValues(
+                          alpha: isDark ? 0.18 : 0.08,
+                        ),
+                        blurRadius: 8,
+                        offset: const Offset(0, 2),
+                      ),
+                      BoxShadow(
+                        color: Colors.black.withValues(
+                          alpha: isDark ? 0.10 : 0.04,
+                        ),
+                        spreadRadius: 1,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            // Tab labels (on top of the pill).
+            Row(
+              mainAxisSize: widget.mode == KasyTabsMode.fill
+                  ? MainAxisSize.max
+                  : MainAxisSize.min,
+              children: List.generate(widget.items.length, (i) {
+                final KasyTabItem item = widget.items[i];
+                final bool selected = i == widget.selectedIndex;
+                return _PrimaryTab(
+                  key: _keys[i],
+                  item: item,
+                  selected: selected,
+                  expand: widget.mode == KasyTabsMode.fill,
+                  onTap: item.enabled ? () => widget.onTabSelected(i) : null,
+                );
+              }),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // ── Secondary (underline indicator) ───────────────────────────────────────
+
+  Widget _buildSecondary(BuildContext context) {
+    final KasyColors c = context.colors;
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        // Full-width bottom divider.
+        Positioned(
+          left: 0,
+          right: 0,
+          bottom: 0,
+          child: DecoratedBox(
+            decoration: BoxDecoration(
+              color: c.outline.withValues(alpha: 0.2),
+            ),
+            child: const SizedBox(height: 1),
+          ),
+        ),
+        // Animated underline indicator.
+        if (_measured)
+          AnimatedPositioned(
+            duration: const Duration(milliseconds: 250),
+            curve: Curves.easeInOut,
+            left: _indicatorLeft,
+            bottom: 0,
+            width: _indicatorWidth,
+            height: 2,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: c.primary,
+                borderRadius: BorderRadius.circular(1),
+              ),
+            ),
+          ),
+        // Tab labels.
+        Row(
+          mainAxisSize: widget.mode == KasyTabsMode.fill
+              ? MainAxisSize.max
+              : MainAxisSize.min,
+          children: List.generate(widget.items.length, (i) {
+            final KasyTabItem item = widget.items[i];
+            final bool selected = i == widget.selectedIndex;
+            return _SecondaryTab(
+              key: _keys[i],
+              item: item,
+              selected: selected,
+              expand: widget.mode == KasyTabsMode.fill,
+              onTap: item.enabled ? () => widget.onTabSelected(i) : null,
+            );
+          }),
+        ),
+      ],
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Internal tab widgets
+// ─────────────────────────────────────────────────────────────────────────────
+
+class _PrimaryTab extends StatelessWidget {
+  const _PrimaryTab({
+    super.key,
+    required this.item,
+    required this.selected,
+    required this.expand,
+    required this.onTap,
+  });
+
+  final KasyTabItem item;
+  final bool selected;
+  final bool expand;
+  final VoidCallback? onTap;
+
+  Widget _tabContent(BuildContext context) {
+    final KasyColors c = context.colors;
+    final bool disabled = !item.enabled;
+
+    return GestureDetector(
+      onTap: onTap,
+      behavior: HitTestBehavior.opaque,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (item.icon != null) ...[
+              Opacity(
+                opacity: disabled ? 0.4 : 1.0,
+                child: Icon(
+                  item.icon,
+                  size: 16,
+                  color: selected ? c.onSurface : c.muted,
+                ),
+              ),
+              const SizedBox(width: 6),
+            ],
+            Opacity(
+              opacity: disabled ? 0.4 : 1.0,
+              child: Text(
+                item.label,
+                style: context.textTheme.labelLarge?.copyWith(
+                  color: selected ? c.onSurface : c.muted,
+                  fontWeight: selected ? FontWeight.w500 : FontWeight.w400,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget inner = _tabContent(context);
+    return expand ? Expanded(child: inner) : inner;
+  }
+}
+
+class _SecondaryTab extends StatelessWidget {
+  const _SecondaryTab({
+    super.key,
+    required this.item,
+    required this.selected,
+    required this.expand,
+    required this.onTap,
+  });
+
+  final KasyTabItem item;
+  final bool selected;
+  final bool expand;
+  final VoidCallback? onTap;
+
+  Widget _tabContent(BuildContext context) {
+    final KasyColors c = context.colors;
+    final bool disabled = !item.enabled;
+
+    return GestureDetector(
+      onTap: onTap,
+      behavior: HitTestBehavior.opaque,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (item.icon != null) ...[
+              Opacity(
+                opacity: disabled ? 0.4 : 1.0,
+                child: Icon(
+                  item.icon,
+                  size: 16,
+                  color: selected ? c.onSurface : c.muted,
+                ),
+              ),
+              const SizedBox(width: 6),
+            ],
+            Opacity(
+              opacity: disabled ? 0.4 : 1.0,
+              child: Text(
+                item.label,
+                style: context.textTheme.labelLarge?.copyWith(
+                  color: selected ? c.onSurface : c.muted,
+                  fontWeight: selected ? FontWeight.w600 : FontWeight.w400,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget inner = _tabContent(context);
+    return expand ? Expanded(child: inner) : inner;
+  }
+}

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

@@ -96,11 +96,29 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
           ),
           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(

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

@@ -1,7 +1,10 @@
+import 'dart:async';
+import 'dart:io' show Platform;
+
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:home_widget/home_widget.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/home_widgets/home_widget_service.dart';
-import 'package:kasy_kit/core/states/translations.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/features/subscription/repositories/subscription_repository.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
@@ -19,10 +22,11 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
   @override
   void build() {
     // Auto-refresh the widget whenever user state changes in a way that
-    // affects what it renders (login/logout, name, premium status). Without
-    // this, the widget would only update via the 15-min background task or
-    // a manual trigger — a fresh subscription would not reflect on the home
-    // screen until the next background tick.
+    // affects what it renders (login/logout, name, email, premium status).
+    // The initial render is triggered explicitly by HomeWidgetsManager.init()
+    // after setAppGroupId completes — putting it here would race with the
+    // app-group setup and the first saveWidgetData could land in the wrong
+    // UserDefaults suite.
     ref.listen(userStateNotifierProvider, (previous, next) {
       if (previous == null) return;
       if (_widgetSignature(previous.user) != _widgetSignature(next.user)) {
@@ -33,7 +37,7 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
 
   /// Snapshot of the user fields the widget reads. Used to skip the update
   /// when an unrelated field changes (e.g. lastUpdateDate refresh).
-  (String?, String?, bool) _widgetSignature(User user) {
+  (String?, String?, String?, bool) _widgetSignature(User user) {
     final isPro = switch (user) {
       AuthenticatedUserData(:final subscription) ||
       AnonymousUserData(:final subscription) =>
@@ -44,34 +48,62 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       AuthenticatedUserData(:final name) => name,
       _ => null,
     };
-    return (user.idOrNull, name, isPro);
+    final email = switch (user) {
+      AuthenticatedUserData(:final email) => email,
+      _ => null,
+    };
+    return (user.idOrNull, name, email, isPro);
   }
 
   @override
-  Future<void> update() async {
+  Future<void> update() => updateForLocale(LocaleSettings.currentLocale);
+
+  /// Same as [update] but renders against an explicit locale. Use this
+  /// from the language picker so the widget never falls one step behind:
+  /// `LocaleSettings.setLocale` propagates to `currentLocale` over a
+  /// frame boundary, and an [update] call scheduled at the same time
+  /// can race with it. Passing the locale removes the race.
+  Future<void> updateForLocale(AppLocale locale) async {
     final logger = Logger();
-    logger.i('🔄 Updating MyWidget Home Widget');
+    logger.i('🔄 Updating MyWidget Home Widget (${locale.languageCode})');
     final user = ref.read(userStateNotifierProvider).user;
-    final t = ref.read(translationsProvider);
+    final t = locale.translations;
+
+    // "Logged out" = no user id at all (post-logout in authRequired mode, or
+    // before any anonymous signup completes). In this state we show a
+    // come-back message and hide the plan tag — showing a plan would be
+    // misleading when there is no account behind it.
+    final isLoggedOut = user.idOrNull == null;
 
     final name = switch (user) {
       AuthenticatedUserData(:final name)
           when name != null && name.isNotEmpty =>
         name.split(' ').first,
+      // Fallback when the Firestore profile has no name yet: derive a
+      // display name from the email local-part (matches what the
+      // settings page shows).
+      AuthenticatedUserData(:final email) => email.split('@').first,
       _ => null,
     };
 
-    final isPro = await _resolveIsPro(user);
+    final isPro = !isLoggedOut && await _resolveIsPro(user);
 
     final greeting = _greeting(t);
-    final title = name == null
-        ? t.home_widget.title_default
-        : t.home_widget.title_with_name(name: name);
-    final planText = isPro ? t.home_widget.plan_pro : t.home_widget.plan_free;
+    final title = isLoggedOut
+        ? t.home_widget.title_logged_out
+        : name == null
+            ? t.home_widget.title_default
+            : t.home_widget.title_with_name(name: name);
+    // Empty planText is the contract used by the native widget to skip
+    // rendering the pill — see MyWidget.swift / MyWidget.kt.
+    final planText = isLoggedOut
+        ? ''
+        : (isPro ? t.home_widget.plan_pro : t.home_widget.plan_free);
+    final quote = t.home_widget.quote;
 
     logger.d(
       'Widget payload → greeting: "$greeting", title: "$title", '
-      'planText: "$planText", isPro: $isPro',
+      'planText: "$planText", isPro: $isPro, loggedOut: $isLoggedOut',
     );
 
     return updateWidget({
@@ -79,6 +111,7 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       'title': title,
       'planText': planText,
       'isPro': isPro.toString(),
+      'quote': quote,
     });
   }
 
@@ -98,9 +131,14 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     if (userId == null) return cached;
     try {
       final repo = ref.read(subscriptionRepositoryProvider);
-      await repo.initUser(userId);
-      final fresh = await repo.get(userId);
-      return fresh.isActive;
+      // 2s timeout — if RevenueCat/network is slow, fall back to the cached
+      // value so the widget renders promptly on first install. The next
+      // background tick (or any user-state change) will reconcile later.
+      return await Future(() async {
+        await repo.initUser(userId);
+        final fresh = await repo.get(userId);
+        return fresh.isActive;
+      }).timeout(const Duration(seconds: 2), onTimeout: () => cached);
     } catch (e) {
       Logger().w('Widget could not refresh subscription: $e (using cached)');
       return cached;
@@ -112,6 +150,22 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     await HomeWidget.saveWidgetData<String>('title', data['title'] ?? '');
     await HomeWidget.saveWidgetData<String>('planText', data['planText'] ?? '');
     await HomeWidget.saveWidgetData<String>('isPro', data['isPro'] ?? 'false');
+    await HomeWidget.saveWidgetData<String>('quote', data['quote'] ?? '');
+
+    // On Android, saveWidgetData writes via SharedPreferences.apply() which
+    // is asynchronous. Glance's HomeWidgetGlanceStateDefinition reads from
+    // the same prefs, but a tight saveWidgetData→updateWidget sequence can
+    // race the apply() flush — Glance recomposes with the previous values
+    // (most visible right after a locale change). Fire two updates spaced
+    // out by 400ms each so even slow devices catch the new state.
+    if (!kIsWeb && Platform.isAndroid) {
+      await Future<void>.delayed(const Duration(milliseconds: 400));
+      await HomeWidget.updateWidget(
+        name: _androidWidgetName,
+        iOSName: _iosWidgetName,
+      );
+      await Future<void>.delayed(const Duration(milliseconds: 400));
+    }
 
     await HomeWidget.updateWidget(
       name: _androidWidgetName,

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

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:background_fetch/background_fetch.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -8,14 +10,7 @@ import 'package:kasy_kit/core/initializer/onstart_service.dart';
 import 'package:logger/logger.dart';
 
 final homeWidgetsManagerProvider = Provider<HomeWidgetsManager>(
-  (ref) {
-    // Force-build the widget service at app startup so its user-state
-    // listener attaches and the widget auto-refreshes when subscription
-    // status or other relevant fields change. Without this read, the
-    // listener would only attach on first manual update.
-    ref.read(myWidgetHomeWidgetProvider.notifier);
-    return HomeWidgetsManager();
-  },
+  (ref) => HomeWidgetsManager(ref),
 );
 
 const String appGroupId = 'group.com.aicrus.firebase.kit';
@@ -26,12 +21,31 @@ const String appGroupId = 'group.com.aicrus.firebase.kit';
 /// will be used to initialize the home widgets and set the app group id
 /// Register the background task for the home widgets
 class HomeWidgetsManager implements OnStartService {
+  HomeWidgetsManager(this._ref);
+
+  final Ref _ref;
+
   @override
   Future<void> init() async {
     if (kIsWeb) return;
     try {
+      // Must be set BEFORE any saveWidgetData call, otherwise the data lands
+      // in the default UserDefaults suite and the native widget extension
+      // (which reads from the app group) sees nothing.
       await HomeWidget.setAppGroupId(appGroupId);
 
+      // Read the widget notifier so its user-state listener attaches —
+      // future state changes (login/logout, subscription) auto-refresh
+      // the widget without waiting for the 15-min background tick.
+      final myWidget = _ref.read(myWidgetHomeWidgetProvider.notifier);
+      // Push initial data so the widget renders something on first install
+      // instead of staying blank until the background task fires.
+      // Fire-and-forget: we do NOT await here because update() may do a
+      // network call (RevenueCat) that could stall app startup and even
+      // prevent BackgroundFetch from being configured. setAppGroupId has
+      // already completed, so it is safe to fire it off now.
+      unawaited(myWidget.update());
+
       final status = await BackgroundFetch.configure(
         BackgroundFetchConfig(
           minimumFetchInterval: 15,