kasy-cli 1.34.0 → 1.35.0

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

@@ -1,19 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
 import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
+import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
+import 'package:kasy_kit/features/subscriptions/providers/premium_page_provider.dart';
 import 'package:kasy_kit/features/subscriptions/shared/subscription_management.dart';
-import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_background.dart';
-import 'package:kasy_kit/features/subscriptions/ui/widgets/premium_card.dart';
-import 'package:kasy_kit/features/subscriptions/ui/widgets/unsubscribe_feedback_popup.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
 typedef OnTapUnSubscribe = void Function(String reason);
 typedef OnExit = void Function();
 
 class ActivePremiumContent extends ConsumerStatefulWidget {
+  // kept for API compatibility — the manage flow no longer uses a feedback
+  // reason collected here; PremiumPage still wires this for legacy callers.
   final OnTapUnSubscribe? onTap;
   final OnExit? onExit;
 
@@ -25,171 +28,344 @@ class ActivePremiumContent extends ConsumerStatefulWidget {
 }
 
 class _ActivePremiumContentState extends ConsumerState<ActivePremiumContent> {
-  bool _isPopupShowing = false;
+  bool _isManaging = false;
+  bool _isRestoring = false;
 
-  /// Decide where the subscription can be managed. If it was bought on another
-  /// platform (e.g. on the web via Stripe while the user is now on iOS), we must
-  /// not link out to an external provider (App Store / Play Store policy) — show
-  /// an info dialog with a "restore purchases" action instead of the cancel flow.
-  Future<void> _handleManageTap(BuildContext context) async {
+  void _goBack() {
+    if (widget.onExit != null) {
+      widget.onExit!();
+    } else if (context.canPop()) {
+      context.pop();
+    } else {
+      context.go('/');
+    }
+  }
+
+  /// Opens the subscription management interface for the current platform.
+  /// On iOS/Android with RevenueCat → App Store / Play Store subscriptions page.
+  /// On web with Stripe → Stripe Customer Portal.
+  /// Cross-platform mismatch → informational dialog (subscription managed elsewhere).
+  Future<void> _handleManageTap() async {
     final store = ref.read(userStateNotifierProvider).subscription?.store;
+    final t = Translations.of(context).activePremium;
+
     if (resolveManageLocation(store) == ManageLocation.elsewhere) {
-      final t = Translations.of(context).activePremium;
-      await showKasyConfirmDialog(
-        context,
-        title: t.managed_elsewhere_title,
-        message: t.managed_elsewhere_description,
-        cancelLabel: t.cancel_button,
-        confirmLabel: t.restore_button,
-        onConfirm: () {
-          ref.read(userStateNotifierProvider.notifier).refreshSubscription();
-        },
+      await showKasyBlurDialog<void>(
+        context: context,
+        builder: (dialogCtx) => KasyDialog(
+          leadingIcon: KasyIcons.payment,
+          iconTone: KasyDialogIconTone.info,
+          title: t.managed_elsewhere_title,
+          message: t.managed_elsewhere_description,
+          showCloseButton: false,
+          confirmLabel: t.cancel_button,
+          onConfirm: () => Navigator.of(dialogCtx).pop(),
+        ),
       );
       return;
     }
-    await _showUnsubscribePopup(context);
+
+    if (_isManaging) return;
+    setState(() => _isManaging = true);
+    try {
+      await ref.read(premiumStateProvider.notifier).unsubscribe();
+    } finally {
+      if (mounted) setState(() => _isManaging = false);
+    }
   }
 
-  Future<void> _showUnsubscribePopup(BuildContext context) async {
-    if (_isPopupShowing) return;
-    setState(() => _isPopupShowing = true);
+  /// Re-syncs the subscription from RevenueCat / Stripe backend.
+  Future<void> _handleRestoreTap() async {
+    if (_isRestoring) return;
+    setState(() => _isRestoring = true);
     try {
-      await UnsubscribeFeedbackPopup.show(
-        context: context,
-        onConfirm: (String reason) {
-          Navigator.of(context).pop();
-          widget.onTap?.call(reason);
-        },
-        onCancel: () {},
+      await ref
+          .read(userStateNotifierProvider.notifier)
+          .refreshSubscription();
+      if (!mounted) return;
+      showKasyToast(
+        context,
+        title: Translations.of(context).premium.restore_success_title,
+        tone: KasyToastTone.success,
       );
     } finally {
-      if (mounted) setState(() => _isPopupShowing = false);
+      if (mounted) setState(() => _isRestoring = false);
     }
   }
 
   @override
   Widget build(BuildContext context) {
     final userState = ref.watch(userStateNotifierProvider);
+    final t = Translations.of(context).activePremium;
+    final sub = userState.subscription;
+    final activeData = sub is SubscriptionStateData ? sub : null;
+    final planName = activeData?.activeOffer?.title ?? t.plan_fallback;
+    final price = activeData?.activeOffer?.price;
+    final currency = activeData?.activeOffer?.currency;
+    final entitlement = activeData?.entitlements?.firstOrNull;
+    final expirationDate = entitlement?.expirationDate;
+    final willRenew = entitlement?.willRenew ?? false;
+    final isInTrial = entitlement?.isInTrial ?? false;
+
+    return KasyOverlayScaffold(
+      title: t.billing_title,
+      onBack: _goBack,
+      slivers: [
+        SliverToBoxAdapter(
+          child: Padding(
+            // Horizontal gutter already comes from KasyOverlayScaffold; keep
+            // only vertical spacing here so the side padding matches the
+            // Notifications screen (a single gutter, not doubled).
+            padding: const EdgeInsets.fromLTRB(
+              0,
+              KasySpacing.sm,
+              0,
+              KasySpacing.xxl,
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                // ── Plan info ─────────────────────────────────────────────
+                _SectionLabel(t.plan_label),
+                const SizedBox(height: KasySpacing.xs),
+                _PlanCard(
+                  planName: planName,
+                  price: price,
+                  currency: currency,
+                  expirationDate: expirationDate,
+                  willRenew: willRenew,
+                  isLifetime: sub?.isLifetime ?? false,
+                  isInTrial: isInTrial,
+                ),
+
+                const SizedBox(height: KasySpacing.xl),
+
+                // ── Actions ───────────────────────────────────────────────
+                _ActionsCard(
+                  onManage: _isManaging ? null : _handleManageTap,
+                  onRestore: _handleRestoreTap,
+                  isManaging: _isManaging,
+                  isRestoring: _isRestoring,
+                  manageLabel: t.manage_subscription,
+                  restoreLabel: t.restore_purchases,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+// ─── Private sub-widgets ──────────────────────────────────────────────────────
 
-    return PremiumBackground(
-      bgImagePath: "assets/images/premium-bg.jpg",
-      child: Scaffold(
-        backgroundColor: Colors.transparent,
-        appBar: AppBar(
-          backgroundColor: Colors.transparent,
-          elevation: 0,
-          foregroundColor: context.colors.onPrimary,
-          leading: widget.onExit != null
-              ? KasyButton.iconOnly(
-                  icon: KasyIcons.close,
-                  variant: KasyButtonVariant.ghost,
-                  foregroundColor: context.colors.onPrimary,
-                  onPressed: widget.onExit,
-                  semanticLabel:
-                      MaterialLocalizations.of(context).closeButtonTooltip,
-                )
-              : null,
-          automaticallyImplyLeading: widget.onExit == null,
+class _SectionLabel extends StatelessWidget {
+  final String label;
+  const _SectionLabel(this.label);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: KasySpacing.xs),
+      child: Text(
+        label,
+        style: context.kasyTextTheme.sectionLabel.copyWith(
+          color: context.colors.muted,
         ),
-        body: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: KasySpacing.pageHorizontalGutter),
-              child: PremiumCard(
-                bgColor: context.colors.onBackground.withValues(alpha: .54),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.only(bottom: KasySpacing.sm),
-                      child: Chip(
-                        backgroundColor: context.colors.primary,
-                        label: Text(
-                          "ACTIVE",
-                          style: GoogleFonts.albertSans(
-                            fontSize: 12,
-                            fontWeight: FontWeight.w700,
-                            color: context.colors.onPrimary,
-                          ),
-                        ),
-                      ),
+      ),
+    );
+  }
+}
+
+class _PlanCard extends StatelessWidget {
+  final String planName;
+  final double? price;
+  final String? currency;
+  final DateTime? expirationDate;
+  final bool willRenew;
+  final bool isLifetime;
+  final bool isInTrial;
+
+  const _PlanCard({
+    required this.planName,
+    required this.price,
+    required this.currency,
+    required this.expirationDate,
+    required this.willRenew,
+    required this.isLifetime,
+    required this.isInTrial,
+  });
+
+  String? _formattedPrice(BuildContext context) {
+    if (price == null || currency == null || isLifetime) return null;
+    final locale = Localizations.localeOf(context).toString();
+    return NumberFormat.simpleCurrency(locale: locale, name: currency)
+        .format(price);
+  }
+
+  String? _dateLabel(BuildContext context, {String? formattedPrice}) {
+    if (isLifetime || expirationDate == null) return null;
+    final locale = Localizations.localeOf(context).toString();
+    final formatted = DateFormat.yMMMd(locale).format(expirationDate!);
+    final t = context.t.activePremium;
+    if (isInTrial) {
+      if (formattedPrice == null) return t.trial_until(date: formatted);
+      return t.charges_from(price: formattedPrice, date: formatted);
+    }
+    return willRenew ? t.renews_on(date: formatted) : t.expires_on(date: formatted);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final t = context.t.activePremium;
+    final formattedPrice = _formattedPrice(context);
+    final dateLabel = _dateLabel(context, formattedPrice: formattedPrice);
+    return KasyCard(
+      borderRadius: BorderRadius.circular(KasyRadius.lg),
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.xs,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
+            child: Row(
+              children: [
+                Icon(
+                  KasyIcons.payment,
+                  size: KasyIconSize.rowLeading,
+                  color: context.colors.onSurface,
+                ),
+                const SizedBox(width: KasySpacing.sm),
+                Expanded(
+                  child: Text(
+                    planName,
+                    style: context.textTheme.titleSmall?.copyWith(
+                      color: context.colors.onSurface,
                     ),
-                    Text(
-                      "Premium",
-                      textAlign: TextAlign.center,
-                      style: GoogleFonts.albertSans(
-                        fontSize: 32,
-                        fontWeight: FontWeight.w700,
-                        color: context.colors.onPrimary,
-                      ),
+                  ),
+                ),
+                if (isInTrial)
+                  _TrialBadge(label: t.trial_label)
+                else if (formattedPrice != null)
+                  Text(
+                    formattedPrice,
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      color: context.colors.muted,
                     ),
-                    const SizedBox(height: KasySpacing.smd),
-                    // for (var i = 0; i < features.length; i++)
-                    //   Padding(
-                    //     padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                    //     child: FeatureLine(
-                    //       title: translations.features[i],
-                    //       topPadding: i > 0 ? 4 : 0,
-                    //       icon: switch (i) {
-                    //         0 => HugeIcons.strokeRoundedTaskDone02,
-                    //         1 => HugeIcons.strokeRoundedCheckmarkSquare01,
-                    //         2 => HugeIcons.strokeRoundedGame,
-                    //         _ => Icons.check,
-                    //       },
-                    //     ),
-                    //   ),
-                    const SizedBox(height: KasySpacing.xl),
-                    if (userState.subscription?.isLifetime == true)
-                      Padding(
-                        padding: const EdgeInsets.all(KasySpacing.lg),
-                        child: Text(
-                          Translations.of(
-                            context,
-                          ).activePremium.lifetime_user_description,
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.w700,
-                          ),
-                          textAlign: TextAlign.center,
-                        ),
-                      ),
-                    // SliverToBoxAdapter(
-                    //   child: Padding(
-                    //     padding: hPadding,
-                    //     child: ComparisonTable(
-                    //       rows: ComparisonTableRow.getComparisonRows(
-                    //         context,
-                    //         ref.read(environmentProvider),
-                    //       ),
-                    //       freeColumnTitle:
-                    //           ComparisonTableRow.getFreeColumnTitle(context),
-                    //       premiumColumnTitle:
-                    //           ComparisonTableRow.getPremiumColumnTitle(context),
-                    //     ),
-                    //   ),
-                    // ),
-                    if (userState.subscription?.isLifetime == false)
-                      Padding(
-                        padding: const EdgeInsets.fromLTRB(
-                          KasySpacing.pageHorizontalGutter,
-                          72,
-                          KasySpacing.pageHorizontalGutter,
-                          KasySpacing.lg,
-                        ),
-                        child: KasyButton(
-                          label: Translations.of(context).activePremium.unsubscribe_button,
-                          variant: KasyButtonVariant.soft,
-                          expand: true,
-                          onPressed: () => _handleManageTap(context),
-                        ),
-                      ),
-                  ],
+                  ),
+              ],
+            ),
+          ),
+          if (dateLabel != null)
+            Padding(
+              padding: const EdgeInsets.only(
+                left: KasyIconSize.rowLeading + KasySpacing.sm,
+                bottom: KasySpacing.sm,
+              ),
+              child: Text(
+                dateLabel,
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: context.colors.muted,
                 ),
               ),
             ),
-          ],
+        ],
+      ),
+    );
+  }
+}
+
+class _TrialBadge extends StatelessWidget {
+  final String label;
+  const _TrialBadge({required this.label});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.sm,
+        vertical: 3,
+      ),
+      decoration: BoxDecoration(
+        color: context.colors.accent.withValues(alpha: 0.12),
+        borderRadius: BorderRadius.circular(KasyRadius.sm),
+      ),
+      child: Text(
+        label,
+        style: context.textTheme.labelSmall?.copyWith(
+          color: context.colors.accent,
+          fontWeight: FontWeight.w600,
         ),
       ),
     );
   }
 }
+
+class _ActionsCard extends StatelessWidget {
+  final VoidCallback? onManage;
+  final VoidCallback onRestore;
+  final bool isManaging;
+  final bool isRestoring;
+  final String manageLabel;
+  final String restoreLabel;
+
+  const _ActionsCard({
+    required this.onManage,
+    required this.onRestore,
+    required this.isManaging,
+    required this.isRestoring,
+    required this.manageLabel,
+    required this.restoreLabel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return KasyCard(
+      borderRadius: BorderRadius.circular(KasyRadius.lg),
+      padding: const EdgeInsets.symmetric(
+        horizontal: KasySpacing.md,
+        vertical: KasySpacing.xs,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          SettingsTile(
+            icon: KasyIcons.payment,
+            title: manageLabel,
+            onTap: isManaging ? () {} : (onManage ?? () {}),
+            trailingWidget: isManaging
+                ? SizedBox(
+                    width: KasyIconSize.rowTrailing,
+                    height: KasyIconSize.rowTrailing,
+                    child: CircularProgressIndicator.adaptive(
+                      strokeWidth: 2,
+                      valueColor: AlwaysStoppedAnimation(context.colors.muted),
+                    ),
+                  )
+                : null,
+          ),
+          const SettingsDivider(),
+          SettingsTile(
+            icon: KasyIcons.refresh,
+            title: restoreLabel,
+            onTap: isRestoring ? () {} : onRestore,
+            trailingWidget: isRestoring
+                ? SizedBox(
+                    width: KasyIconSize.rowTrailing,
+                    height: KasyIconSize.rowTrailing,
+                    child: CircularProgressIndicator.adaptive(
+                      strokeWidth: 2,
+                      valueColor: AlwaysStoppedAnimation(context.colors.muted),
+                    ),
+                  )
+                : null,
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
@@ -147,9 +146,7 @@ class PaywallMinimal extends StatelessWidget {
       child: Text(
         Translations.of(context).premium.title_1,
         textAlign: TextAlign.center,
-        style: GoogleFonts.albertSans(
-          fontSize: 28,
-          fontWeight: FontWeight.w700,
+        style: context.kasyTextTheme.pageTitle.copyWith(
           color: context.colors.onPrimary,
           letterSpacing: -0.8,
         ),
@@ -191,7 +188,6 @@ class PaywallMinimal extends StatelessWidget {
         _effectiveOffer.formattedPrice(context),
         textAlign: TextAlign.center,
         style: context.textTheme.titleLarge?.copyWith(
-          fontWeight: FontWeight.w600,
           color: context.colors.onPrimary,
         ),
       ),

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

@@ -123,8 +123,7 @@ class _BasicPaywallRowState extends ConsumerState<PaywallRow> {
                               child: Text(
                                 translations.title_1,
                                 textAlign: TextAlign.center,
-                                style: context.textTheme.headlineLarge?.copyWith(
-                                  fontWeight: FontWeight.w700,
+                                style: context.kasyTextTheme.pageTitle.copyWith(
                                   color: context.colors.onBackground,
                                   letterSpacing: -0.8,
                                 ),
@@ -215,7 +214,6 @@ class _BasicPaywallRowState extends ConsumerState<PaywallRow> {
                             child: Text(Translations.of(context).premium.comparison.title,
                               textAlign: TextAlign.center,
                               style: context.textTheme.headlineSmall?.copyWith(
-                                fontWeight: FontWeight.w600,
                                 color: context.colors.onBackground,
                               ),
                             ),
@@ -268,7 +266,6 @@ class _BasicPaywallRowState extends ConsumerState<PaywallRow> {
                                   translations.payment_cancel_reassurance,
                                   textAlign: TextAlign.center,
                                   style: context.textTheme.bodyMedium?.copyWith(
-                                    fontWeight: FontWeight.w400,
                                     color: context.colors.background.withValues(alpha: .9),
                                   ),
                                 ),
@@ -287,7 +284,6 @@ class _BasicPaywallRowState extends ConsumerState<PaywallRow> {
                                     Text(
                                       translations.payment_cancel_reassurance_free_trial,
                                       style: context.textTheme.bodyMedium?.copyWith(
-                                        fontWeight: FontWeight.w400,
                                         color: context.colors.background.withValues(alpha: .9),
                                       ),
                                     ),

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

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
@@ -114,9 +113,7 @@ class PaywallWithSwitch extends StatelessWidget {
                   child: Text(
                     title,
                     textAlign: TextAlign.left,
-                    style: GoogleFonts.albertSans(
-                      fontSize: 24,
-                      fontWeight: FontWeight.w700,
+                    style: context.kasyTextTheme.pageTitle.copyWith(
                       color: context.colors.background,
                       letterSpacing: -0.8,
                     ),
@@ -164,7 +161,7 @@ class PaywallWithSwitch extends StatelessWidget {
                       key: ValueKey(detailedPrice),
                       detailedPrice,
                       textAlign: TextAlign.center,
-                      style: context.textTheme.titleLarge?.copyWith(
+                      style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
                         color: context.colors.background,
                       ),

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

@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/animations/movefade_anim.dart';
 import 'package:kasy_kit/core/data/models/subscription.dart';
@@ -72,9 +71,7 @@ class BasicPaywall extends StatelessWidget {
                       child: Text(
                         Translations.of(context).premium.title_1,
                         textAlign: TextAlign.center,
-                        style: GoogleFonts.albertSans(
-                          fontSize: 32,
-                          fontWeight: FontWeight.w700,
+                        style: context.kasyTextTheme.pageTitle.copyWith(
                           color: context.colors.onPrimary,
                         ),
                       ),

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

@@ -104,10 +104,9 @@ class FeatureWithTwoLines extends StatelessWidget {
                 Flexible(
                   child: Text(
                     title,
-                    style: context.textTheme.bodyMedium?.copyWith(
+                    style: context.textTheme.titleMedium?.copyWith(
                       color: context.colors.onBackground,
                       decoration: crossed ? TextDecoration.lineThrough : null,
-                      fontWeight: FontWeight.w900,
                     ),
                   ),
                 ),

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

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/kasy_focus_ring.dart';
 
@@ -55,18 +54,14 @@ class PremiumWideBanner extends StatelessWidget {
                     children: [
                       Text(
                         smallText.toUpperCase(),
-                        style: GoogleFonts.albertSans(
-                          fontSize: 12,
-                          fontWeight: FontWeight.w700,
+                        style: context.kasyTextTheme.sectionLabel.copyWith(
                           color: context.colors.premiumBannerText,
                         ),
                       ),
                       const SizedBox(height: KasySpacing.sm),
                       Text(
                         title,
-                        style: GoogleFonts.albertSans(
-                          fontSize: 20,
-                          fontWeight: FontWeight.w400,
+                        style: context.textTheme.titleLarge?.copyWith(
                           color: context.colors.onPrimary,
                         ),
                         overflow: TextOverflow.clip,