Merge pull request #99 from flutter-news-app-full-source-code/Refactor-Entity-Details-Page-Navigation

Refactor entity details page navigation

Author: fulleni

lib/account/view/manage_followed_items/countries/followed_countries_list_page.dart

@@ -99,7 +99,10 @@ class FollowedCountriesListPage extends StatelessWidget {
                 onTap: () {
                   context.push(
                     Routes.countryDetails,
-                    extra: EntityDetailsPageArguments(entity: country),
+                    extra: EntityDetailsPageArguments(
+                      entityId: country.id,
+                      contentType: ContentType.country,
+                    ),
                   );
                 },
               );

lib/account/view/manage_followed_items/sources/followed_sources_list_page.dart

@@ -96,7 +96,10 @@ class FollowedSourcesListPage extends StatelessWidget {
                 onTap: () {
                   context.push(
                     Routes.sourceDetails,
-                    extra: EntityDetailsPageArguments(entity: source),
+                    extra: EntityDetailsPageArguments(
+                      entityId: source.id,
+                      contentType: ContentType.source,
+                    ),
                   );
                 },
               );

lib/account/view/manage_followed_items/topics/followed_topics_list_page.dart

@@ -104,7 +104,10 @@ class FollowedTopicsListPage extends StatelessWidget {
                 onTap: () {
                   context.push(
                     Routes.topicDetails,
-                    extra: EntityDetailsPageArguments(entity: topic),
+                    extra: EntityDetailsPageArguments(
+                      entityId: topic.id,
+                      contentType: ContentType.topic,
+                    ),
                   );
                 },
               );

lib/entity_details/bloc/entity_details_bloc.dart

@@ -76,29 +76,20 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
     try {
       // 1. Determine/Fetch Entity
       FeedItem entityToLoad;
-      ContentType contentTypeToLoad;
-
-      if (event.entity != null) {
-        entityToLoad = event.entity!;
-        contentTypeToLoad = event.entity is Topic
-            ? ContentType.topic
-            : event.entity is Country
-                ? ContentType.country
-                : ContentType.source;
-      } else {
-        contentTypeToLoad = event.contentType!;
-        switch (contentTypeToLoad) {
-          case ContentType.topic:
-            entityToLoad = await _topicRepository.read(id: event.entityId!);
-          case ContentType.source:
-            entityToLoad = await _sourceRepository.read(id: event.entityId!);
-          case ContentType.country:
-            entityToLoad = await _countryRepository.read(id: event.entityId!);
-          default:
-            throw const OperationFailedException(
-              'Unsupported ContentType for EntityDetails.',
-            );
-        }
+      final contentTypeToLoad = event.contentType;
+
+      switch (contentTypeToLoad) {
+        case ContentType.topic:
+          entityToLoad = await _topicRepository.read(id: event.entityId);
+        case ContentType.source:
+          entityToLoad = await _sourceRepository.read(id: event.entityId);
+        case ContentType.country:
+          entityToLoad = await _countryRepository.read(id: event.entityId);
+        // ignore: no_default_cases
+        default:
+          throw const OperationFailedException(
+            'Unsupported ContentType for EntityDetails.',
+          );
       }
 
       // 2. Fetch Initial Headlines

lib/entity_details/bloc/entity_details_event.dart

@@ -15,28 +15,21 @@ abstract class EntityDetailsEvent extends Equatable {
 class EntityDetailsLoadRequested extends EntityDetailsEvent {
   const EntityDetailsLoadRequested({
     required this.adThemeStyle,
-    this.entityId,
-    this.contentType,
-    this.entity,
-  }) : assert(
-         (entityId != null && contentType != null) || entity != null,
-         'Either entityId/contentType or a full entity object must be provided.',
-       );
+    required this.entityId,
+    required this.contentType,
+  });
 
   /// The unique ID of the entity to load.
-  final String? entityId;
+  final String entityId;
 
   /// The type of the entity to load.
-  final ContentType? contentType;
-
-  /// The full entity object, if already available.
-  final FeedItem? entity;
+  final ContentType contentType;
 
   /// The current ad theme style, required for ad injection.
   final AdThemeStyle adThemeStyle;
 
   @override
-  List<Object?> get props => [entityId, contentType, entity, adThemeStyle];
+  List<Object?> get props => [entityId, contentType, adThemeStyle];
 }
 
 /// Event to toggle the "follow" status of the currently loaded entity.

lib/entity_details/view/entity_details_page.dart

@@ -21,17 +21,12 @@ import 'package:ui_kit/ui_kit.dart';
 
 class EntityDetailsPageArguments {
   const EntityDetailsPageArguments({
-    this.entityId,
-    this.contentType,
-    this.entity,
-  }) : assert(
-         (entityId != null && contentType != null) || entity != null,
-         'Either entityId/contentType or a full entity object must be provided.',
-       );
+    required this.entityId,
+    required this.contentType,
+  });
 
