chore(release): 4.7.7

Author: github-actions[bot]

.env.flutter

@@ -1 +1 @@
-APP_VERSION=4.7.6
+APP_VERSION=4.7.7

lib/l10n/app_en.arb

@@ -954,6 +954,8 @@
   "releaseNotes": "Release notes",
   "releaseNotesTitle": "What's new",
   "version": "Version {version}",
+  "releaseNotes_4_7_7": "Fixed errors in monthly transit calculations. Subscription badges now display only when appropriate.",
+  "releaseNotes_4_7_6": "Improved font rendering.",
   "releaseNotes_4_7_1": "Connection error messages now translated.",
   "releaseNotes_4_5_1": "New app icons. Improved logo quality in the menu. Fixed a validation issue when editing birth charts.",
   "releaseNotes_4_0_1": "Fixed an issue where the PDF button did not appear after reading generation. Saved charts now refresh correctly when navigating back with the browser.",
@@ -970,5 +972,7 @@
   "releaseNotes_2_0_1": "Initial release with birth chart readings, synastry analysis for couple compatibility, and daily and monthly transit predictions. PDF export. Full support for English and Italian.",
   "updateRequired": "Just a moment!",
   "updateNow": "Update",
-  "errorMessageCopied": "Error message copied to clipboard"
+  "errorMessageCopied": "Error message copied to clipboard",
+  "portalReturnTitle": "Done",
+  "portalReturnMessage": "You can close this window and return to the app."
 }

lib/l10n/app_it.arb

@@ -933,6 +933,8 @@
   "releaseNotes": "Note di rilascio",
   "releaseNotesTitle": "Novità",
   "version": "Versione {version}",
+  "releaseNotes_4_7_7": "Risolti errori nel calcolo dei transiti mensili. I badge degli abbonamenti ora si mostrano solo quando appropriato.",
+  "releaseNotes_4_7_6": "Migliorato il rendering dei font.",
   "releaseNotes_4_7_1": "Messaggi di errore di connessione ora tradotti in italiano.",
   "releaseNotes_4_5_1": "Nuove icone dell'app. Migliorata la qualità del logo nel menu. Risolto un problema di validazione nella modifica del tema natale.",
   "releaseNotes_4_0_1": "Risolto un problema per cui il pulsante PDF non appariva dopo la generazione della lettura. I grafici salvati ora si aggiornano correttamente tornando indietro con il browser.",
@@ -949,5 +951,7 @@
   "releaseNotes_2_0_1": "Rilascio iniziale con letture del tema natale, analisi di sinastria per la compatibilità di coppia, e previsioni dei transiti giornalieri e mensili. Esportazione PDF. Supporto completo per inglese e italiano.",
   "updateRequired": "Un attimo!",
   "updateNow": "Aggiorna",
-  "errorMessageCopied": "Messaggio di errore copiato negli appunti"
+  "errorMessageCopied": "Messaggio di errore copiato negli appunti",
+  "portalReturnTitle": "Fatto",
+  "portalReturnMessage": "Puoi chiudere questa finestra e tornare all'app."
 }

lib/l10n/app_localizations.dart

@@ -5696,6 +5696,18 @@ abstract class AppLocalizations {
   /// **'Version {version}'**
   String version(Object version);
 
+  /// No description provided for @releaseNotes_4_7_7.
+  ///
+  /// In en, this message translates to:
+  /// **'Fixed errors in monthly transit calculations. Subscription badges now display only when appropriate.'**
+  String get releaseNotes_4_7_7;
+
+  /// No description provided for @releaseNotes_4_7_6.
+  ///
+  /// In en, this message translates to:
+  /// **'Improved font rendering.'**
+  String get releaseNotes_4_7_6;
+
   /// No description provided for @releaseNotes_4_7_1.
   ///
   /// In en, this message translates to:
@@ -5797,6 +5809,18 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Error message copied to clipboard'**
   String get errorMessageCopied;
+
+  /// No description provided for @portalReturnTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Done'**
+  String get portalReturnTitle;
+
+  /// No description provided for @portalReturnMessage.
+  ///
+  /// In en, this message translates to:
+  /// **'You can close this window and return to the app.'**
+  String get portalReturnMessage;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_en.dart

@@ -3210,6 +3210,13 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Version $version';
   }
 
