Merge pull request #502 from OpenPecha/featured-plan-bug

tentamdin · web-flow · commit fc059d2d964c · 2026-07-05T22:38:39.000+05:30
fix: progress showing when not with partner
diff --git a/lib/core/l10n/app_bo.arb b/lib/core/l10n/app_bo.arb
@@ -556,7 +556,7 @@
   "read_full_text": "ཆ་ཚང་ཀློག",
   "reader_source_label": "ཡོང་ཁུངས།",
   "reader_license_label": "ཆོག་མཆན།",
-  "series_stats": "ཐུན་འཆར་ {planCount} · ཉིན་ {totalDays}",
+  "series_stats": "{planCount} ལེའུ · ཉིན་ {totalDays}",
   "force_update_title": "གསར་བསྒྱུར་དགོས་མཁོ།",
   "force_update_message": "མཉེན་ཆས་ཀྱི་པར་གཞི་གསར་པ་ཞིག་ཡོད་པས། མུ་མཐུད་སྤྱོད་རོགས་གནང་བར་གསར་བསྒྱུར་མཛད་རོགས།",
   "force_update_button": "གསར་བསྒྱུར།",
diff --git a/lib/core/l10n/app_en.arb b/lib/core/l10n/app_en.arb
@@ -623,7 +623,7 @@
   "read_full_text": "Read full text",
   "reader_source_label": "Source",
   "reader_license_label": "License",
