kasy-cli 1.32.0 → 1.35.0

package/templates/firebase/lib/features/settings/settings_page.dart

@@ -5,6 +5,7 @@ import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/chrome/chrome_visibility.dart';
 import 'package:kasy_kit/core/config/features.dart';
+import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/haptics/haptic_feedback_notifier.dart';
 import 'package:kasy_kit/core/security/biometric_preference_notifier.dart';
@@ -14,7 +15,10 @@ import 'package:kasy_kit/core/states/logout_action.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/kasy_hover.dart';
+import 'package:kasy_kit/features/authentication/repositories/authentication_repository.dart';
+import 'package:kasy_kit/features/authentication/repositories/exceptions/authentication_exceptions.dart';
 import 'package:kasy_kit/features/settings/ui/components/avatar_component.dart';
+import 'package:kasy_kit/features/settings/ui/components/create_password_sheet.dart';
 import 'package:kasy_kit/features/settings/ui/components/delete_user_component.dart';
 import 'package:kasy_kit/features/settings/ui/components/edit_name_sheet.dart';
 import 'package:kasy_kit/features/settings/ui/components/language_switcher.dart';
@@ -23,6 +27,60 @@ import 'package:kasy_kit/i18n/translations.g.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+/// All providers linked to the current account (google/apple/facebook/email/
+/// phone), for the "Connected with" row and to decide whether to offer "create
+/// password". Empty for guests/unknown.
+final _linkedProvidersProvider = FutureProvider.autoDispose<List<String>>(
+  (ref) => ref.read(authRepositoryProvider).getLinkedProviders(),
+);
+
+/// Social providers the current user can still link to their account (Firebase).
+/// Empty on backends that link automatically (Supabase) or aren't wired (API).
+final _linkableProvidersProvider = FutureProvider.autoDispose<List<String>>(
+  (ref) => ref.read(authRepositoryProvider).linkableSocialProviders(),
+);
+
+String _providerDisplayName(String provider) => switch (provider) {
+      'google' => 'Google',
+      'apple' => 'Apple',
+      'facebook' => 'Facebook',
+      _ => provider,
+    };
+
+/// Links a social provider to the current account, then refreshes the lists and
+/// shows a toast. Cancelled flows are silently ignored.
+Future<void> _linkSocialProvider(
+  WidgetRef ref,
+  BuildContext context,
+  String provider,
+) async {
+  final tr = context.t.settings;
+  try {
+    await ref.read(authRepositoryProvider).linkSocialProvider(provider);
+    ref.invalidate(_linkableProvidersProvider);
+    ref.invalidate(_linkedProvidersProvider);
+    await ref.read(userStateNotifierProvider.notifier).refresh();
+  } on UserCancelledSignInException {
+    return;
+  } catch (_) {
+    if (context.mounted) {
+      showKasyToast(
+        context,
+        title: tr.link_social_error,
+        tone: KasyToastTone.danger,
+      );
+    }
+    return;
+  }
+  if (context.mounted) {
+    showKasyToast(
+      context,
+      title: tr.link_social_success(provider: _providerDisplayName(provider)),
+      tone: KasyToastTone.success,
+    );
+  }
+}
+
 class SettingsPage extends ConsumerWidget {
   const SettingsPage({super.key});
 
@@ -76,6 +134,18 @@ class SettingsPage extends ConsumerWidget {
                       email: displayEmail,
                       isAuthenticated: isAuthenticated,
                       onRegister: () => context.push('/signup'),
+                      linkedProviders: ref
+                              .watch(_linkedProvidersProvider)
+                              .asData
+                              ?.value ??
+                          const [],
+                      linkableProviders: ref
+                              .watch(_linkableProvidersProvider)
+                              .asData
+                              ?.value ??
+                          const [],
+                      onLinkProvider: (p) =>
+                          _linkSocialProvider(ref, context, p),
                     ),
                     const SizedBox(height: KasySpacing.xl),
                     ..._sections(
@@ -204,12 +274,8 @@ List<Widget> _preferenceRows(BuildContext context, {required bool isPhone}) {
         title: tr.feedback,
         onTap: () => context.push('/feedback'),
       ),
-    if (withRevenuecat)
-      SettingsTile(
-        icon: KasyIcons.payment,
-        title: tr.premium,
-        onTap: () => context.push('/premium'),
-      ),
+    if (withRevenuecat || withStripe)
+      const _BillingTile(),
   ];
 }
 
