kasy-cli 1.37.1 → 1.39.0

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

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:kasy_kit/components/kasy_avatar.dart';
+import 'package:kasy_kit/components/kasy_bottom_sheet.dart';
 import 'package:kasy_kit/core/data/entities/upload_result.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/data/repositories/user_repository.dart';
@@ -12,6 +13,7 @@ import 'package:kasy_kit/core/states/models/user_state.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_focus_ring.dart';
+import 'package:kasy_kit/core/widgets/kasy_hover.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/avatar_utils.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/round_progress.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
@@ -65,7 +67,7 @@ class _EditableUserAvatarState extends ConsumerState<EditableUserAvatar> {
     return KasyFocusRing(
       enabled: onTapAvatar != null,
       onActivate: onTapAvatar,
-      borderRadius: BorderRadius.circular(999),
+      borderRadius: BorderRadius.circular(KasyRadius.full),
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: onTapAvatar,
@@ -144,14 +146,10 @@ class _EditableUserAvatarState extends ConsumerState<EditableUserAvatar> {
     BuildContext context, {
     required bool hasAvatar,
   }) {
-    return showModalBottomSheet<_AvatarAction>(
+    return showKasyBottomSheet<_AvatarAction>(
       context: context,
-      useRootNavigator: true,
-      backgroundColor: context.colors.surface,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      builder: (sheetContext) => SafeArea(
+      builder: (sheetContext) => KasySheetSurface(
+        showDragHandle: false,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
           child: Column(
@@ -321,31 +319,26 @@ class _BottomSheetTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final Color fg = color ?? context.colors.onSurface;
-    return KasyFocusRing(
-      onActivate: onTap,
+    return KasyHover(
+      onTap: onTap,
+      focusable: true,
+      focusGapColor: context.colors.surface,
       borderRadius: BorderRadius.circular(KasyRadius.sm),
-      gapColor: context.colors.surface,
-      child: InkWell(
-        canRequestFocus: false,
-        onTap: onTap,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(
-            horizontal: KasySpacing.md,
-            vertical: KasySpacing.smd,
-          ),
-          child: Row(
-            children: [
-              if (icon != null) ...[
-                Icon(icon, size: KasyIconSize.lg, color: fg),
-                const SizedBox(width: KasySpacing.sm),
-              ],
-              Text(
-                label,
-                style: context.textTheme.bodyLarge?.copyWith(color: fg),
-              ),
-            ],
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
+      child: Row(
+        children: [
+          if (icon != null) ...[
+            Icon(icon, size: KasyIconSize.lg, color: fg),
+            const SizedBox(width: KasySpacing.sm),
+          ],
+          Text(
+            label,
+            style: context.textTheme.bodyLarge?.copyWith(color: fg),
           ),
-        ),
+        ],
       ),
     );
   }

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

@@ -4,6 +4,7 @@ import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
+import 'package:kasy_kit/router.dart';
 
 class DeleteUserButton extends ConsumerWidget {
   const DeleteUserButton({super.key});
@@ -40,7 +41,14 @@ class DeleteUserButton extends ConsumerWidget {
             }
           }
         },
-        );
+        ).whenComplete(() {
+          // Same pageless-dialog issue as logout: on success deleteAccount flips
+          // the state to anonymous while this confirm dialog still sits on the
+          // root navigator, so the redirect to /signin can't land. Re-run it
+          // once the dialog has popped. Harmless when the user cancels or the
+          // deletion failed (still authenticated → redirect keeps them here).
+          if (context.mounted) ref.read(goRouterProvider).refresh();
+        });
       },
     );
   }

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

@@ -2,10 +2,11 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/components/kasy_bottom_sheet.dart';
 import 'package:kasy_kit/core/home_widgets/home_widget_mywidget_service.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
+import 'package:kasy_kit/core/widgets/kasy_hover.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
 import 'package:kasy_kit/i18n/app_locale_display.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
@@ -18,41 +19,41 @@ class LanguageSwitcher extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final AppLocale current = TranslationProvider.of(context).locale;
-    return KasyFocusRing(
-      onActivate: () => _showLanguagePicker(context, ref, current),
-      borderRadius: KasyRadius.smBorderRadius,
-      child: InkWell(
-        canRequestFocus: false,
-        onTap: () => _showLanguagePicker(context, ref, current),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
-          child: Row(
-            children: <Widget>[
-              Icon(
-                KasyIcons.language,
-                size: KasyIconSize.rowLeading,
+    return KasyHover(
+      onTap: () => _showLanguagePicker(context, ref, current),
+      focusable: true,
+      // Rectangular highlight (KasyHover default): this row lives inside a card,
+      // whose rounded corners clip the ends — a rounded fill here would float.
+      semanticLabel: context.t.settings.language_title,
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
+      child: Row(
+        children: <Widget>[
+          Icon(
+            KasyIcons.language,
+            size: KasyIconSize.rowLeading,
+            color: context.colors.onSurface,
+          ),
+          const SizedBox(width: KasySpacing.sm),
+          Expanded(
+            child: Text(
+              context.t.settings.language_title,
+              style: context.kasyTextTheme.listRowTitle.copyWith(
                 color: context.colors.onSurface,
               ),
-              const SizedBox(width: KasySpacing.sm),
-              Expanded(
-                child: Text(
-                  context.t.settings.language_title,
-                  style: context.textTheme.titleSmall?.copyWith(
-                    color: context.colors.onSurface,
-                  ),
-                ),
-              ),
-              Text(
-                current.nativeName,
-                style: context.textTheme.bodyMedium?.copyWith(
-                  color: context.colors.muted,
-                ),
-              ),
-              const SizedBox(width: KasySpacing.xs),
-              const SettingsListChevron(),
-            ],
+            ),
           ),
-        ),
+          Text(
+            current.nativeName,
+            style: context.kasyTextTheme.listRowValue.copyWith(
+              color: context.colors.muted,
+            ),
+          ),
+          const SizedBox(width: KasySpacing.xs),
+          const SettingsListChevron(),
+        ],
       ),
     );
   }
@@ -63,39 +64,26 @@ class LanguageSwitcher extends ConsumerWidget {
     AppLocale current,
   ) {
     final String sheetTitle = context.t.settings.language_title;
-    showModalBottomSheet<void>(
+    showKasyBottomSheet<void>(
       context: context,
-      useRootNavigator: true,
-      backgroundColor: context.colors.surface,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(KasyRadius.lg)),
-      ),
-      builder: (sheetContext) => SafeArea(
+      builder: (sheetContext) => KasySheetSurface(
         child: Padding(
-          padding: const EdgeInsets.fromLTRB(
-            KasySpacing.md,
-            KasySpacing.sm,
-            KasySpacing.md,
-            KasySpacing.sm,
-          ),
+          // No horizontal padding: option rows go full-bleed so the highlight
+          // spans the whole sheet (no inset pill). Title and rows carry their
+          // own horizontal inset instead.
+          padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
-              Container(
-                width: 36,
-                height: 4,
-                margin: const EdgeInsets.only(bottom: KasySpacing.md),
-                decoration: BoxDecoration(
-                  color: sheetContext.colors.onSurface.withValues(alpha: 0.18),
-                  borderRadius: BorderRadius.circular(2),
-                ),
-              ),
-              Align(
-                alignment: Alignment.centerLeft,
-                child: Text(
-                  sheetTitle,
-                  style: sheetContext.textTheme.titleMedium?.copyWith(
-                    color: sheetContext.colors.onSurface,
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
+                child: Align(
+                  alignment: Alignment.centerLeft,
+                  child: Text(
+                    sheetTitle,
+                    style: sheetContext.textTheme.titleMedium?.copyWith(
+                      color: sheetContext.colors.onSurface,
+                    ),
                   ),
                 ),
               ),
@@ -156,42 +144,36 @@ class _LocaleOptionTile extends StatelessWidget {
     final Color primary = context.colors.primary;
     final Color fg = isSelected ? primary : context.colors.onSurface;
 
-    return KasyFocusRing(
-      onActivate: onTap,
-      borderRadius: BorderRadius.circular(KasyRadius.sm),
-      child: InkWell(
-        canRequestFocus: false,
-        onTap: onTap,
-        borderRadius: BorderRadius.circular(KasyRadius.sm),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(
-            horizontal: KasySpacing.xs,
-            vertical: KasySpacing.smd,
-          ),
-          child: Row(
-            children: <Widget>[
-              Expanded(
-                child: Text(
-                  locale.nativeName,
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    color: fg,
-                    fontWeight:
-                        isSelected ? FontWeight.w600 : FontWeight.w400,
-                  ),
-                ),
+    return KasyHover(
+      onTap: onTap,
+      focusable: true,
+      // Full-bleed rectangular highlight (default radius): the sheet rounds its
+      // own corners, so options span edge-to-edge like a native menu/list.
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
+      child: Row(
+        children: <Widget>[
+          Expanded(
+            child: Text(
+              locale.nativeName,
+              style: context.textTheme.bodyLarge?.copyWith(
+                color: fg,
+                fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
               ),
-              if (isSelected)
-                Container(
-                  width: 10,
-                  height: 10,
-                  decoration: BoxDecoration(
-                    color: primary,
-                    shape: BoxShape.circle,
-                  ),
-                ),
-            ],
+            ),
           ),
-        ),
+          if (isSelected)
+            Container(
+              width: 10,
+              height: 10,
+              decoration: BoxDecoration(
+                color: primary,
+                shape: BoxShape.circle,
+              ),
+            ),
+        ],
       ),
     );
   }

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/core/widgets/kasy_hover.dart';
 
 /// Row used in settings modal bottom sheets (avatar source, language, etc.).
 class SettingsBottomSheetOptionTile extends StatelessWidget {
@@ -26,26 +27,28 @@ class SettingsBottomSheetOptionTile extends StatelessWidget {
     final TextStyle? labelStyle =
         context.textTheme.titleMedium?.copyWith(color: fg);
     final Text labelWidget = Text(label, style: labelStyle);
-    return InkWell(
+    return KasyHover(
       onTap: onTap,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(
-          horizontal: KasySpacing.md,
-          vertical: KasySpacing.smd,
-        ),
-        child: Row(
-          children: <Widget>[
-            if (leading != null) ...<Widget>[
-              leading!,
-              const SizedBox(width: KasySpacing.sm),
-            ] else if (icon != null) ...<Widget>[
-              Icon(icon, size: KasyIconSize.lg, color: fg),
-              const SizedBox(width: KasySpacing.sm),
-            ],
-            Expanded(child: labelWidget),
-            if (trailing != null) trailing!,
+      focusable: true,
+      semanticLabel: label,
+      // Full-bleed rectangular highlight (default radius): these rows live in a
+      // bottom sheet whose rounded corners clip the ends, like a native menu.
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
+      child: Row(
+        children: <Widget>[
+          if (leading != null) ...<Widget>[
+            leading!,
+            const SizedBox(width: KasySpacing.sm),
+          ] else if (icon != null) ...<Widget>[
+            Icon(icon, size: KasyIconSize.lg, color: fg),
+            const SizedBox(width: KasySpacing.sm),
           ],
-        ),
+          Expanded(child: labelWidget),
+          if (trailing != null) trailing!,
+        ],
       ),
     );
   }

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

@@ -26,7 +26,7 @@ class SettingsIconBadge extends StatelessWidget {
       height: size,
       decoration: BoxDecoration(
         color: color.withValues(alpha: 0.12),
-        borderRadius: BorderRadius.circular(8),
+        borderRadius: BorderRadius.circular(KasyRadius.sm),
       ),
       child: Icon(
         icon,
@@ -65,7 +65,17 @@ class SettingsDivider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Divider(color: context.colors.onBackground.withValues(alpha: .06));
+    // Inset to align with the rows' content (which now carry the horizontal
+    // padding the card used to have), so the hairline doesn't touch the edges.
+    return Divider(
+      // Hairline only — no extra height — so rows sit close together (iOS-style
+      // contiguous list) instead of floating apart with a 16px gap.
+      height: 1,
+      thickness: 1,
+      color: context.colors.onBackground.withValues(alpha: .06),
+      indent: KasySpacing.md,
+      endIndent: KasySpacing.md,
+    );
   }
 }
 
@@ -91,7 +101,10 @@ class SettingsSwitchTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
       child: Row(
         children: <Widget>[
           if (iconBackgroundColor != null)
@@ -110,7 +123,7 @@ class SettingsSwitchTile extends StatelessWidget {
               children: <Widget>[
                 Text(
                   title,
-                  style: context.textTheme.titleSmall?.copyWith(
+                  style: context.kasyTextTheme.listRowTitle.copyWith(
                     color: context.colors.onSurface,
                   ),
                 ),
@@ -165,12 +178,14 @@ class SettingsTile extends StatelessWidget {
   Widget build(BuildContext context) {
     return KasyHover(
       onTap: onTap,
-      hoverEnabled: false,
-      pressEnabled: false,
       focusable: true,
-      borderRadius: KasyRadius.smBorderRadius,
+      // Rectangular highlight (default): the card clips the rounded ends, so
+      // middle rows stay square instead of showing a floating rounded pill.
       semanticLabel: title,
-      padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.smd,
+      ),
       child: Row(
         children: [
           if (iconBackgroundColor != null)
@@ -185,7 +200,7 @@ class SettingsTile extends StatelessWidget {
           Expanded(
             child: Text(
               title,
-              style: context.textTheme.titleSmall?.copyWith(
+              style: context.kasyTextTheme.listRowTitle.copyWith(
                 color: context.colors.onSurface,
               ),
             ),
@@ -193,7 +208,7 @@ class SettingsTile extends StatelessWidget {
           if (trailingLabel != null) ...[
             Text(
               trailingLabel!,
-              style: context.textTheme.bodyMedium?.copyWith(
+              style: context.kasyTextTheme.listRowValue.copyWith(
                 color: context.colors.muted,
               ),
             ),