-  "series_stats": "{planCount} PLANS · {totalDays} DAYS",
+  "series_stats": "{planCount} CHAPTERS · {totalDays} DAYS",
   "@series_stats": {
     "placeholders": {
       "planCount": {
diff --git a/lib/core/l10n/app_hi.arb b/lib/core/l10n/app_hi.arb
@@ -612,7 +612,7 @@
   "read_full_text": "पूरा पाठ पढ़ें",
   "reader_source_label": "स्रोत",
   "reader_license_label": "लाइसेंस",
-  "series_stats": "{planCount} योजनाएँ · {totalDays} दिन",
+  "series_stats": "{planCount} अध्याय · {totalDays} दिन",
   "@series_stats": {
     "placeholders": {
       "planCount": {
diff --git a/lib/core/l10n/app_mn.arb b/lib/core/l10n/app_mn.arb
@@ -612,7 +612,7 @@
   "read_full_text": "Бүтэн бичвэрийг унших",
   "reader_source_label": "Эх сурвалж",
   "reader_license_label": "Лиценз",
-  "series_stats": "{planCount} ТӨЛӨВЛӨГӨӨ · {totalDays} ӨДӨР",
+  "series_stats": "{planCount} БҮЛЭГ · {totalDays} ӨДӨР",
   "@series_stats": {
     "placeholders": {
       "planCount": {
diff --git a/lib/core/l10n/app_ne.arb b/lib/core/l10n/app_ne.arb
@@ -612,7 +612,7 @@
   "read_full_text": "पूरा पाठ पढ्नुहोस्",
   "reader_source_label": "स्रोत",
   "reader_license_label": "लाइसेन्स",
-  "series_stats": "{planCount} योजना · {totalDays} दिन",
+  "series_stats": "{planCount} अध्याय · {totalDays} दिन",
   "@series_stats": {
     "placeholders": {
       "planCount": {
diff --git a/lib/core/l10n/app_zh.arb b/lib/core/l10n/app_zh.arb
@@ -556,7 +556,7 @@
   "read_full_text": "閱讀完整文本",
   "reader_source_label": "來源",
   "reader_license_label": "授權",
-  "series_stats": "{planCount} 個修持計畫 · {totalDays} 天",
+  "series_stats": "{planCount} 個章節 · {totalDays} 天",
   "force_update_title": "需要更新",
   "force_update_message": "有新版本可用，請更新後繼續使用。",
   "force_update_button": "立即更新",
diff --git a/lib/core/l10n/generated/app_localizations.dart b/lib/core/l10n/generated/app_localizations.dart
@@ -2425,7 +2425,7 @@ abstract class AppLocalizations {
   /// No description provided for @series_stats.
   ///
   /// In en, this message translates to:
-  /// **'{planCount} PLANS · {totalDays} DAYS'**
+  /// **'{planCount} CHAPTERS · {totalDays} DAYS'**
   String series_stats(int planCount, int totalDays);
 
   /// No description provided for @force_update_title.
diff --git a/lib/core/l10n/generated/app_localizations_bo.dart b/lib/core/l10n/generated/app_localizations_bo.dart
@@ -1336,7 +1336,7 @@ class AppLocalizationsBo extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return 'ཐུན་འཆར་ $planCount · ཉིན་ $totalDays';
+    return '$planCount ལེའུ · ཉིན་ $totalDays';
   }
 
   @override
diff --git a/lib/core/l10n/generated/app_localizations_en.dart b/lib/core/l10n/generated/app_localizations_en.dart
@@ -1316,7 +1316,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return '$planCount PLANS · $totalDays DAYS';
+    return '$planCount CHAPTERS · $totalDays DAYS';
   }
 
   @override
diff --git a/lib/core/l10n/generated/app_localizations_hi.dart b/lib/core/l10n/generated/app_localizations_hi.dart
@@ -1326,7 +1326,7 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return '$planCount योजनाएँ · $totalDays दिन';
+    return '$planCount अध्याय · $totalDays दिन';
   }
 
   @override
diff --git a/lib/core/l10n/generated/app_localizations_mn.dart b/lib/core/l10n/generated/app_localizations_mn.dart
@@ -1326,7 +1326,7 @@ class AppLocalizationsMn extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return '$planCount ТӨЛӨВЛӨГӨӨ · $totalDays ӨДӨР';
+    return '$planCount БҮЛЭГ · $totalDays ӨДӨР';
   }
 
   @override
diff --git a/lib/core/l10n/generated/app_localizations_ne.dart b/lib/core/l10n/generated/app_localizations_ne.dart
@@ -1335,7 +1335,7 @@ class AppLocalizationsNe extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return '$planCount योजना · $totalDays दिन';
+    return '$planCount अध्याय · $totalDays दिन';
   }
 
   @override
diff --git a/lib/core/l10n/generated/app_localizations_zh.dart b/lib/core/l10n/generated/app_localizations_zh.dart
@@ -1251,7 +1251,7 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String series_stats(int planCount, int totalDays) {
-    return '$planCount 個修持計畫 · $totalDays 天';
+    return '$planCount 個章節 · $totalDays 天';
   }
 
   @override
diff --git a/lib/features/home/presentation/widgets/featured_plan_section.dart b/lib/features/home/presentation/widgets/featured_plan_section.dart
@@ -8,7 +8,6 @@ import 'package:flutter_pecha/features/home/presentation/providers/featured_seri
 import 'package:flutter_pecha/features/home/presentation/providers/routine_info_provider.dart';
 import 'package:flutter_pecha/features/home/presentation/widgets/featured_plan_section_skeleton.dart';
 import 'package:flutter_pecha/features/home/presentation/widgets/series_plan_card_widgets.dart';
-import 'package:flutter_pecha/features/plans/data/utils/plan_date_format.dart';
 import 'package:flutter_pecha/shared/utils/helper_functions.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -143,10 +142,6 @@ class _FeaturedPlanContent extends ConsumerWidget {
   }
 }
 
-String? _formatSeriesDateRange(Series series) {
-  return PlanDateFormat.formatRangeOrNull(series.startDate, series.endDate);
-}
-
 Color _featuredPlanBackgroundColor(BuildContext context) {
   final isDark = Theme.of(context).brightness == Brightness.dark;
   return isDark ? AppColors.cardBackgroundDark : AppColors.surfaceWhite;
@@ -172,7 +167,6 @@ class _FeaturedPlanHeroCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    final dateRange = _formatSeriesDateRange(series);
 
     return Material(
       color: _featuredPlanBackgroundColor(context),
@@ -248,9 +242,36 @@ class _FeaturedPlanHeroCard extends StatelessWidget {
                         ],
                       ],
                     ),
-                  ] else if (dateRange != null || series.enrolledCount > 0) ...[
+                  ] else if (series.progress != null &&
+                      series.progress!.totalDayCount > 0) ...[
+                    SizedBox(height: titleDateGap + 4),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Expanded(
+                          child: SeriesPlanProgressBar(
+                            progress: series.progress!,
+                          ),
+                        ),
+                        if (series.enrolledCount > 0) ...[
+                          const SizedBox(width: 12),
+                          SeriesPlanEnrolledCount(
+                            count: series.enrolledCount,
+                            fontSize: dateFontSize,
+                          ),
+                        ],
+                      ],
+                    ),
+                  ] else if (series.enrolledCount > 0) ...[
                     SizedBox(height: titleDateGap),
-                    SeriesPlanMetaRow(series: series, fontSize: dateFontSize),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: SeriesPlanEnrolledCount(
+                        count: series.enrolledCount,
+                        fontSize: dateFontSize,
+                      ),
+                    ),
                   ],
                 ],
               ),