@@ -241,11 +307,20 @@ List<Widget> _accountFields(
   required String email,
   required bool isAuthenticated,
   required VoidCallback onRegister,
+  List<String> linkedProviders = const [],
+  List<String> linkableProviders = const [],
+  void Function(String provider)? onLinkProvider,
 }) {
   final tr = context.t.settings;
   if (!isAuthenticated) {
     return [
-      KasyButton(label: tr.register, expand: true, onPressed: onRegister),
+      KasyButton(
+        label: tr.register,
+        expand: true,
+        variant: KasyButtonVariant.ghost,
+        foregroundColor: context.colors.primary,
+        onPressed: onRegister,
+      ),
     ];
   }
   return [
@@ -263,10 +338,72 @@ List<Widget> _accountFields(
                 ),
       ),
       _FieldRow(label: tr.email_label, value: email),
+      if (linkedProviders.isNotEmpty)
+        _FieldRow(
+          label: tr.connected_with_label,
+          value: linkedProviders
+              .map((p) => switch (p) {
+                    'google' => 'Google',
+                    'apple' => 'Apple',
+                    'facebook' => 'Facebook',
+                    'phone' => tr.provider_phone,
+                    _ => tr.provider_email,
+                  })
+              .join(', '),
+        ),
+      // Social-only accounts can attach a password (same account) so they can
+      // also sign in with email + password. Email/phone users already have one.
+      if (linkedProviders.isNotEmpty &&
+          !linkedProviders.contains('email') &&
+          !linkedProviders.contains('phone'))
+        _FieldRow(
+          label: tr.create_password_title,
+          value: '',
+          onTap: () => showCreatePasswordSheet(context),
+        ),
+      // Firebase: link a social provider (Google/Apple) to this account so it
+      // can also be used to sign in. Empty/hidden on Supabase (auto-links).
+      for (final provider in linkableProviders)
+        _FieldRow(
+          label: tr.link_social(provider: _providerDisplayName(provider)),
+          value: '',
+          onTap:
+              onLinkProvider == null ? null : () => onLinkProvider(provider),
+        ),
     ]),
   ];
 }
 