+  @override
+  String get releaseNotes_4_7_7 =>
+      'Fixed errors in monthly transit calculations. Subscription badges now display only when appropriate.';
+
+  @override
+  String get releaseNotes_4_7_6 => 'Improved font rendering.';
+
   @override
   String get releaseNotes_4_7_1 => 'Connection error messages now translated.';
 
@@ -3269,4 +3276,11 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get errorMessageCopied => 'Error message copied to clipboard';
+
+  @override
+  String get portalReturnTitle => 'Done';
+
+  @override
+  String get portalReturnMessage =>
+      'You can close this window and return to the app.';
 }

lib/l10n/app_localizations_it.dart

@@ -3239,6 +3239,13 @@ class AppLocalizationsIt extends AppLocalizations {
     return 'Versione $version';
   }
 
+  @override
+  String get releaseNotes_4_7_7 =>
+      'Risolti errori nel calcolo dei transiti mensili. I badge degli abbonamenti ora si mostrano solo quando appropriato.';
+
+  @override
+  String get releaseNotes_4_7_6 => 'Migliorato il rendering dei font.';
+
   @override
   String get releaseNotes_4_7_1 =>
       'Messaggi di errore di connessione ora tradotti in italiano.';
@@ -3302,4 +3309,11 @@ class AppLocalizationsIt extends AppLocalizations {
 
   @override
   String get errorMessageCopied => 'Messaggio di errore copiato negli appunti';
+
+  @override
+  String get portalReturnTitle => 'Fatto';
+
+  @override
+  String get portalReturnMessage =>
+      'Puoi chiudere questa finestra e tornare all\'app.';
 }

lib/models/subscription_plan.dart

@@ -7,12 +7,7 @@ enum PlanTier { standard, premium }
 
 enum CardStyle { normal, alternative, main }
 