@@ -284,7 +305,6 @@ class _FeaturedPlanListItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    final dateRange = _formatSeriesDateRange(series);
 
     return Material(
       color: _featuredPlanBackgroundColor(context),
@@ -340,49 +360,34 @@ class _FeaturedPlanListItem extends StatelessWidget {
                       maxLines: 2,
                       overflow: TextOverflow.ellipsis,
                     ),
-                    if (series.partner != null) ...[
-                      if (series.progress != null &&
-                          series.progress!.totalDayCount > 0) ...[
-                        SizedBox(height: titleDateGap + 4),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            Expanded(
-                              child: SeriesPlanProgressBar(
-                                progress: series.progress!,
-                              ),
+                    if (series.progress != null &&
+                        series.progress!.totalDayCount > 0) ...[
+                      SizedBox(height: titleDateGap + 4),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Expanded(
+                            child: SeriesPlanProgressBar(
+                              progress: series.progress!,
                             ),
-                            if (series.enrolledCount > 0)
-                              SeriesPlanEnrolledCount(
-                                count: series.enrolledCount,
-                                fontSize: dateFontSize,
-                              ),
-                          ],
-                        ),
-                      ] else if (series.enrolledCount > 0) ...[
-                        SizedBox(height: titleDateGap),
-                        Align(
-                          alignment: Alignment.centerRight,
-                          child: SeriesPlanEnrolledCount(
-                            count: series.enrolledCount,
-                            fontSize: dateFontSize,
                           ),
-                        ),
-                      ],
-                    ] else ...[
-                      if (dateRange != null || series.enrolledCount > 0) ...[
-                        SizedBox(height: titleDateGap),
-                        SeriesPlanMetaRow(
-                          series: series,
+                          if (series.enrolledCount > 0)
+                            SeriesPlanEnrolledCount(
+                              count: series.enrolledCount,
+                              fontSize: dateFontSize,
+                            ),
+                        ],
+                      ),
+                    ] else if (series.enrolledCount > 0) ...[
+                      SizedBox(height: titleDateGap),
+                      Align(
+                        alignment: Alignment.centerRight,
+                        child: SeriesPlanEnrolledCount(
+                          count: series.enrolledCount,
                           fontSize: dateFontSize,
                         ),
-                      ],
-                      if (series.progress != null &&
-                          series.progress!.totalDayCount > 0) ...[
-                        SizedBox(height: titleDateGap + 4),
-                        SeriesPlanProgressBar(progress: series.progress!),
-                      ],
+                      ),
                     ],
                   ],
                 ),

Original file line number	Diff line number	Diff line change
`@@ -1336,7 +1336,7 @@ class AppLocalizationsBo extends AppLocalizations {`
`1336`	`1336`
`1337`	`1337`	`@override`
`1338`	`1338`	`String series_stats(int planCount, int totalDays) {`
`1339`		`- return 'ཐུན་འཆར་ $planCount · ཉིན་ $totalDays';`
	`1339`	`+ return '$planCount ལེའུ · ཉིན་ $totalDays';`
`1340`	`1340`	`}`
`1341`	`1341`
`1342`	`1342`	`@override`
Original file line number	Diff line number	Diff line change
`@@ -1316,7 +1316,7 @@ class AppLocalizationsEn extends AppLocalizations {`
`1316`	`1316`
`1317`	`1317`	`@override`
`1318`	`1318`	`String series_stats(int planCount, int totalDays) {`
`1319`		`- return '$planCount PLANS · $totalDays DAYS';`
	`1319`	`+ return '$planCount CHAPTERS · $totalDays DAYS';`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`	`1322`	`@override`
Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,7 @@ class AppLocalizationsHi extends AppLocalizations {`
`1326`	`1326`
`1327`	`1327`	`@override`
`1328`	`1328`	`String series_stats(int planCount, int totalDays) {`
`1329`		`- return '$planCount योजनाएँ · $totalDays दिन';`
	`1329`	`+ return '$planCount अध्याय · $totalDays दिन';`
`1330`	`1330`	`}`
`1331`	`1331`
`1332`	`1332`	`@override`