+/// Subscription/billing entry in the Preferences section.
+/// - Not subscribed → "Premium" (taps into the paywall).
+/// - Subscribed      → "Cobrança" + plan name on the right (taps into billing).
+class _BillingTile extends ConsumerWidget {
+  const _BillingTile();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final sub = ref.watch(userStateNotifierProvider).subscription;
+    final tr = context.t;
+
+    if (sub is SubscriptionStateData) {
+      final planName =
+          sub.activeOffer?.title ?? tr.activePremium.plan_fallback;
+      return SettingsTile(
+        icon: KasyIcons.payment,
+        title: tr.settings.billing,
+        trailingLabel: planName,
+        onTap: () => context.push('/premium'),
+      );
+    }
+
+    return SettingsTile(
+      icon: KasyIcons.payment,
+      title: tr.settings.premium,
+      onTap: () => context.push('/premium'),
+    );
+  }
+}
+
 class _SectionLabel extends StatelessWidget {
   final String label;
   const _SectionLabel(this.label);
@@ -279,7 +416,7 @@ class _SectionLabel extends StatelessWidget {
       padding: const EdgeInsets.only(left: KasySpacing.xs),
       child: Text(
         label,
-        style: KasyTextTheme.sectionLabel.copyWith(
+        style: context.kasyTextTheme.sectionLabel.copyWith(
           color: context.colors.muted,
         ),
       ),
@@ -544,9 +681,8 @@ class _DesktopNav extends StatelessWidget {
                       name,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
-                      style: context.textTheme.titleSmall?.copyWith(
+                      style: context.textTheme.titleMedium?.copyWith(
                         color: context.colors.onSurface,
-                        fontWeight: FontWeight.w600,
                       ),
                     ),
                     if (email.isNotEmpty)
@@ -664,7 +800,7 @@ class _DesktopDetail extends ConsumerWidget {
           ),
           child: Text(
             title,
-            style: KasyTextTheme.sectionTitle.copyWith(
+            style: context.kasyTextTheme.sectionTitle.copyWith(
               color: context.colors.onSurface,
             ),
           ),
@@ -719,6 +855,11 @@ class _DesktopDetail extends ConsumerWidget {
         email: email,
         isAuthenticated: isAuthenticated,
         onRegister: () => context.push('/signup'),
+        linkedProviders:
+            ref.watch(_linkedProvidersProvider).asData?.value ?? const [],
+        linkableProviders:
+            ref.watch(_linkableProvidersProvider).asData?.value ?? const [],
+        onLinkProvider: (p) => _linkSocialProvider(ref, context, p),
       ),
       if (isAuthenticated) ...[
         const SizedBox(height: KasySpacing.xl),

package/templates/firebase/lib/features/settings/ui/components/admin/admin_page.dart

@@ -10,6 +10,7 @@ import 'package:kasy_kit/components/kasy_button.dart';
 import 'package:kasy_kit/components/kasy_status_tag.dart';
 import 'package:kasy_kit/components/kasy_tabs.dart';
 import 'package:kasy_kit/components/kasy_text_field.dart';
+import 'package:kasy_kit/core/app_update/update_available_sheet.dart';
 import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/dev_inspector/dev_inspector.dart';
@@ -159,6 +160,9 @@ class _TabScroll extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
+      // Scrolling a form means the user is done with the focused field, so
+      // dismiss the keyboard to free up the screen.
+      keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
       child: _MaxWidth(
         child: Padding(
           padding: EdgeInsets.fromLTRB(
@@ -191,11 +195,8 @@ class _GroupLabel extends StatelessWidget {
       ),
       child: Text(
         label.toUpperCase(),
-        style: context.textTheme.labelMedium?.copyWith(
-          fontSize: 12,
+        style: context.kasyTextTheme.sectionLabel.copyWith(
           color: context.colors.muted,
-          letterSpacing: 1.2,
-          fontWeight: FontWeight.w700,
         ),
       ),
     );
@@ -489,7 +490,7 @@ class _OverviewTab extends ConsumerWidget {
                   onTap: () {
                     Clipboard.setData(ClipboardData(text: uid));
                     ref.read(toastProvider).alert(
-                          title: '',
+                          title: t.common.copied,
                           text: t.settings.admin.user_id_copied,
                         );
                   },
@@ -558,9 +559,8 @@ class _InfoRow extends StatelessWidget {
           Expanded(
             child: Text(
               value,
-              style: context.textTheme.bodyMedium?.copyWith(
+              style: context.kasyTextTheme.rowValue.copyWith(
                 color: valueColor ?? context.colors.onSurface,
-                fontWeight: FontWeight.w600,
               ),
             ),
           ),
@@ -787,7 +787,7 @@ class _RequestCard extends ConsumerWidget {
                         .setActive(req.id!, v);
                     ref.invalidate(_adminRequestsProvider);
                     if (context.mounted) {
-                      ref.read(toastProvider).alert(title: '', text: r.saved);
+                      ref.read(toastProvider).alert(title: t.common.saved, text: r.saved);
                     }
                   },
                 ),
@@ -910,11 +910,11 @@ class _RequestEditorSheetState extends ConsumerState<_RequestEditorSheet> {
       ref.invalidate(_adminRequestsProvider);
       if (!mounted) return;
       context.pop();
-      ref.read(toastProvider).alert(title: '', text: r.saved);
+      ref.read(toastProvider).alert(title: t.common.saved, text: r.saved);
     } catch (_) {
       if (!mounted) return;
       setState(() => _saving = false);
-      ref.read(toastProvider).alert(title: '', text: r.error);
+      ref.read(toastProvider).alert(title: t.common.error, text: r.error);
     }
   }
 
@@ -927,6 +927,9 @@ class _RequestEditorSheetState extends ConsumerState<_RequestEditorSheet> {
       body: SizedBox(
         height: MediaQuery.sizeOf(context).height * 0.5,
         child: SingleChildScrollView(
+          // Scrolling a form means the user is done with the focused field, so
+          // dismiss the keyboard to free up the screen.
+          keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
@@ -1098,13 +1101,23 @@ class _ToolsTab extends ConsumerWidget {
       _ActionCard(
         icon: KasyIcons.note,
         title: admin.update_bottom_sheet,
-        onTap: () {
-          _backToApp(context);
-          showUpdateBottomSheet(
-            context: navigatorKey.currentContext!,
-            version: '0.0.0',
-          );
-        },
+        // Preview the sheet over the current screen; dismissing (tap-outside /
+        // Continue) just closes it and returns here, without navigating away.
+        onTap: () => showUpdateBottomSheet(
+          context: navigatorKey.currentContext!,
+          version: '0.0.0',
+        ),
+      ),
+      _ActionCard(
+        icon: KasyIcons.download,
+        title: admin.preview_update_available,
+        // Previews the optional (dismissible) sheet so the design can be
+        // reviewed without TestFlight or Remote Config. The forced variant is
+        // the same layout, blocking — test it via app_min_version.
+        onTap: () => showUpdateAvailableSheet(
+          navigatorKey.currentContext!,
+          forced: false,
+        ),
       ),
       _ActionCard(
         icon: KasyIcons.payment,
@@ -1124,6 +1137,8 @@ class _ToolsTab extends ConsumerWidget {
       _ActionCard(
         icon: KasyIcons.star,
         title: admin.ask_review,
+        // Has a design (the review dialog), so it's previewable on web too —
+        // only the store action no-ops there.
         onTap: () => showReviewDialog(context, ref, force: true),
       ),
       _ActionCard(
@@ -1141,29 +1156,51 @@ class _ToolsTab extends ConsumerWidget {
           Clipboard.setData(
             ClipboardData(text: userState.user.idOrNull ?? 'no-id (guest)'),
           );
-          ref.read(toastProvider).alert(title: '', text: admin.user_id_copied);
+          ref.read(toastProvider).alert(
+                title: t.common.copied,
+                text: admin.user_id_copied,
+              );
         },
       ),
       _ActionCard(
         icon: KasyIcons.notification,
         title: admin.copy_fcm_token,
         onTap: () async {
+          if (kIsWeb) {
+            ref.read(toastProvider).alert(
+                  title: t.common.native_only_title,
+                  text: admin.native_only,
+                );
+            return;
+          }
           final token = await FirebaseMessaging.instance.getToken();
           if (token == null) {
             ref.read(toastProvider).alert(
-                  title: '',
+                  title: t.common.unavailable,
                   text: admin.fcm_token_unavailable,
                 );
             return;
           }
           await Clipboard.setData(ClipboardData(text: token));
-          ref.read(toastProvider).alert(title: '', text: admin.fcm_token_copied);
+          ref.read(toastProvider).alert(
+                title: t.common.copied,
+                text: admin.fcm_token_copied,
+              );
         },
       ),
       _ActionCard(
         icon: KasyIcons.notificationActive,
         title: admin.ask_notification,
-        onTap: () => ref.read(notificationsSettingsProvider).askPermission(),
+        onTap: () {
+          if (kIsWeb) {
+            ref.read(toastProvider).alert(
+                  title: t.common.native_only_title,
+                  text: admin.native_only,
+                );
+            return;
+          }
+          ref.read(notificationsSettingsProvider).askPermission();
+        },
       ),
     ];
 

package/templates/firebase/lib/features/settings/ui/components/admin/admin_users_tab.dart

@@ -613,11 +613,9 @@ class _HeaderCell extends StatelessWidget {
                 label.toUpperCase(),
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
-                style: context.textTheme.labelSmall?.copyWith(
+                style: context.kasyTextTheme.sectionLabel.copyWith(
                   color: color,
                   letterSpacing: 0.8,
-                  fontWeight: FontWeight.w700,
-                  fontSize: 10.5,
                 ),
               ),
             ),
@@ -666,6 +664,9 @@ class _TableBody extends StatelessWidget {
       children: [
         Expanded(
           child: ListView.separated(
+            // Scrolling the results means the user stopped typing in the search
+            // field above, so dismiss the keyboard to show more of the list.
+            keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
             padding: const EdgeInsets.only(bottom: KasySpacing.xs),
             itemCount: users.length,
             separatorBuilder: (_, _) => Divider(
@@ -957,15 +958,14 @@ class _UserRow extends StatelessWidget {
                         primaryText,
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: isAnonymous
-                              ? context.colors.muted
-                              : context.colors.onSurface,
-                          fontWeight:
-                              isAnonymous ? FontWeight.w400 : FontWeight.w600,
-                          fontStyle:
-                              isAnonymous ? FontStyle.italic : FontStyle.normal,
-                        ),
+                        style: isAnonymous
+                            ? context.textTheme.bodyMedium?.copyWith(
+                                color: context.colors.muted,
+                                fontStyle: FontStyle.italic,
+                              )
+                            : context.kasyTextTheme.rowTitle.copyWith(
+                                color: context.colors.onSurface,
+                              ),
                       ),
                       if (subText != null) ...[
                         const SizedBox(height: 1),

package/templates/firebase/lib/features/settings/ui/components/admin/send_push_notification_page.dart

@@ -182,11 +182,8 @@ class _SendPushNotificationPageState
                             ),
                             child: Text(
                               tr.send_push_preview_label.toUpperCase(),
-                              style: context.textTheme.labelMedium?.copyWith(
+                              style: context.kasyTextTheme.sectionLabel.copyWith(
                                 color: context.colors.muted,
-                                letterSpacing: 1.2,
-                                fontWeight: FontWeight.w700,
-                                fontSize: 12,
                               ),
                             ),
                           ),

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

@@ -97,8 +97,8 @@ class _EditableUserAvatarState extends ConsumerState<EditableUserAvatar> {
               child: Container(
                 width: 22,
                 height: 22,
-                decoration: const BoxDecoration(
-                  color: Color(0x99000000),
+                decoration: BoxDecoration(
+                  color: Colors.black.withValues(alpha: 0.6),
                   shape: BoxShape.circle,
                 ),
                 child: const Icon(

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

@@ -0,0 +1,141 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/features/authentication/repositories/authentication_repository.dart';
+import 'package:kasy_kit/i18n/translations.g.dart';
+
+/// Opens the "create password" bottom sheet. Lets a social-only user (Google,
+/// Apple, ...) set a password so they can also sign in with email + password.
+/// The account stays the same (no duplicate). Shows a success toast on the
+/// calling [context] when done.
+Future<void> showCreatePasswordSheet(BuildContext context) async {
+  final bool? saved = await showKasyBottomSheet<bool>(
+    context: context,
+    isScrollControlled: true,
+    builder: (_) => const _CreatePasswordSheet(),
+  );
+  if (saved == true && context.mounted) {
+    showKasyToast(
+      context,
+      title: context.t.settings.create_password_success,
+      tone: KasyToastTone.success,
+    );
+  }
+}
+
+class _CreatePasswordSheet extends ConsumerStatefulWidget {
+  const _CreatePasswordSheet();
+
+  @override
+  ConsumerState<_CreatePasswordSheet> createState() =>
+      _CreatePasswordSheetState();
+}
+
+class _CreatePasswordSheetState extends ConsumerState<_CreatePasswordSheet> {
+  final _passwordController = TextEditingController();
+  final _confirmController = TextEditingController();
+  bool _saving = false;
+  String? _error;
+
+  static const int _minLength = 6;
+
+  @override
+  void dispose() {
+    _passwordController.dispose();
+    _confirmController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _save() async {
+    if (_saving) return;
+    final tr = context.t.settings;
+    final password = _passwordController.text;
+    if (password.length < _minLength) {
+      setState(() => _error = tr.create_password_too_short);
+      return;
+    }
+    if (password != _confirmController.text) {
+      setState(() => _error = tr.create_password_mismatch);
+      return;
+    }
+    setState(() {
+      _saving = true;
+      _error = null;
+    });
+    try {
+      await ref.read(authRepositoryProvider).setPassword(password);
+      if (!mounted) return;
+      // Toast is shown by the launcher on the page context (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.create_password_error,
+        tone: KasyToastTone.danger,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tr = context.t.settings;
+    return KasyBottomSheet(
+      title: tr.create_password_title,
+      addKeyboardInset: true,
+      body: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Text(
+            tr.create_password_subtitle,
+            style: context.textTheme.bodyMedium?.copyWith(
+              color: context.colors.muted,
+            ),
+          ),
+          const SizedBox(height: KasySpacing.md),
+          KasyTextField(
+            controller: _passwordController,
+            label: tr.create_password_field,
+            contentType: KasyTextFieldContentType.password,
+            textInputAction: TextInputAction.next,
+          ),
+          const SizedBox(height: KasySpacing.sm),
+          KasyTextField(
+            controller: _confirmController,
+            label: tr.create_password_confirm_label,
+            contentType: KasyTextFieldContentType.password,
+            textInputAction: TextInputAction.done,
+            onSubmitted: (_) => _save(),
+          ),
+          if (_error != null) ...[
+            const SizedBox(height: KasySpacing.sm),
+            Text(
+              _error!,
+              style: context.textTheme.bodySmall?.copyWith(
+                color: context.colors.error,
+              ),
+            ),
+          ],
+        ],
+      ),
+      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

@@ -95,7 +95,6 @@ class LanguageSwitcher extends ConsumerWidget {
                 child: Text(
                   sheetTitle,
                   style: sheetContext.textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.w600,
                     color: sheetContext.colors.onSurface,
                   ),
                 ),