-enum PlanBadge {
-  currentPlan,
-  upgrade,
-  downgrade,
-  none,
-}
+enum PlanBadge { currentPlan, upgrade, downgrade, none }
 
 class SubscriptionPlan {
   final String title;
@@ -122,6 +117,13 @@ class SubscriptionPlan {
       return plans;
     }
 
+    final isActiveSubscription =
+        currentSubscription.status == 'active' ||
+        currentSubscription.status == 'trialing';
+    if (!isActiveSubscription) {
+      return plans;
+    }
+
     final currentPriceId = _extractPriceIdFromSubscription(currentSubscription);
     if (currentPriceId == null) {
       return plans;
@@ -183,10 +185,7 @@ class SubscriptionPlan {
   }
 
   static int _compareTiers(PlanTier tier1, PlanTier tier2) {
-    const tierOrder = {
-      PlanTier.standard: 0,
-      PlanTier.premium: 1,
-    };
+    const tierOrder = {PlanTier.standard: 0, PlanTier.premium: 1};
     return (tierOrder[tier1] ?? 0) - (tierOrder[tier2] ?? 0);
   }
 
@@ -199,20 +198,26 @@ class SubscriptionPlan {
     return (durationOrder[type1] ?? 0) - (durationOrder[type2] ?? 0);
   }
 
-  static List<SubscriptionPlan> sortByPriority(
-    List<SubscriptionPlan> plans,
-  ) {
+  static List<SubscriptionPlan> sortByPriority(List<SubscriptionPlan> plans) {
     final sortedPlans = List<SubscriptionPlan>.from(plans);
 
     sortedPlans.sort((a, b) {
       if (a.isCurrentPlan && !b.isCurrentPlan) return -1;
       if (!a.isCurrentPlan && b.isCurrentPlan) return 1;
 
-      if (a.badge == PlanBadge.upgrade && b.badge != PlanBadge.upgrade) return -1;
-      if (a.badge != PlanBadge.upgrade && b.badge == PlanBadge.upgrade) return 1;
+      if (a.badge == PlanBadge.upgrade && b.badge != PlanBadge.upgrade) {
+        return -1;
+      }
+      if (a.badge != PlanBadge.upgrade && b.badge == PlanBadge.upgrade) {
+        return 1;
+      }
 
-      if (a.badge == PlanBadge.downgrade && b.badge != PlanBadge.downgrade) return 1;
-      if (a.badge != PlanBadge.downgrade && b.badge == PlanBadge.downgrade) return -1;
+      if (a.badge == PlanBadge.downgrade && b.badge != PlanBadge.downgrade) {
+        return 1;
+      }
+      if (a.badge != PlanBadge.downgrade && b.badge == PlanBadge.downgrade) {
+        return -1;
+      }
 
       final tierComp = _compareTiers(b.tier, a.tier);
       if (tierComp != 0) return tierComp;

lib/screens/release_notes_screen.dart

@@ -13,6 +13,8 @@ class ReleaseNotesScreen extends StatelessWidget {
     final l10n = AppLocalizations.of(context)!;
 
     final releases = [
+      _ReleaseInfo('4.7.7', l10n.releaseNotes_4_7_7),
+      _ReleaseInfo('4.7.6', l10n.releaseNotes_4_7_6),
       _ReleaseInfo('4.7.1', l10n.releaseNotes_4_7_1),
       _ReleaseInfo('4.5.1', l10n.releaseNotes_4_5_1),
       _ReleaseInfo('4.0.1', l10n.releaseNotes_4_0_1),

lib/services/api_client.dart

@@ -457,11 +457,17 @@ class ApiClient {
     return await get('/subscription-status');
   }
 
-  Future<Map<String, dynamic>> createPortalSession({String? priceId}) async {
+  Future<Map<String, dynamic>> createPortalSession({
+    String? priceId,
+    String? returnUrl,
+  }) async {
     final body = <String, dynamic>{};
     if (priceId != null) {
       body['price_id'] = priceId;
     }
+    if (returnUrl != null) {
+      body['return_url'] = returnUrl;
+    }
     return await post('/create-portal-session', body: body);
   }
 

lib/services/loopback_server.dart

@@ -0,0 +1,86 @@
+import 'dart:async';
+import 'dart:io';
+
+class LoopbackServer {
+  HttpServer? _server;
+  final String title;
+  final String message;
+
+  LoopbackServer({
+    required this.title,
+    required this.message,
+  });
+
+  Future<String> start() async {
+    _server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+    return 'http://localhost:${_server!.port}/callback';
+  }
+
+  Future<void> waitForCallback() async {
+    if (_server == null) {
+      throw StateError('Server not started. Call start() first.');
+    }
+
+    final completer = Completer<void>();
+
+    _server!.listen((request) async {
+      if (request.uri.path == '/callback') {
+        request.response
+          ..statusCode = HttpStatus.ok
+          ..headers.contentType = ContentType.html
+          ..write(_getSuccessPage());
+        await request.response.close();
+
+        await _server?.close();
+        _server = null;
+
+        if (!completer.isCompleted) {
+          completer.complete();
+        }
+      }
+    });
+
+    await completer.future;
+  }
+
+  Future<void> close() async {
+    await _server?.close();
+    _server = null;
+  }
+
+  String _getSuccessPage() {
+    return '''
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>AstroGods</title>
+  <style>
+    body {
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+      margin: 0;
+      background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
+      color: white;
+    }
+    .container {
+      text-align: center;
+      padding: 40px;
+    }
+    h1 { margin-bottom: 16px; }
+    p { opacity: 0.8; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>$title</h1>
+    <p>$message</p>
+  </div>
+</body>
+</html>
+''';
+  }
+}