-  final String? entityId;
-  final ContentType? contentType;
-  final FeedItem? entity;
+  final String entityId;
+  final ContentType contentType;
 }
 
 class EntityDetailsPage extends StatelessWidget {
@@ -70,7 +65,6 @@ class EntityDetailsPage extends StatelessWidget {
               EntityDetailsLoadRequested(
                 entityId: args.entityId,
                 contentType: args.contentType,
-                entity: args.entity,
                 adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
               ),
             );
@@ -176,7 +170,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
                 EntityDetailsLoadRequested(
                   entityId: widget.args.entityId,
                   contentType: widget.args.contentType,
-                  entity: widget.args.entity,
                   adThemeStyle: AdThemeStyle.fromTheme(theme),
                 ),
               ),
@@ -207,7 +200,8 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
               : state.entity is Source
               ? (state.entity! as Source).description
               : state.entity is Country
-              ? (state.entity! as Country).name // Using name as description for country
+              ? (state.entity! as Country)
+                    .name // Using name as description for country
               : null;
 
           final followButton = IconButton(
@@ -228,8 +222,8 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
           final entityIconUrl = (state.entity is Topic)
               ? (state.entity! as Topic).iconUrl
               : (state.entity is Country)
-                  ? (state.entity! as Country).flagUrl
-                  : null;
+              ? (state.entity! as Country).flagUrl
+              : null;
 
           final Widget appBarTitleWidget = Row(
             mainAxisSize: MainAxisSize.min,

lib/headline-details/view/headline_details_page.dart

@@ -424,7 +424,10 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
           onTap: () {
             context.push(
               Routes.sourceDetails,
-              extra: EntityDetailsPageArguments(entity: headline.source),
+              extra: EntityDetailsPageArguments(
+                entityId: headline.id,
+                contentType: ContentType.headline,
+              ),
             );
           },
           borderRadius: BorderRadius.circular(AppSpacing.sm),
@@ -449,7 +452,10 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
           onTap: () {
             context.push(
               Routes.topicDetails,
-              extra: EntityDetailsPageArguments(entity: headline.topic),
+              extra: EntityDetailsPageArguments(
+                entityId: headline.topic.id,
+                contentType: ContentType.topic,
+              ),
             );
           },
           borderRadius: BorderRadius.circular(AppSpacing.sm),

lib/headlines-search/widgets/category_item_widget.dart

@@ -24,7 +24,10 @@ class TopicItemWidget extends StatelessWidget {
       onTap: () {
         context.push(
           Routes.topicDetails,
-          extra: EntityDetailsPageArguments(entity: topic),
+          extra: EntityDetailsPageArguments(
+            entityId: topic.id,
+            contentType: ContentType.topic,
+          ),
         );
       },
     );

lib/headlines-search/widgets/country_item_widget.dart

@@ -23,7 +23,10 @@ class CountryItemWidget extends StatelessWidget {
       onTap: () {
         context.push(
           Routes.countryDetails,
-          extra: EntityDetailsPageArguments(entity: country),
+          extra: EntityDetailsPageArguments(
+            entityId: country.id,
+            contentType: ContentType.country,
+          ),
         );
       },
     );

lib/headlines-search/widgets/source_item_widget.dart

@@ -24,7 +24,10 @@ class SourceItemWidget extends StatelessWidget {
       onTap: () {
         context.push(
           Routes.sourceDetails,
-          extra: EntityDetailsPageArguments(entity: source),
+          extra: EntityDetailsPageArguments(
+            entityId: source.id,
+            contentType: ContentType.source,
+          ),
         );
       },
     );