kasy-cli 1.31.13 → 1.32.0

package/templates/firebase/lib/features/settings/ui/components/avatar_component.dart

@@ -103,7 +103,7 @@ class _EditableUserAvatarState extends ConsumerState<EditableUserAvatar> {
                 ),
                 child: const Icon(
                   KasyIcons.cameraAlt,
-                  size: 12,
+                  size: KasyIconSize.xxs,
                   color: Colors.white,
                 ),
               ),
@@ -336,7 +336,7 @@ class _BottomSheetTile extends StatelessWidget {
           child: Row(
             children: [
               if (icon != null) ...[
-                Icon(icon, size: 22, color: fg),
+                Icon(icon, size: KasyIconSize.lg, color: fg),
                 const SizedBox(width: KasySpacing.sm),
               ],
               Text(

package/templates/firebase/lib/features/settings/ui/components/delete_user_component.dart

@@ -14,12 +14,18 @@ class DeleteUserButton extends ConsumerWidget {
       label: t.settings.delete_account.button,
       variant: KasyButtonVariant.ghost,
       foregroundColor: context.colors.muted,
-      onPressed: () => showKasyConfirmDialog(
+      onPressed: () {
+        // Only warn about losing the subscription when the user actually has an
+        // active one — otherwise the generic permanent-deletion warning.
+        final bool isSubscriber =
+            ref.read(userStateNotifierProvider).subscription?.isActive ?? false;
+        final account = t.settings.delete_account;
+        showKasyConfirmDialog(
         context,
-        title: t.settings.delete_account.title,
-        message: t.settings.delete_account.content,
-        cancelLabel: t.settings.delete_account.cancel,
-        confirmLabel: t.settings.delete_account.confirm,
+        title: account.title,
+        message: isSubscriber ? account.content_subscriber : account.content,
+        cancelLabel: account.cancel,
+        confirmLabel: account.confirm,
         destructive: true,
         onConfirmAsync: () async {
           try {
@@ -34,7 +40,8 @@ class DeleteUserButton extends ConsumerWidget {
             }
           }
         },
-      ),
+        );
+      },
     );
   }
 }

package/templates/firebase/lib/features/settings/ui/components/edit_name_sheet.dart

@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/data/repositories/user_repository.dart';
+import 'package:kasy_kit/core/states/user_state_notifier.dart';
+import 'package:kasy_kit/i18n/translations.g.dart';
+
+/// Opens the "edit name" bottom sheet and, on success, shows a confirmation
+/// toast on the calling [context]. The email is intentionally read-only — only
+/// the display name can be changed here.
+Future<void> showEditNameSheet(
+  BuildContext context, {
+  required String userId,
+  required String email,
+  required String currentName,
+}) async {
+  final bool? saved = await showKasyBottomSheet<bool>(
+    context: context,
+    isScrollControlled: true,
+    builder: (_) => _EditNameSheet(
+      userId: userId,
+      email: email,
+      initialName: currentName,
+    ),
+  );
+  if (saved == true && context.mounted) {
+    showKasyToast(
+      context,
+      title: context.t.settings.edit_name_success,
+      tone: KasyToastTone.success,
+    );
+  }
+}
+
+class _EditNameSheet extends ConsumerStatefulWidget {
+  final String userId;
+  final String email;
+  final String initialName;
+
+  const _EditNameSheet({
+    required this.userId,
+    required this.email,
+    required this.initialName,
+  });
+
+  @override
+  ConsumerState<_EditNameSheet> createState() => _EditNameSheetState();
+}
+
+class _EditNameSheetState extends ConsumerState<_EditNameSheet> {
+  late final TextEditingController _controller =
+      TextEditingController(text: widget.initialName);
+  bool _saving = false;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  Future<void> _save() async {
+    final String name = _controller.text.trim();
+    if (name.isEmpty || _saving) return;
+    setState(() => _saving = true);
+    final tr = context.t.settings;
+    try {
+      await ref.read(userRepositoryProvider).updateEmailAndName(
+            userId: widget.userId,
+            email: widget.email,
+            name: name,
+          );
+      await ref.read(userStateNotifierProvider.notifier).refresh();
+      if (!mounted) return;
+      // The success toast is shown by the launcher on the page context, since
+      // this sheet's context is gone right after the pop.
+      Navigator.of(context).pop(true);
+    } catch (_) {
+      if (!mounted) return;
+      setState(() => _saving = false);
+      showKasyToast(context, title: tr.edit_name_error, tone: KasyToastTone.danger);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tr = context.t.settings;
+    return KasyBottomSheet(
+      title: tr.edit_name_title,
+      addKeyboardInset: true,
+      body: KasyTextField(
+        controller: _controller,
+        label: tr.name_label,
+        hint: tr.edit_name_hint,
+        autofocus: true,
+        textCapitalization: TextCapitalization.words,
+        textInputAction: TextInputAction.done,
+        onSubmitted: (_) => _save(),
+      ),
+      actions: [
+        KasyButton(
+          label: tr.edit_name_save,
+          expand: true,
+          isLoading: _saving,
+          onPressed: _save,
+        ),
+        KasyButton(
+          label: tr.edit_name_cancel,
+          variant: KasyButtonVariant.ghost,
+          expand: true,
+          onPressed: _saving ? null : () => Navigator.of(context).pop(),
+        ),
+      ],
+    );
+  }
+}

package/templates/firebase/lib/features/settings/ui/components/language_switcher.dart

@@ -30,14 +30,14 @@ class LanguageSwitcher extends ConsumerWidget {
             children: <Widget>[
               Icon(
                 KasyIcons.language,
-                size: 21,
+                size: KasyIconSize.rowLeading,
                 color: context.colors.onSurface,
               ),
               const SizedBox(width: KasySpacing.sm),
               Expanded(
                 child: Text(
                   context.t.settings.language_title,
-                  style: context.textTheme.titleMedium?.copyWith(
+                  style: context.textTheme.titleSmall?.copyWith(
                     color: context.colors.onSurface,
                   ),
                 ),

package/templates/firebase/lib/features/settings/ui/widgets/settings_bottom_sheet_option_tile.dart

@@ -39,7 +39,7 @@ class SettingsBottomSheetOptionTile extends StatelessWidget {
               leading!,
               const SizedBox(width: KasySpacing.sm),
             ] else if (icon != null) ...<Widget>[
-              Icon(icon, size: 22, color: fg),
+              Icon(icon, size: KasyIconSize.lg, color: fg),
               const SizedBox(width: KasySpacing.sm),
             ],
             Expanded(child: labelWidget),

package/templates/firebase/lib/features/settings/ui/widgets/settings_tile.dart

@@ -42,7 +42,7 @@ class SettingsIconBadge extends StatelessWidget {
 class SettingsListChevron extends StatelessWidget {
   const SettingsListChevron({super.key});
 
-  static const double _iconSize = 18;
+  static const double _iconSize = KasyIconSize.rowTrailing;
 
   @override
   Widget build(BuildContext context) {
@@ -97,7 +97,11 @@ class SettingsSwitchTile extends StatelessWidget {
           if (iconBackgroundColor != null)
             SettingsIconBadge(icon: icon, color: iconBackgroundColor!)
           else
-            Icon(icon, size: 21, color: context.colors.onSurface),
+            Icon(
+              icon,
+              size: KasyIconSize.rowLeading,
+              color: context.colors.onSurface,
+            ),
           const SizedBox(width: KasySpacing.sm),
           Expanded(
             child: Column(
@@ -106,7 +110,7 @@ class SettingsSwitchTile extends StatelessWidget {
               children: <Widget>[
                 Text(
                   title,
-                  style: context.textTheme.titleMedium?.copyWith(
+                  style: context.textTheme.titleSmall?.copyWith(
                     color: context.colors.onSurface,
                   ),
                 ),
@@ -166,12 +170,16 @@ class SettingsTile extends StatelessWidget {
           if (iconBackgroundColor != null)
             SettingsIconBadge(icon: icon, color: iconBackgroundColor!)
           else
-            Icon(icon, size: 21, color: context.colors.onSurface),
+            Icon(
+              icon,
+              size: KasyIconSize.rowLeading,
+              color: context.colors.onSurface,
+            ),
           const SizedBox(width: KasySpacing.sm),
           Expanded(
             child: Text(
               title,
-              style: context.textTheme.titleMedium?.copyWith(
+              style: context.textTheme.titleSmall?.copyWith(
                 color: context.colors.onSurface,
               ),
             ),

package/templates/firebase/lib/features/subscriptions/api/stripe_backend_api.dart

@@ -35,6 +35,7 @@ class StripeBackendApi {
     String? successUrl,
     String? cancelUrl,
     String? locale,
+    bool? allowPromoCodes,
   }) async {
     final res = await _functions
         .httpsCallable('stripeFunctions-createCheckoutSession')
@@ -43,15 +44,24 @@ class StripeBackendApi {
           if (successUrl != null) 'successUrl': successUrl,
           if (cancelUrl != null) 'cancelUrl': cancelUrl,
           if (locale != null) 'locale': locale,
+          if (allowPromoCodes != null) 'allowPromoCodes': allowPromoCodes,
         });
     return (res.data as Map)['url'] as String;
   }
 
   /// Create a Customer Portal session (manage / cancel) and return its URL.
-  Future<String> createPortalSession({String? returnUrl}) async {
+  /// Pass [planSwitching] = true to auto-configure the portal with
+  /// upgrade/downgrade support (no manual Stripe dashboard setup needed).
+  Future<String> createPortalSession({
+    String? returnUrl,
+    bool? planSwitching,
+  }) async {
     final res = await _functions
         .httpsCallable('stripeFunctions-createPortalSession')
-        .call({if (returnUrl != null) 'returnUrl': returnUrl});
+        .call({
+          if (returnUrl != null) 'returnUrl': returnUrl,
+          if (planSwitching != null) 'planSwitching': planSwitching,
+        });
     return (res.data as Map)['url'] as String;
   }
 }

package/templates/firebase/lib/features/subscriptions/api/stripe_payment_api.dart

@@ -1,3 +1,4 @@
+import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/data/models/entitlement.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/features/subscriptions/api/entities/subscription_entity.dart';
@@ -39,7 +40,10 @@ class StripePaymentApi implements SubscriptionPaymentApi {
     // tab. The original app tab keeps polling and flips to premium via the
     // webhook. On cancel we send the user back to the app where they were.
     final appUrl = Uri.base.toString();
-    final successUrl = '${Uri.base.origin}/stripe_success.html';
+    // Pass the in-app language so the success page renders in the locale the
+    // user picked here, not just the browser's (?lang= takes priority there).
+    final lang = LocaleSettings.instance.currentLocale.languageCode;
+    final successUrl = '${Uri.base.origin}/stripe_success.html?lang=$lang';
     final url = await _backend.createCheckoutSession(
       priceId: product.skuId,
       successUrl: successUrl,
@@ -48,6 +52,7 @@ class StripePaymentApi implements SubscriptionPaymentApi {
       // deliver subscription notifications in the right language (on web there
       // is no registered device to read the locale from).
       locale: LocaleSettings.instance.currentLocale.languageCode,
+      allowPromoCodes: withStripePromoCodes,
     );
     await _open(url);
     // Checkout is now open in a new tab. Payment is NOT confirmed yet — the
@@ -60,6 +65,7 @@ class StripePaymentApi implements SubscriptionPaymentApi {
   Future<void> unsubscribe(SubscriptionStore? origin) async {
     final url = await _backend.createPortalSession(
       returnUrl: Uri.base.toString(),
+      planSwitching: withStripePlanSwitching,
     );
     await _open(url);
   }

package/templates/firebase/lib/features/subscriptions/providers/premium_page_provider.dart

@@ -269,10 +269,18 @@ class PremiumStateNotifier extends _$PremiumStateNotifier {
     }
 
     try {
-      await _subscriptionRepository.restorePurchase();
+      // Store-level restore: RevenueCat on native (asks Apple/Google to restore
+      // purchases), a no-op on web (Stripe status lives server-side). Best-effort
+      // — RevenueCat throws when there is nothing to restore, but the backend
+      // re-read below is the source of truth and decides the message, so both
+      // web and native end on the same friendly "nothing to restore" path.
+      try {
+        await _subscriptionRepository.restorePurchase();
+      } catch (_) {
+        // Ignore: fall through to the backend check.
+      }
 
-      // restorePurchase is a no-op on web (Stripe status lives server-side), so
-      // we re-read the backend to learn the real state: the webhook may have
+      // Re-read the backend to learn the real state: the webhook may have
       // already written the subscription. Only flip to active when the backend
       // actually confirms it — otherwise we'd show a false "restored" success.
       final userId = _userState.user.idOrNull;

package/templates/firebase/lib/features/subscriptions/ui/component/paywall_row.dart

@@ -280,7 +280,7 @@ class _BasicPaywallRowState extends ConsumerState<PaywallRow> {
                                   children: [
                                     Icon(
                                       KasyIcons.security,
-                                      size: 14,
+                                      size: KasyIconSize.xs,
                                       color: context.colors.primary,
                                     ),
                                     const SizedBox(width: KasySpacing.xs),

package/templates/firebase/lib/features/subscriptions/ui/widgets/comparison_table.dart

@@ -312,7 +312,7 @@ class _ComparisonTable extends StatelessWidget {
       isAvailable 
         ? KasyIcons.check
         : KasyIcons.close,
-      size: 20,
+      size: KasyIconSize.lg,
       color: isAvailable 
         ? (isPremium ? context.colors.primary : context.colors.success)
         : context.colors.error,

package/templates/firebase/lib/features/subscriptions/ui/widgets/feature_line.dart

@@ -28,7 +28,7 @@ class FeatureLine extends StatelessWidget {
             Icon(
               icon,
               color: context.colors.onBackground,
-              size: 16,
+              size: KasyIconSize.sm,
             ),
           if (icon != null)
             const SizedBox(width: KasySpacing.smd),
@@ -93,7 +93,7 @@ class FeatureWithTwoLines extends StatelessWidget {
             Icon(
               icon,
               color: context.colors.onBackground,
-              size: 24,
+              size: KasyIconSize.xl,
             ),
           const SizedBox(width: KasySpacing.smd),
           Flexible(

package/templates/firebase/lib/features/subscriptions/ui/widgets/premium_close_button.dart

@@ -58,7 +58,7 @@ class AppCloseButton extends StatelessWidget {
               child: Icon(
                 KasyIcons.close,
                 color: context.colors.background,
-                size: 21,
+                size: KasyIconSize.lg,
               ),
             ),
           ),

package/templates/firebase/lib/features/subscriptions/ui/widgets/premium_feature.dart

@@ -19,7 +19,7 @@ class PremiumFeature extends StatelessWidget {
           Icon(
             KasyIcons.check,
             color: context.colors.onPrimary,
-            size: 24,
+            size: KasyIconSize.xl,
           ),
           const SizedBox(width: KasySpacing.md),
           Expanded(

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_col.dart

@@ -230,8 +230,8 @@ class _SelectableColState extends State<SelectableCol>
                       Padding(
                         padding: const EdgeInsets.only(bottom: 2), // pixel-level icon alignment — intentional exception
                         child: Icon(
-                          widget.icon, 
-                          size: 24, 
+                          widget.icon,
+                          size: KasyIconSize.xl,
                           color: switch(widget.brightness) {
                             Brightness.light => context.colors.onBackground,
                             _ => context.colors.background,
@@ -374,7 +374,7 @@ class RoundRadioBox extends StatelessWidget {
                 opacity: iconOpacity,
                 child: Transform.scale(
                   scale: iconSize,
-                  child: Icon(icon, color: context.colors.onPrimary, size: 21),
+                  child: Icon(icon, color: context.colors.onPrimary, size: KasyIconSize.lg),
                 ),
               )
             : const SizedBox.shrink(),

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_row.dart

@@ -433,7 +433,7 @@ class RoundRadioBox extends StatelessWidget {
                 opacity: iconOpacity,
                 child: Transform.scale(
                   scale: iconSize,
-                  child: Icon(icon, color: context.colors.background, size: 16),
+                  child: Icon(icon, color: context.colors.background, size: KasyIconSize.sm),
                 ),
               )
             : const SizedBox.shrink(),

package/templates/firebase/lib/i18n/en.i18n.json

@@ -495,6 +495,14 @@
         "my_account": "My account",
         "not_signed_in": "Not signed in",
         "register": "Register",
+        "name_label": "Name",
+        "email_label": "Email",
+        "edit_name_title": "Edit name",
+        "edit_name_hint": "Your name",
+        "edit_name_save": "Save",
+        "edit_name_cancel": "Cancel",
+        "edit_name_success": "Name updated",
+        "edit_name_error": "Couldn't update your name. Please try again.",
         "reminders": "Reminders",
         "admin_panel": "Admin Panel",
         "admin_debug_section_label": "ADMIN (DEBUG ONLY)",
@@ -502,7 +510,8 @@
         "delete_account": {
             "button": "I want to delete my account",
             "title": "Delete your account?",
-            "content": "Warning: this is permanent. You will lose any active subscription, and creating a new account later (even with the same email) will not restore it.",
+            "content": "Warning: this action is permanent and cannot be undone.",
+            "content_subscriber": "Warning: this is permanent. You will lose your active subscription, and creating a new account later (even with the same email) will not restore it.",
             "cancel": "Cancel",
             "confirm": "Yes, delete",
             "error": "Something went wrong. Please try again."

package/templates/firebase/lib/i18n/es.i18n.json

@@ -495,6 +495,14 @@
         "my_account": "Mi cuenta",
         "not_signed_in": "No conectado",
         "register": "Registrarse",
+        "name_label": "Nombre",
+        "email_label": "Correo electrónico",
+        "edit_name_title": "Editar nombre",
+        "edit_name_hint": "Tu nombre",
+        "edit_name_save": "Guardar",
+        "edit_name_cancel": "Cancelar",
+        "edit_name_success": "Nombre actualizado",
+        "edit_name_error": "No se pudo actualizar tu nombre. Inténtalo de nuevo.",
         "reminders": "Recordatorios",
         "admin_panel": "Panel de Administración",
         "admin_debug_section_label": "ADMIN (SOLO DEBUG)",
@@ -502,7 +510,8 @@
         "delete_account": {
             "button": "Quiero eliminar mi cuenta",
             "title": "¿Quieres eliminar tu cuenta?",
-            "content": "Advertencia: esta acción es permanente. Perderás cualquier suscripción activa, y crear una cuenta nueva más tarde (incluso con el mismo correo) no la recuperará.",
+            "content": "Advertencia: esta acción es permanente y no se puede deshacer.",
+            "content_subscriber": "Advertencia: esta acción es permanente. Perderás tu suscripción activa, y crear una cuenta nueva más tarde (incluso con el mismo correo) no la recuperará.",
             "cancel": "Cancelar",
             "confirm": "Sí, eliminar",
             "error": "Algo salió mal. Por favor, inténtalo de nuevo."

package/templates/firebase/lib/i18n/pt.i18n.json

@@ -495,6 +495,14 @@
         "my_account": "Minha conta",
         "not_signed_in": "Não conectado",
         "register": "Cadastrar",
+        "name_label": "Nome",
+        "email_label": "Email",
+        "edit_name_title": "Editar nome",
+        "edit_name_hint": "Seu nome",
+        "edit_name_save": "Salvar",
+        "edit_name_cancel": "Cancelar",
+        "edit_name_success": "Nome atualizado",
+        "edit_name_error": "Não foi possível atualizar seu nome. Tente novamente.",
         "reminders": "Lembretes",
         "admin_panel": "Painel Admin",
         "admin_debug_section_label": "ADMIN (SÓ EM DEBUG)",
@@ -502,7 +510,8 @@
         "delete_account": {
             "button": "Quero excluir minha conta",
             "title": "Quer excluir sua conta?",
-            "content": "Atenção: esta ação é permanente. Você perde qualquer assinatura ativa, e criar uma nova conta depois (mesmo com o mesmo e-mail) não recupera ela.",
+            "content": "Atenção: esta ação é permanente e não pode ser desfeita.",
+            "content_subscriber": "Atenção: esta ação é permanente. Você perde sua assinatura ativa, e criar uma nova conta depois (mesmo com o mesmo e-mail) não recupera ela.",
             "cancel": "Cancelar",
             "confirm": "Sim, excluir",
             "error": "Algo deu errado. Por favor, tente novamente."

package/templates/firebase/pubspec.yaml

@@ -34,7 +34,6 @@ dependencies:
   another_flushbar: ^1.12.32
   background_fetch: ^1.5.0
   bart: ^1.4.1
-  better_skeleton: ^0.1.0
   cloud_firestore: ^6.1.2
   cloud_functions: ^6.0.6
   cross_file: ^0.3.5+2