kasy-cli 1.34.0 → 1.35.0

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

@@ -1,9 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:kasy_kit/components/kasy_card.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
 
-/// Here is just a simple content card
+/// A tappable admin panel card. Uses the design-system [KasyCard] (elevated
+/// surface, hairline border, soft shadow) with a compact title / description
+/// and a trailing chevron, so admin tools read like the rest of the app
+/// instead of a flat tinted block.
 class AdminPanelCard extends StatelessWidget {
   final VoidCallback onTap;
   final String title;
@@ -22,45 +25,46 @@ class AdminPanelCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    void handleActivate() {
-      KasyHaptics.medium(context);
-      onTap.call();
-    }
-
-    return KasyFocusRing(
-      onActivate: handleActivate,
-      borderRadius: BorderRadius.circular(KasyRadius.sm),
-      child: InkWell(
-        canRequestFocus: false,
-        onTap: handleActivate,
-        child: Card(
-        color: backgroundColor ?? context.colors.primary.withValues(alpha: .15),
-        margin: EdgeInsets.zero,
-        elevation: 0,
-        child: Padding(
-          padding: const EdgeInsets.all(KasySpacing.md),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            spacing: 8,
-            children: [
-              Text(
-                title,
-                style: context.textTheme.headlineSmall?.copyWith(
-                  color: textColor ?? context.colors.onSurface,
+    return KasyCard(
+      onTap: () {
+        KasyHaptics.medium(context);
+        onTap();
+      },
+      color: backgroundColor,
+      borderRadius: KasyRadius.lgBorderRadius,
+      padding: const EdgeInsets.all(KasySpacing.md),
+      semanticLabel: title,
+      child: Row(
+        children: [
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  title,
+                  style: context.kasyTextTheme.cardTitle.copyWith(
+                    color: textColor ?? context.colors.onSurface,
+                  ),
                 ),
-              ),
-              Text(
-                description,
-                style: context.textTheme.bodyMedium?.copyWith(
-                  color:
-                      textColor ??
-                      context.colors.onSurface.withValues(alpha: .6),
+                const SizedBox(height: 2),
+                Text(
+                  description,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    color: textColor ?? context.colors.muted,
+                    height: 1.35,
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
+          ),
+          const SizedBox(width: KasySpacing.sm),
+          Icon(
+            KasyIcons.arrowForwardIos,
+            size: KasyIconSize.xs,
+            color: context.colors.muted,
           ),
-        ),
-        ),
+        ],
       ),
     );
   }

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

@@ -140,12 +140,16 @@ class SettingsSwitchTile extends StatelessWidget {
   }
 }
 
-/// This widget is used to show a settings tile with an icon and a title
+/// This widget is used to show a settings tile with an icon and a title.
+/// Optionally shows a [trailingLabel] value before the chevron — mirrors the
+/// pattern of [LanguageSwitcher] where the current value appears on the right.
 class SettingsTile extends StatelessWidget {
   final IconData icon;
   final String title;
   final SettingsTileOnTap onTap;
   final Color? iconBackgroundColor;
+  final String? trailingLabel;
+  final Widget? trailingWidget;
 
   const SettingsTile({
     super.key,
@@ -153,6 +157,8 @@ class SettingsTile extends StatelessWidget {
     required this.title,
     required this.onTap,
     this.iconBackgroundColor,
+    this.trailingLabel,
+    this.trailingWidget,
   });
 
   @override
@@ -184,7 +190,16 @@ class SettingsTile extends StatelessWidget {
               ),
             ),
           ),
-          const SettingsListChevron(),
+          if (trailingLabel != null) ...[
+            Text(
+              trailingLabel!,
+              style: context.textTheme.bodyMedium?.copyWith(
+                color: context.colors.muted,
+              ),
+            ),
+            const SizedBox(width: KasySpacing.xs),
+          ],
+          trailingWidget ?? const SettingsListChevron(),
         ],
       ),
     );

package/templates/firebase/lib/features/subscriptions/api/entities/subscription_entity.dart

@@ -44,6 +44,9 @@ sealed class SubscriptionEntity with _$SubscriptionEntity {
     @JsonKey(name: 'expiration_date')
     @TimestampConverter()
     DateTime? periodEndDate,
+    @JsonKey(name: 'trial_end')
+    @TimestampConverter()
+    DateTime? trialEnd,
     @JsonKey(name: 'status') required SubscriptionStatus status,
     // Origin of the subscription (apple/play/stripe/...). Nullable + tolerant
     // parsing so old records (no `store`) and future values never break.

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
@@ -121,15 +122,13 @@ class StripeProduct implements SubscriptionProduct {
     }
   }
 
-  String _formatMoney(double value) {
-    final amount = value.toStringAsFixed(2);
-    if (currency == 'USD') return "\$$amount";
-    if (currency == 'EUR') return "$amount€";
-    return "$amount $currency";
-  }
+  String _formatMoney(double value, {String? locale}) =>
+      NumberFormat.simpleCurrency(locale: locale, name: _currency.toUpperCase())
+          .format(value);
 
   @override
   String formattedPrice(BuildContext context) {
+    final locale = Localizations.localeOf(context).toString();
     final translatedDuration = switch (durationType) {
       DurationType.week => Translations.of(context).premium.duration_weekly,
       DurationType.year => Translations.of(context).premium.duration_annual,
@@ -139,16 +138,17 @@ class StripeProduct implements SubscriptionProduct {
       ).premium.duration_lifetime,
       _ => "",
     };
-    return "$priceString $translatedDuration";
+    return "${_formatMoney(price, locale: locale)} $translatedDuration";
   }
 
   @override
   String pricePerMonth(BuildContext context) {
+    final locale = Localizations.localeOf(context).toString();
     final translatedDuration = Translations.of(
       context,
     ).premium.duration_monthly;
     if (durationType == DurationType.lifetime) {
-      return priceString;
+      return _formatMoney(price, locale: locale);
     }
     final monthly = switch (durationType) {
       DurationType.year => price / 12,
@@ -157,14 +157,15 @@ class StripeProduct implements SubscriptionProduct {
       DurationType.week => (price * 4) / 12,
       _ => price,
     };
-    return "${_formatMoney(monthly)}/$translatedDuration";
+    return "${_formatMoney(monthly, locale: locale)}/$translatedDuration";
   }
 
   @override
   String? pricePerYear(BuildContext context) {
+    final locale = Localizations.localeOf(context).toString();
     final translatedDuration = Translations.of(context).premium.duration_annual;
     if (durationType == DurationType.lifetime) {
-      return priceString;
+      return _formatMoney(price, locale: locale);
     }
     final yearly = switch (durationType) {
       DurationType.year => price,
@@ -173,6 +174,6 @@ class StripeProduct implements SubscriptionProduct {
       DurationType.week => (price * 4) * 12,
       _ => price * 12,
     };
-    return "${_formatMoney(yearly)}/$translatedDuration";
+    return "${_formatMoney(yearly, locale: locale)}/$translatedDuration";
   }
 }

package/templates/firebase/lib/features/subscriptions/repositories/subscription_repository.dart

@@ -86,11 +86,19 @@ class SubscriptionRepository implements OnStartService {
       final product = await _inAppSubscriptionApi.getFromProductId(
         entity!.skuId,
       );
-      
+
+      // When the payment provider has no entitlement data (e.g. Stripe returns
+      // an empty list), synthesize one from the backend entity so the UI can
+      // show trial status, expiration date and renewal info.
+      final effectiveEntitlements =
+          (entitlements == null || entitlements.isEmpty)
+          ? _entitlementsFromEntity(entity)
+          : entitlements;
+
       return switch(subscription) {
         final SubscriptionStateData active => active.copyWith(
           activeOffer: product,
-          entitlements: entitlements,
+          entitlements: effectiveEntitlements,
         ),
         _ => subscription,
       };
@@ -109,6 +117,21 @@ class SubscriptionRepository implements OnStartService {
     return subscription;
   }
 
+  List<Entitlement> _entitlementsFromEntity(SubscriptionEntity entity) {
+    final now = DateTime.now();
+    final trialEnd = entity.trialEnd;
+    final isInTrial = trialEnd != null && trialEnd.isAfter(now);
+    final willRenew = entity.status != SubscriptionStatus.CANCELLED;
+    return [
+      Entitlement(
+        identifier: entity.skuId,
+        isInTrial: isInTrial,
+        willRenew: willRenew,
+        expirationDate: isInTrial ? trialEnd : entity.periodEndDate,
+      ),
+    ];
+  }
+
   // We can have multiple offers (BASIC MONTH, BASIC YEAR, GOLD MONTH, GOLD YEAR, ...)
   Future<List<SubscriptionProduct>> getOffers({String? offerId}) {
     return _inAppSubscriptionApi.getOffers(offerId);