kasy-cli 1.31.7 → 1.31.9

package/lib/commands/new.js

@@ -1733,11 +1733,6 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   // generation step once choices are made. The success card at the end shows
   // the full summary. Cancel any time with Ctrl+C.
 
-  // Windows: disable native assets before the generator runs pub get / builds,
-  // so a username with a space (C:\Users\John Silva) doesn't break the
-  // objective_c hook compile. No-op elsewhere, idempotent, best-effort.
-  require('../utils/env-tools').disableNativeAssetsWindows();
-
   // ── Generate ────────────────────────────────────────────────────────────
   // Quick: single rolling line that mutates message. Advanced: stack each step.
   const stepper = ui.makeQuickStepper({ color: paintLime });

package/lib/commands/reset.js

@@ -7,7 +7,7 @@ const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader } = require('../utils/brand');
 const { readBundleId, readPackageName } = require('../utils/mobile-identity');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
-const { spawnSyncFlutter, disableNativeAssetsWindows } = require('../utils/env-tools');
+const { spawnSyncFlutter } = require('../utils/env-tools');
 
 function runCmd(cmd, args) {
   const res = spawnSync(cmd, args, { encoding: 'utf8' });
@@ -264,10 +264,6 @@ async function runReset(directory, options = {}) {
     throw new Error(t('reset.error.notFlutterProject'));
   }
 
-  // Windows: disable native assets before the reinstall rebuild so a username
-  // with a space doesn't break the objective_c hook compile. No-op elsewhere.
-  disableNativeAssetsWindows();
-
   printCompactHeader(t);
   ui.intro(t('reset.title'));
 

package/lib/commands/run.js

@@ -5,7 +5,7 @@ const ui = require('../utils/ui');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader, paintLime } = require('../utils/brand');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
-const { spawnSyncFlutter, disableNativeAssetsWindows } = require('../utils/env-tools');
+const { spawnSyncFlutter } = require('../utils/env-tools');
 
 function listFlutterDevices(projectDir) {
   // Shared flutter spawner: exposes a freshly-installed SDK on PATH (the terminal
@@ -249,11 +249,6 @@ async function runRun(directory, options = {}) {
     throw new Error(t('run.error.notFlutterProject'));
   }
 
-  // Windows: turn off native assets before building so a username with a space
-  // (C:\Users\John Silva) doesn't break the objective_c hook compile. No-op on
-  // macOS/Linux, idempotent, and best-effort — see disableNativeAssetsWindows.
-  disableNativeAssetsWindows();
-
   // Resolve device flag. If none of the platform shortcuts or -d is set,
   // ask the user when more than one device is available — `flutter run`
   // bails out with "More than one device connected" otherwise.

package/lib/scaffold/backends/api/pubspec.yaml.tpl

@@ -58,6 +58,13 @@ dependencies:
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0
   path_provider: ^2.1.5
+  # Pin the Apple impl of path_provider below 2.6.0/2.5.0. Those versions pull in
+  # objective_c via "native assets", whose build hook is unquoted and breaks every
+  # build on Windows when the username has a space (C:\Users\John Silva) — even a
+  # Chrome/web run, where the Apple-only hook is dead weight. 2.5.1 is the last
+  # release without objective_c (added in 2.5.0, reverted in 2.5.1, re-added in
+  # 2.6.0). Drop this pin once the upstream web-target regression is fixed.
+  path_provider_foundation: 2.5.1
   permission_handler: ^12.0.1
   provider: ^6.1.0
   pub_semver: ^2.2.0

package/lib/scaffold/backends/supabase/deploy.js

@@ -570,11 +570,25 @@ async function deployFunctions(projectDir, functionNames = []) {
   }
   if (toDeploy.length === 0) return { ok: true, skipped: true };
 
+  // Functions deployed WITHOUT the platform JWT gate (--no-verify-jwt). Two cases:
+  //   1. Webhooks (Stripe, RevenueCat, push) — called server-to-server, no user JWT.
+  //   2. Browser-invoked functions that authenticate THEMSELVES inside the handler:
+  //      delete-user-account (checks the token), admin-list-users (token + admin
+  //      role), stripe-list-prices (public prices), ai-chat (checks the token).
+  //      With the platform gate ON, the browser's CORS preflight (an OPTIONS with
+  //      no Authorization header) gets rejected before our CORS handler runs, so the
+  //      web app sees "Failed to fetch". Letting the function do its own auth makes
+  //      the preflight pass while staying secure (the handler still 401s anon calls).
+  const NO_VERIFY_JWT = new Set([
+    'ai-chat', 'revenuecat-webhook', 'send-push-notification', 'stripe-webhook',
+    'delete-user-account', 'admin-list-users', 'stripe-list-prices',
+  ]);
+
   const steps = [];
   for (const name of toDeploy) {
     const fnPath = path.join(functionsDir, name);
     if (!(await fs.pathExists(fnPath))) continue;
-    const noVerifyJwt = (name === 'ai-chat' || name === 'revenuecat-webhook' || name === 'send-push-notification' || name === 'stripe-webhook') ? ' --no-verify-jwt' : '';
+    const noVerifyJwt = NO_VERIFY_JWT.has(name) ? ' --no-verify-jwt' : '';
     const result = await run(`supabase functions deploy ${name}${noVerifyJwt}`, projectDir);
     steps.push({ name: `deploy ${name}`, ok: result.ok, error: result.error });
   }

package/lib/scaffold/backends/supabase/pubspec.yaml.tpl

@@ -59,6 +59,13 @@ dependencies:
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0
   path_provider: ^2.1.5
+  # Pin the Apple impl of path_provider below 2.6.0/2.5.0. Those versions pull in
+  # objective_c via "native assets", whose build hook is unquoted and breaks every
+  # build on Windows when the username has a space (C:\Users\John Silva) — even a
+  # Chrome/web run, where the Apple-only hook is dead weight. 2.5.1 is the last
+  # release without objective_c (added in 2.5.0, reverted in 2.5.1, re-added in
+  # 2.6.0). Drop this pin once the upstream web-target regression is fixed.
+  path_provider_foundation: 2.5.1
   permission_handler: ^12.0.1
   provider: ^6.1.0
   pub_semver: ^2.2.0

package/lib/scaffold/shared/generator-utils.js

@@ -315,6 +315,21 @@ async function writeRouter(projectDir, modules, packageName, defaultPaywall = 'b
   const withAnalytics           = modules.includes('analytics');
   const withWidget              = modules.includes('widget');
 
+  // The engine already copied the kit's router.dart here (with the package name
+  // rewritten). That kit router is the SOURCE OF TRUTH: backend-agnostic, feature
+  // -flag aware (reads core/config/features.dart), and it carries the real
+  // navigation — the custom kasyTransitionPage transitions, the /admin console and
+  // every route. When all router-relevant features are present (the default Quick
+  // setup) we KEEP it verbatim instead of rebuilding a hand-written copy that
+  // drifts from the kit. We only fall through to the trimmed builder below when a
+  // feature was removed, because its source files (and deps) are gone and its
+  // imports must go with them. See PUBLISHING.md ("propagação para os 3 backends").
+  const routerPath = path.join(projectDir, 'lib', 'router.dart');
+  const ROUTER_FEATURES = ['onboarding', 'revenuecat', 'feedback', 'local_reminders', 'widget', 'analytics'];
+  if (ROUTER_FEATURES.every((m) => modules.includes(m)) && (await fs.pathExists(routerPath))) {
+    return;
+  }
+
   const fallback = withOnboarding ? '/onboarding' : '/signin';
 
   const lines = [];
@@ -856,6 +871,40 @@ async function writeMainDart(projectDir, backend, modules, packageName, options
   // makes Firebase.initializeApp safe to call in all of them.
   const withFirebase = true;
 
+  // Derive main.dart FROM the kit (the source of truth) whenever every
+  // main-relevant feature is present (the default Quick setup). The engine already
+  // copied the kit's main.dart here with the package name rewritten; that file is a
+  // complete Firebase main — the custom WebViewportScale proportion, the web device
+  // preview, and every Initializer service. For Firebase and API backends it is
+  // already exactly right, so we keep it verbatim. For Supabase we splice in
+  // Supabase.initialize and keep everything else, so kit improvements still
+  // propagate to all three backends. We only fall through to the hand-built builder
+  // below when a feature was removed (its service/import must be trimmed) or, as a
+  // safety net, when the kit main changed shape and the Supabase splice can't find
+  // its anchors. See PUBLISHING.md ("propagação para os 3 backends").
+  const mainPath = path.join(projectDir, 'lib', 'main.dart');
+  const MAIN_FEATURES = ['sentry', 'widget', 'revenuecat'];
+  if (MAIN_FEATURES.every((m) => modules.includes(m)) && (await fs.pathExists(mainPath))) {
+    if (backend !== 'supabase') {
+      // Firebase & API: the copied kit main is already correct.
+      return;
+    }
+    let src = await fs.readFile(mainPath, 'utf8');
+    src = src.replace(
+      `import 'package:device_preview/device_preview.dart';\n`,
+      `import 'package:device_preview/device_preview.dart';\nimport 'package:supabase_flutter/supabase_flutter.dart';\n`,
+    );
+    src = src.replace(
+      `  // initialize firebase app for notifications\n`,
+      `  // initialize Supabase\n  await Supabase.initialize(\n    url: AppEnv.backendUrl,\n    publishableKey: AppEnv.supabaseToken,\n  );\n\n  // initialize firebase app for notifications\n`,
+    );
+    if (src.includes('Supabase.initialize') && src.includes('supabase_flutter')) {
+      await fs.writeFile(mainPath, src, 'utf8');
+      return;
+    }
+    // Anchors not found (kit main changed) — fall back to the hand-built main below.
+  }
+
   const lines = [];
 
   // ── Imports ────────────────────────────────────────────────────────────────
@@ -886,6 +935,7 @@ async function writeMainDart(projectDir, backend, modules, packageName, options
   lines.push(`import 'package:${pkg}/core/dev_inspector/dev_inspector.dart';`);
   lines.push(`import 'package:${pkg}/core/theme/theme.dart';`);
   lines.push(`import 'package:${pkg}/core/web_device_preview/web_device_preview.dart';`);
+  lines.push(`import 'package:${pkg}/core/web_viewport_scale.dart';`);
   lines.push(`import 'package:${pkg}/environments.dart';`);
   if (withFirebase) {
     lines.push(`import 'package:${pkg}/firebase_options_dev.dart' as firebase_dev;`);
@@ -1106,7 +1156,9 @@ async function writeMainDart(projectDir, backend, modules, packageName, options
   lines.push(`                    analyticsApiProvider,`);
   lines.push(`                    facebookEventApiProvider,`);
   lines.push(`                  ],`);
-  lines.push(`                  onReady: DevicePreview.appBuilder(context, child),`);
+  lines.push(`                  onReady: WebViewportScale.wrap(`);
+  lines.push(`                    DevicePreview.appBuilder(context, child),`);
+  lines.push(`                  ),`);
   lines.push(`                  onError: (_, error) => InitializationErrorPage(error: error),`);
   lines.push(`                  onLoading: Scaffold(`);
   lines.push(`                    body: Center(`);

package/lib/utils/env-tools.js

@@ -201,47 +201,6 @@ function flutterSpawn(spawnFn, args, options = {}) {
 const spawnFlutter = (args, options) => flutterSpawn(spawn, args, options);
 const spawnSyncFlutter = (args, options) => flutterSpawn(spawnSync, args, options);
 
-// Run the native-assets disable at most once per process — the setting is
-// persisted in Flutter's global config, so re-running it every command would
-// just add ~1s of cold flutter startup for nothing.
-let nativeAssetsHandled = false;
-
-/**
- * Disable Flutter "native assets" compilation — Windows only.
- *
- * Why: `path_provider_foundation` (the Apple impl of `path_provider`, pulled in
- * transitively by almost everything — google_fonts, home_widget,
- * flutter_secure_storage…) ships a native-assets build hook for the
- * `objective_c` package. On Windows, Dart's hook runner builds that compile
- * command WITHOUT quoting the SDK/project path, so a username containing a
- * SPACE (e.g. `C:\Users\John Silva`) breaks it — the shell reads only up to the
- * space: `'C:\Users\John' is not recognized as a command`. It even fires for a
- * Chrome/web run, where the Apple-only hook is pure dead weight.
- *
- * The hook is irrelevant on Windows (no iOS/macOS builds ever happen there), so
- * turning native assets off removes the broken step at zero cost. `flutter
- * config` is per-machine and global, so this never touches a Mac's iOS build.
- *
- * Idempotent and best-effort: it must never block `kasy run` / `kasy new`.
- *
- * @returns {{ ok: boolean, skipped?: boolean, error?: string }}
- */
-function disableNativeAssetsWindows() {
-  if (!isWindows) return { ok: false, skipped: true };
-  if (nativeAssetsHandled) return { ok: true, skipped: true };
-  nativeAssetsHandled = true;
-  try {
-    const r = spawnSyncFlutter(['config', '--no-enable-native-assets'], {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      encoding: 'utf8',
-      timeout: 120_000,
-    });
-    return { ok: r.status === 0 };
-  } catch (e) {
-    return { ok: false, error: e.message };
-  }
-}
-
 module.exports = {
   isWindows,
   homeDir,
@@ -251,5 +210,4 @@ module.exports = {
   augmentedEnv,
   spawnFlutter,
   spawnSyncFlutter,
-  disableNativeAssetsWindows,
 };

package/lib/utils/flutter-install.js

@@ -106,14 +106,6 @@ if ($LASTEXITCODE -ne 0) {
   throw 'Flutter was installed but its first run failed (Dart SDK bootstrap). Check your internet connection and run this again.'
 }
 
-# 3b. Disable native assets. path_provider_foundation (Apple impl of
-#     path_provider) ships an objective_c native-assets build hook whose compile
-#     command isn't quoted, so a username with a SPACE (C:\\Users\\John Silva)
-#     breaks every build — even Chrome/web, where the Apple hook is dead weight.
-#     No iOS/macOS builds happen on Windows, so turning it off is free. Best
-#     effort: never fail the install over it.
-& (Join-Path $bin 'flutter.bat') config --no-enable-native-assets 2>&1 | Out-Null
-
 # 4. Persist flutter\\bin on the User PATH so every future terminal finds it.
 $userPath = [Environment]::GetEnvironmentVariable('Path', 'User')
 if (-not $userPath) { $userPath = '' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.31.7",
+  "version": "1.31.9",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js",
+    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js && node test/generated-matches-kit.test.js",
     "start": "node ./bin/kasy.js",
     "setup": "node ./bin/kasy.js setup",
     "doctor": "node ./bin/kasy.js doctor",

package/templates/firebase/codemagic.yaml

@@ -101,16 +101,14 @@ workflows:
     integrations:
       app_store_connect: codemagic # <-- Name of your App Store Connect integration (Codemagic UI)
     environment:
-      groups:
-          - appstore_credentials # <-- Group holding APP_ID (and any app keys)
       ios_signing:
         distribution_type: app_store
         bundle_identifier: com.aicrus.firebase.kit # <-- Your iOS bundle identifier
-      vars:
-        # APP_ID = the numeric App Store Connect app id. `kasy codemagic release`
-        # sends it automatically (read from APP_STORE_ID in your .env); or define
-        # it in the appstore_credentials group.
-        APP_ID: $APP_ID
+      # APP_ID (numeric App Store Connect id) and the app keys arrive as
+      # environment variables: `kasy codemagic release` sends them from your .env.
+      # No variable group is required for iOS (App Store auth uses the integration
+      # above). For dashboard/push-triggered builds, add the keys as environment
+      # variables in the Codemagic app settings and a `groups:` entry here.
       flutter: stable
       xcode: latest # <-- set to specific version e.g. 15.0 to avoid unexpected updates.
       cocoapods: default

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

@@ -17,22 +17,33 @@ const double _kFloatingTopGap = 6;
 /// 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;
+/// Corner radius of the floating pill (HeroUI `rounded-2.5xl`).
+const double _kFloatingRadius = KasyRadius.rounded2_5xl;
 
 /// Bar (pill) inner height — the row of tab items.
-const double _kBarHeight = 72;
+const double _kBarHeight = 60;
 
 /// Tab icon size.
-const double _kNavIconSize = 24;
+const double _kNavIconSize = 22;
 
 /// Gap between a tab's icon and its label.
 const double _kNavLabelGap = 3;
 
+/// Tab label size. Fixed (not derived from the text theme) so every label —
+/// "Início" and "Configurações" alike — reads at the exact same size and the
+/// longer ones don't get clipped with an ellipsis on narrow phones.
+const double _kNavLabelSize = 11;
+
 /// Selection color-fade timing (muted ↔ primary highlight).
 const Duration _kSelectDuration = Duration(milliseconds: 200);
 const Curve _kSelectCurve = Curves.easeOut;
 
+/// Subtle "pop" the icon does when its tab becomes active: a gentle scale-up
+/// with a slight overshoot that settles — modern, not bouncy.
+const Duration _kPopDuration = Duration(milliseconds: 260);
+const Curve _kPopCurve = Curves.easeOutBack;
+const double _kPopScale = 0.12;
+
 /// [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
@@ -114,9 +125,16 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
       Radius.circular(_kFloatingRadius),
     );
 
+    // In dark mode the cards use `surface`, so a `surface` bar melts into them.
+    // A one-step-lighter surface lifts the floating bar above the content and
+    // reads as elevated. In light mode the white `surface` already pops against
+    // the grey canvas, so it stays as is.
+    final Color pillColor =
+        context.isDark ? colors.surfaceSecondary : colors.surface;
+
     final Widget pill = Container(
       decoration: BoxDecoration(
-        color: colors.surface,
+        color: pillColor,
         borderRadius: radius,
         // Single, very light shadow — just enough to lift the pill off the canvas.
         boxShadow: [
@@ -227,13 +245,29 @@ class _KasyNavItem extends StatelessWidget {
               return Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  _icon(context, color),
+                  // Gentle scale pop when the tab becomes active.
+                  TweenAnimationBuilder<double>(
+                    tween: Tween<double>(end: selected ? 1.0 : 0.0),
+                    duration: _kPopDuration,
+                    curve: _kPopCurve,
+                    builder: (context, p, child) => Transform.scale(
+                      scale: 1 + _kPopScale * p,
+                      child: child,
+                    ),
+                    child: _icon(context, color),
+                  ),
                   const SizedBox(height: _kNavLabelGap),
                   Text(
                     label,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
-                    style: labelBase.copyWith(color: color),
+                    style: labelBase.copyWith(
+                      color: color,
+                      fontSize: _kNavLabelSize,
+                      height: 1.0,
+                      fontWeight:
+                          selected ? FontWeight.w600 : FontWeight.w500,
+                    ),
                   ),
                 ],
               );

package/templates/firebase/lib/core/web_viewport_scale.dart

@@ -4,10 +4,18 @@ import 'package:flutter/widgets.dart';
 /// Global render scale applied to the app on web.
 ///
 /// Flutter web tends to render ~10% larger than equivalent HTML apps at the
-/// browser's 100% zoom, so the whole UI feels oversized on desktop. `0.9` brings
-/// it to the proportion the design targets (i.e. what 90% zoom looked like)
-/// without the user having to touch the browser zoom.
-const double kWebViewportScale = 0.9;
+/// browser's 100% zoom, so the whole UI feels oversized on desktop. `0.95`
+/// brings it to the proportion the design targets (i.e. what 95% zoom looked
+/// like) without the user having to touch the browser zoom.
+const double kWebViewportScale = 0.95;
+
+/// Minimum real viewport width (logical px) at which the web scale kicks in.
+///
+/// The "oversized" problem only shows up on tablet/desktop layouts. On mobile
+/// web (a narrow browser) the app should render at its natural size — exactly
+/// like the native iOS/Android build, which never scales. Tied to the tablet
+/// breakpoint so the rule stays in sync with the rest of the responsive system.
+const double kWebViewportScaleMinWidth = 768; // DeviceType.medium.breakpoint
 
 /// Renders [child] uniformly scaled by [scale] on web (no-op elsewhere).
 ///
@@ -33,6 +41,9 @@ class WebViewportScale extends StatelessWidget {
   Widget build(BuildContext context) {
     if (!kIsWeb || scale == 1.0) return child;
     final MediaQueryData mq = MediaQuery.of(context);
+    // Mobile web (narrow browser) renders at its natural size, just like the
+    // native build. The scale only applies from the tablet breakpoint up.
+    if (mq.size.width < kWebViewportScaleMinWidth) return child;
     final Size logicalSize = Size(
       mq.size.width / scale,
       mq.size.height / scale,

package/templates/firebase/lib/features/home/home_feed.dart

@@ -43,6 +43,14 @@ const Map<HomeCategory, _CategoryData> _categories = <HomeCategory, _CategoryDat
       '1525966222134-fcfa99b8ae77',
       '1484704849700-f032a568e944',
       '1542219550-37153d387c27',
+      '1634986666676-ec8fd927c23d',
+      '1633899306328-c5e70574aaa2',
+      '1634017839464-5c339ebe3cb4',
+      '1618005182384-a83a8bd57fbe',
+      '1635776062127-d379bfcba9f8',
+      '1618556450994-a6a128ef0d9d',
+      '1644143379190-08a5f055de1d',
+      '1617791160505-6f00504e3519',
     ],
   ),
   HomeCategory.background: _CategoryData(
@@ -62,6 +70,14 @@ const Map<HomeCategory, _CategoryData> _categories = <HomeCategory, _CategoryDat
       '1454496522488-7a8e488e8606',
       '1439066615861-d1af74d74000',
       '1470071459604-3b5ec3a7fe05',
+      '1502691876148-a84978e59af8',
+      '1574169208507-84376144848b',
+      '1518837695005-2083093ee35b',
+      '1534796636912-3b95b3ab5986',
+      '1508614999368-9260051292e5',
+      '1554189097-ffe88e998a2b',
+      '1557683316-973673baf926',
+      '1557682224-5b8590cd9ec5',
     ],
   ),
   HomeCategory.animated: _CategoryData(
@@ -81,6 +97,14 @@ const Map<HomeCategory, _CategoryData> _categories = <HomeCategory, _CategoryDat
       '1579546929518-9e396f3cc809',
       '1614851099175-e5b30eb6f696',
       '1557672172-298e090bd0f1',
+      '1469474968028-56623f02e42e',
+      '1472214103451-9374bd1c798e',
+      '1447752875215-b2761acb3c5d',
+      '1426604966848-d7adac402bff',
+      '1554189097-ffe88e998a2b',
+      '1508614999368-9260051292e5',
+      '1557683316-973673baf926',
+      '1557682224-5b8590cd9ec5',
     ],
   ),
   HomeCategory.icons3d: _CategoryData(
@@ -100,6 +124,14 @@ const Map<HomeCategory, _CategoryData> _categories = <HomeCategory, _CategoryDat
       '1620207418302-439b387441b0',
       '1604079628040-94301bb21b91',
       '1557682250-33bd709cbe85',
+      '1556228720-195a672e8a03',
+      '1542291026-7eec264c27ff',
+      '1522338242992-e1a54906a8da',
+      '1572635196237-14b3f281503f',
+      '1526170375885-4d8ecf77b99f',
+      '1560769629-975ec94e6a86',
+      '1525966222134-fcfa99b8ae77',
+      '1542219550-37153d387c27',
     ],
   ),
   HomeCategory.gradients: _CategoryData(
@@ -119,6 +151,14 @@ const Map<HomeCategory, _CategoryData> _categories = <HomeCategory, _CategoryDat
       '1508614999368-9260051292e5',
       '1554189097-ffe88e998a2b',
       '1620641788421-7a1c342ea42e',
+      '1518837695005-2083093ee35b',
+      '1534796636912-3b95b3ab5986',
+      '1462331940025-496dfbfc7564',
+      '1559827260-dc66d52bef19',
+      '1541701494587-cb58502866ab',
+      '1574169208507-84376144848b',
+      '1502691876148-a84978e59af8',
+      '1469474968028-56623f02e42e',
     ],
   ),
 };
@@ -207,10 +247,18 @@ class _FilterRow extends StatelessWidget {
   Widget build(BuildContext context) {
     const List<HomeCategory> all = HomeCategory.values;
 
-    // Smaller, denser cards on phones; full size on tablet/desktop.
-    final bool isMobile = MediaQuery.sizeOf(context).width < 768;
-    final double thumbSize = isMobile ? 56 : 79;
-    final double cardWidth = isMobile ? 232 : 302;
+    // Cards scale fluidly with the screen width instead of snapping at a single
+    // breakpoint: smallest/densest on phones, growing smoothly to full size by
+    // the time we reach a desktop-width viewport.
+    const double minWidth = 360; // small phone
+    const double maxWidth = 1024; // desktop — cards at full size from here up
+    final double screenWidth = MediaQuery.sizeOf(context).width;
+    final double t = ((screenWidth - minWidth) / (maxWidth - minWidth)).clamp(
+      0.0,
+      1.0,
+    );
+    final double thumbSize = 44 + (79 - 44) * t;
+    final double cardWidth = 196 + (302 - 196) * t;
     final double cardHeight = thumbSize + KasySpacing.md * 2;
 
     return SizedBox(

package/templates/firebase/lib/features/home/home_image_grid.dart

@@ -71,7 +71,8 @@ class _ImageSkeleton extends StatelessWidget {
 
 /// Pinterest-style masonry feed. Tile heights vary by a repeating ratio set and
 /// tiles are balanced across columns by running height. Column count is
-/// responsive: 2 on phones, 3 on tablets, 4 on desktop.
+/// responsive: 2 on phones, 3 on tablets, 4 on desktop and up to 8 on very
+/// wide displays.
 class HomeImageGrid extends StatelessWidget {
   const HomeImageGrid({super.key, required this.photos});
 
@@ -91,10 +92,22 @@ class HomeImageGrid extends StatelessWidget {
     1.4,
   ];
 
+  /// Target tile width. Columns are derived from the available width so the
+  /// grid stays dense on big desktops without ever letting tiles get too
+  /// narrow — naturally stepping 5 → 4 → 3 → 2 as the screen shrinks.
+  static const double _targetTileWidth = 300;
+
+  /// Hard floor/ceiling on column count: never fewer than 2 (the mobile feel)
+  /// and never more than 8 (lets big desktops fit 6–8 columns while still
+  /// capping density so tiles don't get tiny on huge monitors).
+  static const int _minColumns = 2;
+  static const int _maxColumns = 8;
+
   int _columnsFor(double width) {
-    if (width >= 1024) return 4;
-    if (width >= 600) return 3;
-    return 2;
+    final int columns = (width / _targetTileWidth).ceil();
+    if (columns < _minColumns) return _minColumns;
+    if (columns > _maxColumns) return _maxColumns;
+    return columns;
   }
 
   @override
@@ -140,6 +153,10 @@ class HomeImageGrid extends StatelessWidget {
   }
 }
 
+/// Diameter of the circular "like" button — shared so the caption text can
+/// reserve exactly enough room to sit beside it without overlapping.
+const double _likeButtonSize = 36;
+
 class _PhotoTile extends StatefulWidget {
   final HomePhoto photo;
   final double aspectRatio;
@@ -178,71 +195,83 @@ class _PhotoTileState extends State<_PhotoTile> {
         child: Stack(
           fit: StackFit.expand,
           children: <Widget>[
-            // Tapping the photo opens the full-screen viewer; the Hero gives a
-            // smooth zoom into and out of it.
+            // Photo. The Hero gives the smooth zoom into and out of the viewer.
             Positioned.fill(
-              child: KasyFocusRing(
-                onActivate: _openViewer,
-                borderRadius: BorderRadius.circular(KasyRadius.xl),
-                child: GestureDetector(
-                  onTap: _openViewer,
-                  behavior: HitTestBehavior.opaque,
-                  child: Hero(
-                    tag: photo.id,
-                    child: KasyNetworkImage(url: photo.url),
-                  ),
-                ),
+              child: Hero(
+                tag: photo.id,
+                child: KasyNetworkImage(url: photo.url),
               ),
             ),
 
             // Smooth caption scrim — keeps text legible over any photo, in
-            // both light and dark themes.
+            // both light and dark themes. Decorative only: never eats taps.
             const Positioned(
               left: 0,
               right: 0,
               bottom: 0,
-              child: _CaptionScrim(),
+              child: IgnorePointer(child: _CaptionScrim()),
             ),
 
+            // Caption text — decorative only. The right padding reserves room
+            // for the like button so the text never runs underneath it.
             Positioned(
               left: 0,
               right: 0,
               bottom: 0,
-              child: Padding(
-                padding: const EdgeInsets.all(KasySpacing.md),
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: <Widget>[
-                    Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        mainAxisSize: MainAxisSize.min,
-                        children: <Widget>[
-                          Text(
-                            photo.author,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: context.textTheme.titleSmall?.copyWith(
-                              color: context.colors.onSurface,
-                            ),
-                          ),
-                          Text(
-                            photo.ago,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: context.textTheme.bodySmall?.copyWith(
-                              color: context.colors.muted,
-                            ),
-                          ),
-                        ],
+              child: IgnorePointer(
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(
+                    KasySpacing.md,
+                    KasySpacing.md,
+                    KasySpacing.md + _likeButtonSize + KasySpacing.sm,
+                    KasySpacing.md,
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: <Widget>[
+                      Text(
+                        photo.author,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.titleSmall?.copyWith(
+                          color: context.colors.onSurface,
+                        ),
+                      ),
+                      Text(
+                        photo.ago,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: context.colors.muted,
+                        ),
                       ),
-                    ),
-                    const SizedBox(width: KasySpacing.sm),
-                    _LikeButton(liked: _liked, onTap: _toggleLike),
-                  ],
+                    ],
+                  ),
                 ),
               ),
             ),
+
+            // Full-tile tap target sits ABOVE the scrim and caption so tapping
+            // anywhere on the tile (gradient included) opens the viewer.
+            Positioned.fill(
+              child: KasyFocusRing(
+                onActivate: _openViewer,
+                borderRadius: BorderRadius.circular(KasyRadius.xl),
+                child: GestureDetector(
+                  onTap: _openViewer,
+                  behavior: HitTestBehavior.opaque,
+                ),
+              ),
+            ),
+
+            // Like button — kept on top of the tap target so it still wins
+            // taps within its own area.
+            Positioned(
+              right: KasySpacing.md,
+              bottom: KasySpacing.md,
+              child: _LikeButton(liked: _liked, onTap: _toggleLike),
+            ),
           ],
         ),
       ),
@@ -354,8 +383,8 @@ class _LikeButtonState extends State<_LikeButton>
           child: BackdropFilter(
             filter: ui.ImageFilter.blur(sigmaX: 8, sigmaY: 8),
             child: Container(
-              width: 36,
-              height: 36,
+              width: _likeButtonSize,
+              height: _likeButtonSize,
               alignment: Alignment.center,
               decoration: BoxDecoration(
                 color: context.colors.surface.withValues(

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+36
+version: 1.0.0+38
 
 environment:
   sdk: ^3.11.0
@@ -79,6 +79,13 @@ dependencies:
   open_filex: ^4.7.0
   package_info_plus: ^8.3.0
   path_provider: ^2.1.5
+  # Pin the Apple impl of path_provider below 2.6.0/2.5.0. Those versions pull in
+  # objective_c via "native assets", whose build hook is unquoted and breaks every
+  # build on Windows when the username has a space (C:\Users\John Silva) — even a
+  # Chrome/web run, where the Apple-only hook is dead weight. 2.5.1 is the last
+  # release without objective_c (added in 2.5.0, reverted in 2.5.1, re-added in
+  # 2.6.0). Drop this pin once the upstream web-target regression is fixed.
+  path_provider_foundation: 2.5.1
   permission_handler: ^12.0.1
   provider: ^6.1.0
   pub_semver: ^2.2.0