kasy-cli 1.32.0 → 1.35.0

package/templates/firebase/functions/src/core/data/entities/user_entity.ts

@@ -7,6 +7,12 @@ export interface UserEntityData {
     creation_date: Timestamp;
     last_update_date: Timestamp;
     locale?: string;
+    /**
+     * Set to true once the one-time welcome notification has been sent for this
+     * account. Guards against re-sending it when a device is re-registered after
+     * a logout/login cycle (which otherwise looks like a brand-new first device).
+     */
+    welcome_sent?: boolean;
 }
 
 export type NewUserEntityData = Omit<UserEntityData, "id">;
@@ -20,7 +26,8 @@ export class UserEntity {
     email,
     creation_date,
     last_update_date,
-    locale
+    locale,
+    welcome_sent
   }: UserEntityData
   ) {
     this.id = id;
@@ -29,6 +36,7 @@ export class UserEntity {
     this.creation_date = creation_date;
     this.last_update_date = last_update_date;
     this.locale = locale;
+    this.welcome_sent = welcome_sent;
   }
 
   static fromData(data: UserEntityData): UserEntity {

package/templates/firebase/functions/src/core/data/repositories/user_repository.ts

@@ -46,6 +46,33 @@ export class UserRepository {
     });
   }
 
+  /**
+   * Atomically claims the one-time welcome for a user.
+   *
+   * Returns true for exactly ONE caller per account — the one that should send
+   * the welcome notification — and false for every later call (e.g. a device
+   * re-registered after a logout/login cycle, or a second device registering at
+   * the same time). The flag flip and the read happen inside a transaction, so
+   * two concurrent device registrations can never both send the welcome.
+   */
+  async claimWelcome(userId: string): Promise<boolean> {
+    const ref = this.db.collection("users").doc(userId);
+    return this.db.runTransaction(async (tx) => {
+      const snapshot = await tx.get(ref);
+      if (!snapshot.exists) {
+        return false;
+      }
+      if (snapshot.get("welcome_sent") === true) {
+        return false;
+      }
+      tx.update(ref, {
+        "welcome_sent": true,
+        "last_update_date": Timestamp.now(),
+      });
+      return true;
+    });
+  }
+
   async list({
     limit = 100,
     startAfter,

package/templates/firebase/functions/src/subscriptions/models/subscriptions.ts

@@ -22,6 +22,7 @@ export interface SubscriptionData {
   creationDate: Timestamp;
   lastUpdate: Timestamp;
   expirationDate?: Timestamp;
+  trialEnd?: Timestamp;
   store: Stores;
   productId: string;
   // Denormalized copy of the subscriber's email. Firestore is a non-relational
@@ -41,6 +42,7 @@ export class Subscription {
       creationDate,
       lastUpdate,
       expirationDate,
+      trialEnd,
       store,
       productId,
       email,
@@ -52,6 +54,7 @@ export class Subscription {
     this.creationDate = creationDate;
     this.lastUpdate = lastUpdate;
     this.expirationDate = expirationDate;
+    this.trialEnd = trialEnd;
     this.store = store;
     this.productId = productId;
     this.email = email;

package/templates/firebase/functions/src/subscriptions/stripe_functions.ts

@@ -275,6 +275,9 @@ async function upsertFromStripeSubscription(sub: Stripe.Subscription): Promise<v
   const expiration = periodEnd
     ? Timestamp.fromMillis(periodEnd * 1000)
     : undefined;
+  const trialEnd = sub.trial_end
+    ? Timestamp.fromMillis(sub.trial_end * 1000)
+    : undefined;
 
   const subscription = new Subscription(
     {
@@ -283,6 +286,7 @@ async function upsertFromStripeSubscription(sub: Stripe.Subscription): Promise<v
       creationDate: existing?.creationDate ?? now,
       lastUpdate: now,
       expirationDate: expiration,
+      trialEnd,
       store: Stores.STRIPE,
       productId: priceId,
       email: user.email,

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

@@ -21,6 +21,7 @@ export 'kasy_date_picker.dart';
 export 'kasy_dialog.dart';
 export 'kasy_image_viewer.dart';
 export 'kasy_otp_verification_bottom_sheet.dart';
+export 'kasy_screen.dart';
 export 'kasy_sidebar.dart';
 export 'kasy_skeleton.dart';
 export 'kasy_status_tag.dart';

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

@@ -53,7 +53,6 @@ class KasyAlert extends StatelessWidget {
     final bool hasMessage = message != null && message!.trim().isNotEmpty;
     final TextStyle titleStyle =
         context.textTheme.titleMedium?.copyWith(
-          fontWeight: FontWeight.w600,
           color: emphasizeTitleWithTone
               ? palette.accent
               : context.colors.onSurface,

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

@@ -186,7 +186,10 @@ class KasyTopScrollFade extends StatelessWidget {
     // On web topInset = 0; enforce a 6 px minimum so the strip still exists.
     final double solidHeight = topInset < 6 ? 6.0 : topInset;
     final double totalHeight = solidHeight + _contentFade;
-    final Color base = context.colors.surface;
+    // The page background (NOT the bar's `surface`): when the bar hides on
+    // scroll, content must melt into the page color, not into a floating sliver
+    // of the bar's tint at the top.
+    final Color base = context.colors.background;
 
     // Same gradient the grid cards use for their caption scrim — strong at the
     // top, melting gradually to fully transparent at the bottom.
@@ -238,6 +241,12 @@ class KasyAppBar extends StatelessWidget {
   /// or wrap a custom 44×44 chrome control with [KasyAppBarChromeTap] for the
   /// same tap target semantics as the built-in orbs.
   final Widget? trailing;
+
+  /// Replaces the default leading control (back button / spacer) — e.g. a menu
+  /// orb that opens a [KasySidebar] drawer. Use [KasyChromeOrbIconButton] so it
+  /// matches the trailing orbs' size and tap target.
+  final Widget? leading;
+
   final bool useSafeArea;
 
   /// When set, called instead of [ThemeProvider.toggle] for the theme orb
@@ -266,6 +275,7 @@ class KasyAppBar extends StatelessWidget {
     this.style = KasyAppBarStyle.subpage,
     this.onBack,
     this.trailing,
+    this.leading,
     this.useSafeArea = true,
     this.onThemeToggle,
     this.toolbarHeight,
@@ -285,26 +295,30 @@ class KasyAppBar extends StatelessWidget {
 
     final double rowHeight =
         toolbarHeight ?? kasyAppBarToolbarRowHeightOf(context);
-    final Widget leading = switch (style) {
-      KasyAppBarStyle.rootTab => SizedBox(
-        width: 44,
-        height: rowHeight,
-      ),
-      _ => KasyChromeOrbIconButton(
-        icon: KasyIcons.arrowBackIos,
-        iconSize: KasyIconSize.md,
-        foregroundColor: orbFg,
-        fillColor: orbFill,
-        onPressed: handleBack,
-        tooltip: MaterialLocalizations.of(context).backButtonTooltip,
-      ),
-    };
+    final Widget leadingWidget = leading ??
+        switch (style) {
+          KasyAppBarStyle.rootTab => SizedBox(
+            width: 44,
+            height: rowHeight,
+          ),
+          _ => KasyChromeOrbIconButton(
+            icon: KasyIcons.arrowBackIos,
+            iconSize: KasyIconSize.md,
+            foregroundColor: orbFg,
+            fillColor: orbFill,
+            onPressed: handleBack,
+            tooltip: MaterialLocalizations.of(context).backButtonTooltip,
+          ),
+        };
 
     final TextStyle? titleRef =
         context.textTheme.headlineSmall ?? context.textTheme.titleLarge;
     final TextStyle? titleStyle = titleRef?.copyWith(
       fontSize: (titleRef.fontSize ?? 24) * kasyAppBarTitleFontScale,
-      fontWeight: FontWeight.w900,
+      // w700 (not w900): a clean page-title weight that matches the Home /
+      // sidebar scale. w900 read as a heavy "black" that fought the rest of
+      // the chrome.
+      fontWeight: FontWeight.w700,
       letterSpacing: -0.35,
       color: context.colors.onBackground,
     );
@@ -323,7 +337,7 @@ class KasyAppBar extends StatelessWidget {
           children: [
             Row(
               children: [
-                leading,
+                leadingWidget,
                 const Spacer(),
                 _buildTrailing(context, orbFg, orbFill),
               ],
@@ -483,6 +497,10 @@ class KasyOverlayScaffold extends StatelessWidget {
     Widget scrollView = CustomScrollView(
       controller: scrollController,
       physics: effectivePhysics,
+      // Dragging the form means the user is done with the focused field and
+      // wants to see what's below, so dismiss the keyboard. Chat views opt out
+      // of this wrapper on purpose (there scrolling means reading, not typing).
+      keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
       slivers: kasyOverlayPaddedSlivers(
         context,
         contentPadding: contentPadding,

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

@@ -105,7 +105,6 @@ class KasyBottomSheet extends StatelessWidget {
                     title!,
                     textAlign: centered ? TextAlign.center : TextAlign.start,
                     style: context.textTheme.titleLarge?.copyWith(
-                      fontWeight: FontWeight.w600,
                       color: context.colors.onSurface,
                     ),
                   ),

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

@@ -1457,7 +1457,6 @@ class _CalendarPanelState extends State<_CalendarPanel> {
             context.textTheme.labelLarge?.copyWith(
           color: context.colors.onSurface,
           fontWeight: FontWeight.w700,
-          fontSize: 14,
         );
 
         return Column(
@@ -1623,7 +1622,6 @@ class _MonthGrid extends StatelessWidget {
               style: context.textTheme.labelLarge?.copyWith(
                 color: context.colors.onSurface,
                 fontWeight: FontWeight.w700,
-                fontSize: 14,
               ),
             ),
           ),
@@ -1688,7 +1686,6 @@ class _CalendarNavRow extends StatelessWidget {
             style: context.textTheme.labelLarge?.copyWith(
               color: c.onSurface,
               fontWeight: FontWeight.w700,
-              fontSize: 14,
             ),
           ),
           const SizedBox(width: 4),
@@ -1903,7 +1900,6 @@ class _YearPickerContentState extends State<_YearPickerContent> {
                                 ? const Color(0xFFFCFCFC)
                                 : c.onSurface,
                             fontWeight: FontWeight.w600,
-                            fontSize: 14,
                           ),
                         ),
                       ),
@@ -2125,7 +2121,6 @@ class _DayCell extends StatelessWidget {
           style: context.textTheme.labelLarge?.copyWith(
             color: textColor,
             fontWeight: FontWeight.w600,
-            fontSize: 14,
             height: 1.43,
           ),
         ),

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

@@ -152,7 +152,6 @@ class KasyDialog extends StatelessWidget {
 
     final TextStyle titleStyle =
         context.textTheme.titleLarge?.copyWith(
-          fontWeight: FontWeight.w600,
           color: context.colors.onSurface,
         ) ??
         TextStyle(fontWeight: FontWeight.w600, fontSize: 20, color: context.colors.onSurface);

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

@@ -111,7 +111,7 @@ class _KasyOtpVerificationBottomSheetState
               Text(
                 '+1 234 567 8900',
                 style: sheetContext.textTheme.titleLarge?.copyWith(
-                  fontWeight: FontWeight.w800,
+                  fontWeight: FontWeight.w700,
                   color: sheetContext.colors.onSurface,
                 ),
                 textAlign: TextAlign.center,

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

@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:kasy_kit/components/kasy_card.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/core/widgets/page_background.dart';
+
+/// Canonical screen scaffold. A new page that uses it inherits the internal
+/// screen contract for free: the page background, a centred content column
+/// capped at [maxContentWidth], the page gutter, scroll handling, and
+/// (optionally) a [KasyCard] wrapper — all from design-system tokens.
+///
+/// Opt-in by design: it is a thin convenience over [Scaffold] (it forwards the
+/// same `appBar`, `floatingActionButton`, `bottomNavigationBar` slots), not a
+/// cage. Screens that need bespoke chrome can keep using [Scaffold] directly —
+/// nothing here is forced, and any value is overridable.
+///
+/// ```dart
+/// KasyScreen(
+///   appBar: KasyAppBar.root(title: 'Settings'),
+///   card: true,
+///   child: Column(children: [...]),
+/// )
+/// ```
+class KasyScreen extends StatelessWidget {
+  const KasyScreen({
+    super.key,
+    required this.child,
+    this.appBar,
+    this.scrollable = true,
+    this.maxContentWidth = 600,
+    this.padding,
+    this.card = false,
+    this.backgroundColor,
+    this.resizeToAvoidBottomInset,
+    this.floatingActionButton,
+    this.bottomNavigationBar,
+  });
+
+  /// Page content.
+  final Widget child;
+
+  /// Optional top bar. Same slot as [Scaffold.appBar]; pass any
+  /// [PreferredSizeWidget].
+  final PreferredSizeWidget? appBar;
+
+  /// Wrap the content in a scroll view (default true). Set false for screens
+  /// that manage their own scrolling (e.g. a full-bleed list).
+  final bool scrollable;
+
+  /// Max width of the content column on wide screens. The internal-screen
+  /// contract is ~600; content is centred within the available width so it does
+  /// not stretch edge-to-edge on web/desktop.
+  final double maxContentWidth;
+
+  /// Padding around the content. Defaults to the horizontal page gutter plus
+  /// vertical breathing room.
+  final EdgeInsetsGeometry? padding;
+
+  /// Wrap the content in an elevated [KasyCard] (radius 16), matching the Home
+  /// reference look.
+  final bool card;
+
+  /// Page background. Defaults to the theme background token.
+  final Color? backgroundColor;
+
+  /// Forwarded to [Scaffold.resizeToAvoidBottomInset].
+  final bool? resizeToAvoidBottomInset;
+
+  /// Forwarded to [Scaffold.floatingActionButton].
+  final Widget? floatingActionButton;
+
+  /// Forwarded to [Scaffold.bottomNavigationBar].
+  final Widget? bottomNavigationBar;
+
+  @override
+  Widget build(BuildContext context) {
+    final EdgeInsetsGeometry resolvedPadding = padding ??
+        const EdgeInsets.symmetric(
+          horizontal: KasySpacing.pageHorizontalGutter,
+          vertical: KasySpacing.lg,
+        );
+
+    Widget content = ConstrainedBox(
+      constraints: BoxConstraints(maxWidth: maxContentWidth),
+      child: card ? KasyCard(child: child) : child,
+    );
+
+    content = Align(
+      alignment: Alignment.topCenter,
+      child: Padding(padding: resolvedPadding, child: content),
+    );
+
+    if (scrollable) {
+      content = SingleChildScrollView(
+        physics: const ClampingScrollPhysics(),
+        keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+        child: content,
+      );
+    }
+
+    return Scaffold(
+      backgroundColor: backgroundColor ?? context.colors.background,
+      resizeToAvoidBottomInset: resizeToAvoidBottomInset,
+      appBar: appBar,
+      floatingActionButton: floatingActionButton,
+      bottomNavigationBar: bottomNavigationBar,
+      body: Background(
+        bgColor: backgroundColor,
+        // top:false when an app bar is present — Scaffold already insets the
+        // body below it, so SafeArea only needs to guard the bottom/sides.
+        child: SafeArea(top: appBar == null, child: content),
+      ),
+    );
+  }
+}