Refactor/app identity pivot into a news aggregator

analysis_options.yaml

@@ -9,6 +9,7 @@ analyzer:
     flutter_style_todos: ignore
     lines_longer_than_80_chars: ignore
     prefer_asserts_with_message: ignore
+    use_build_context_synchronously: ignore
     use_if_null_to_convert_nulls_to_bools: ignore
 include: package:very_good_analysis/analysis_options.7.0.0.yaml
 linter:

lib/account/bloc/in_app_notification_center_state.dart

@@ -92,7 +92,7 @@ class InAppNotificationCenterState extends Equatable {
     breakingNewsCursor ?? Object(),
     digestHasMore,
     digestCursor ?? Object(),
-    error ?? Object(), // Include error in props, handle nullability
+    error ?? Object(),
   ];
 
   /// Creates a copy of this state with the given fields replaced with the new

lib/account/view/account_page.dart

@@ -1,4 +1,4 @@
-import 'package:core/core.dart' hide AppStatus;
+import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
@@ -44,20 +44,18 @@ class AccountPage extends StatelessWidget {
           // This declutters the main content card and follows common UI patterns.
           if (isAnonymous)
             IconButton(
-              icon: const Icon(Icons.login),
+              icon: const Icon(Icons.sync),
               tooltip: l10n.anonymousLimitButton,
               onPressed: () => context.goNamed(Routes.accountLinkingName),
             )
           else
             IconButton(
-              icon: const Icon(Icons.logout), // Non-directional icon for logout
+              icon: const Icon(Icons.logout),
               tooltip: l10n.accountSignOutTile,
               onPressed: () =>
                   context.read<AppBloc>().add(const AppLogoutRequested()),
             ),
-          const SizedBox(
-            width: AppSpacing.lg,
-          ), // Consistent right padding for the AppBar actions
+          const SizedBox(width: AppSpacing.lg),
         ],
       ),
       body: SingleChildScrollView(

lib/account/view/in_app_notification_center_page.dart

@@ -3,10 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/in_app_notification_center_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/account/widgets/in_app_notification_list_item.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/services/interstitial_ad_manager.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
-import 'package:go_router/go_router.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/shared/widgets/feed_core/headline_tap_handler.dart';
 import 'package:ui_kit/ui_kit.dart';
 
 /// {@template in_app_notification_center_page}
@@ -295,19 +293,14 @@ class _NotificationListState extends State<_NotificationList> {
             );
 
             final payload = notification.payload;
-            final contentType = payload.data['contentType'] as String?;
-            final id = payload.data['headlineId'] as String?;
+            final contentType = payload.contentType;
+            final contentId = payload.contentId;
 
-            if (contentType == 'headline' && id != null) {
-              await context
-                  .read<InterstitialAdManager>()
-                  .onPotentialAdTrigger();
-
-              if (!context.mounted) return;
-
-              await context.pushNamed(
-                Routes.globalArticleDetailsName,
-                pathParameters: {'id': id},
+            if (contentType == ContentType.headline && contentId.isNotEmpty) {
+              // Use the handler to fetch the headline by ID and open it.
+              await HeadlineTapHandler.handleHeadlineTapById(
+                context,
+                contentId,
               );
             }
           },

lib/account/view/saved_headlines_page.dart

@@ -1,11 +1,9 @@
 import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/services/interstitial_ad_manager.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/models/app_life_cycle_status.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/shared/widgets/feed_core/feed_core.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ui_kit/ui_kit.dart';
@@ -25,7 +23,6 @@ class SavedHeadlinesPage extends StatelessWidget {
     final l10n = AppLocalizationsX(context).l10n;
     final theme = Theme.of(context);
     final textTheme = theme.textTheme;
-    final colorScheme = theme.colorScheme;
 
     return Scaffold(
       appBar: AppBar(
@@ -74,21 +71,6 @@ class SavedHeadlinesPage extends StatelessWidget {
             );
           }
 
-          Future<void> onHeadlineTap(Headline headline) async {
-            // Await for the ad to be shown and dismissed.
-            await context.read<InterstitialAdManager>().onPotentialAdTrigger();
-
-            // Check if the widget is still in the tree before navigating.
-            if (!context.mounted) return;
-
-            // Proceed with navigation after the ad is closed.
-            await context.pushNamed(
-              Routes.accountArticleDetailsName,
-              pathParameters: {'id': headline.id},
-              extra: headline,
-            );
-          }
-
           return ListView.separated(
             padding: const EdgeInsets.symmetric(
               vertical: AppSpacing.paddingSmall,
@@ -102,48 +84,28 @@ class SavedHeadlinesPage extends StatelessWidget {
             itemBuilder: (context, index) {
               final headline = savedHeadlines[index];
               final imageStyle =
-                  appState.settings?.feedPreferences.headlineImageStyle ??
-                  HeadlineImageStyle.smallThumbnail;
-
-              final trailingButton = IconButton(
-                icon: Icon(Icons.delete_outline, color: colorScheme.error),
-                tooltip: l10n.headlineDetailsRemoveFromSavedTooltip,
-                onPressed: () {
-                  final updatedSavedHeadlines = List<Headline>.from(
-                    savedHeadlines,
-                  )..removeWhere((h) => h.id == headline.id);
-
-                  final updatedPreferences = userContentPreferences.copyWith(
-                    savedHeadlines: updatedSavedHeadlines,
-                  );
-
-                  context.read<AppBloc>().add(
-                    AppUserContentPreferencesChanged(
-                      preferences: updatedPreferences,
-                    ),
-                  );
-                },
-              );
+                  appState.settings?.feedSettings.feedItemImageStyle ??
+                  FeedItemImageStyle.smallThumbnail;
 
               Widget tile;
               switch (imageStyle) {
-                case HeadlineImageStyle.hidden:
+                case FeedItemImageStyle.hidden:
                   tile = HeadlineTileTextOnly(
                     headline: headline,
-                    onHeadlineTap: () => onHeadlineTap(headline),
-                    trailing: trailingButton,
+                    onHeadlineTap: () =>
+                        HeadlineTapHandler.handleHeadlineTap(context, headline),
                   );
-                case HeadlineImageStyle.smallThumbnail:
+                case FeedItemImageStyle.smallThumbnail:
                   tile = HeadlineTileImageStart(
                     headline: headline,
-                    onHeadlineTap: () => onHeadlineTap(headline),
-                    trailing: trailingButton,
+                    onHeadlineTap: () =>
+                        HeadlineTapHandler.handleHeadlineTap(context, headline),
                   );
-                case HeadlineImageStyle.largeThumbnail:
+                case FeedItemImageStyle.largeThumbnail:
                   tile = HeadlineTileImageTop(
                     headline: headline,
-                    onHeadlineTap: () => onHeadlineTap(headline),
-                    trailing: trailingButton,
+                    onHeadlineTap: () =>
+                        HeadlineTapHandler.handleHeadlineTap(context, headline),
                   );
               }
               return tile;

lib/account/widgets/in_app_notification_list_item.dart

@@ -6,7 +6,7 @@ import 'package:ui_kit/ui_kit.dart';
 /// {@template in_app_notification_list_item}
 /// A widget that displays a single in-app notification in a list.
 ///
-/// It shows the notification's title, body, and the time it was received.
+/// It shows the notification's title and the time it was received.
 /// Unread notifications are visually distinguished with a leading dot and
 /// a bolder title.
 /// {@endtemplate}
@@ -50,23 +50,11 @@ class InAppNotificationListItem extends StatelessWidget {
           fontWeight: isUnread ? FontWeight.bold : FontWeight.normal,
         ),
       ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            notification.payload.body,
-            maxLines: 2,
-            overflow: TextOverflow.ellipsis,
-          ),
-          const SizedBox(height: AppSpacing.xs),
-          Text(
-            timeago.format(notification.createdAt),
-            style: textTheme.bodySmall,
-          ),
-        ],
+      subtitle: Text(
+        timeago.format(notification.createdAt),
+        style: textTheme.bodySmall,
       ),
       onTap: onTap,
-      isThreeLine: true,
     );
   }
 }

lib/ads/providers/ad_provider.dart

@@ -30,13 +30,13 @@ abstract class AdProvider {
   /// The [adPlatformIdentifiers] provides the platform-specific ad unit IDs.
   /// The [adId] is the specific identifier for the ad slot (e.g., native ad unit ID).
   /// The [adThemeStyle] provides UI-agnostic theme properties for ad styling.
-  /// The [headlineImageStyle] provides the user's preference for feed layout,
+  /// The [feedItemImageStyle] provides the user's preference for feed layout,
   /// which can be used to request an appropriately sized ad.
   Future<NativeAd?> loadNativeAd({
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   });
 
   /// Loads an inline banner ad.
@@ -48,13 +48,13 @@ abstract class AdProvider {
   /// The [adPlatformIdentifiers] provides the platform-specific ad unit IDs.
   /// The [adId] is the specific identifier for the ad slot (e.g., banner ad unit ID).
   /// The [adThemeStyle] provides UI-agnostic theme properties for ad styling.
-  /// The [headlineImageStyle] provides the user's preference for feed layout,
+  /// The [feedItemImageStyle] provides the user's preference for feed layout,
   /// which can be used to request an appropriately sized ad.
   Future<BannerAd?> loadBannerAd({
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   });
 
   /// Loads a full-screen interstitial ad.

lib/ads/providers/admob_ad_provider.dart

@@ -50,7 +50,7 @@ class AdMobAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   }) async {
     _logger.info('AdMobAdProvider: loadNativeAd called for adId: $adId');
     if (adId == null || adId.isEmpty) {
@@ -65,7 +65,7 @@ class AdMobAdProvider implements AdProvider {
     );
 
     // Determine the template type based on the user's feed style preference.
-    final templateType = headlineImageStyle == HeadlineImageStyle.largeThumbnail
+    final templateType = feedItemImageStyle == FeedItemImageStyle.largeThumbnail
         ? NativeAdTemplateType.medium
         : NativeAdTemplateType.small;
 
@@ -149,7 +149,7 @@ class AdMobAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   }) async {
     _logger.info('AdMobAdProvider: loadBannerAd called for adId: $adId');
     if (adId == null || adId.isEmpty) {
@@ -164,7 +164,7 @@ class AdMobAdProvider implements AdProvider {
     );
 
     // Determine the ad size based on the user's feed style preference.
-    final adSize = headlineImageStyle == HeadlineImageStyle.largeThumbnail
+    final adSize = feedItemImageStyle == FeedItemImageStyle.largeThumbnail
         ? admob.AdSize.mediumRectangle
         : admob.AdSize.banner;
 

lib/ads/providers/demo_ad_provider.dart

@@ -35,7 +35,7 @@ class DemoAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   }) async {
     _logger.info('Simulating native ad load for demo environment.');
     // Simulate a delay for loading.
@@ -45,7 +45,7 @@ class DemoAdProvider implements AdProvider {
       id: _uuid.v4(),
       provider: AdPlatformType.demo,
       adObject: Object(),
-      templateType: headlineImageStyle == HeadlineImageStyle.largeThumbnail
+      templateType: feedItemImageStyle == FeedItemImageStyle.largeThumbnail
           ? NativeAdTemplateType.medium
           : NativeAdTemplateType.small,
     );
@@ -56,7 +56,7 @@ class DemoAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle,
+    FeedItemImageStyle? feedItemImageStyle,
   }) async {
     _logger.info('Simulating banner ad load for demo environment.');
     // Simulate a delay for loading.