Merge pull request #98 from flutter-news-app-full-source-code/integrate-country-model-in-teh-generic-entity-details

Integrate country model in teh generic entity details

Author: fulleni

lib/entity_details/bloc/entity_details_bloc.dart

@@ -20,12 +20,14 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
     required DataRepository<Headline> headlinesRepository,
     required DataRepository<Topic> topicRepository,
     required DataRepository<Source> sourceRepository,
+    required DataRepository<Country> countryRepository,
     required AccountBloc accountBloc,
     required AppBloc appBloc,
     required FeedDecoratorService feedDecoratorService,
   }) : _headlinesRepository = headlinesRepository,
        _topicRepository = topicRepository,
        _sourceRepository = sourceRepository,
+       _countryRepository = countryRepository,
        _accountBloc = accountBloc,
        _appBloc = appBloc,
        _feedDecoratorService = feedDecoratorService,
@@ -52,6 +54,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
   final DataRepository<Headline> _headlinesRepository;
   final DataRepository<Topic> _topicRepository;
   final DataRepository<Source> _sourceRepository;
+  final DataRepository<Country> _countryRepository;
   final AccountBloc _accountBloc;
   final AppBloc _appBloc;
   final FeedDecoratorService _feedDecoratorService;
@@ -79,22 +82,33 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
         entityToLoad = event.entity!;
         contentTypeToLoad = event.entity is Topic
             ? ContentType.topic
-            : ContentType.source;
+            : event.entity is Country
+                ? ContentType.country
+                : ContentType.source;
       } else {
         contentTypeToLoad = event.contentType!;
-        if (contentTypeToLoad == ContentType.topic) {
-          entityToLoad = await _topicRepository.read(id: event.entityId!);
-        } else {
-          entityToLoad = await _sourceRepository.read(id: event.entityId!);
+        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.',
+            );
         }
       }
 
       // 2. Fetch Initial Headlines
       final filter = <String, dynamic>{};
       if (contentTypeToLoad == ContentType.topic) {
         filter['topic.id'] = (entityToLoad as Topic).id;
-      } else {
+      } else if (contentTypeToLoad == ContentType.source) {
         filter['source.id'] = (entityToLoad as Source).id;
+      } else if (contentTypeToLoad == ContentType.country) {
+        filter['eventCountry.id'] = (entityToLoad as Country).id;
       }
 
       final headlineResponse = await _headlinesRepository.readAll(
@@ -139,6 +153,10 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
           isCurrentlyFollowing = preferences.followedSources.any(
             (s) => s.id == (entityToLoad as Source).id,
           );
+        } else if (entityToLoad is Country) {
+          isCurrentlyFollowing = preferences.followedCountries.any(
+            (c) => c.id == (entityToLoad as Country).id,
+          );
         }
       }
 
@@ -179,6 +197,8 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
       _accountBloc.add(AccountFollowTopicToggled(topic: entity));
     } else if (entity is Source) {
       _accountBloc.add(AccountFollowSourceToggled(source: entity));
+    } else if (entity is Country) {
+      _accountBloc.add(AccountFollowCountryToggled(country: entity));
     }
   }
 
@@ -200,6 +220,8 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
         filter['topic.id'] = (state.entity! as Topic).id;
       } else if (state.entity is Source) {
         filter['source.id'] = (state.entity! as Source).id;
+      } else if (state.entity is Country) {
+        filter['eventCountry.id'] = (state.entity! as Country).id;
       }
 
       final headlineResponse = await _headlinesRepository.readAll(
@@ -284,6 +306,10 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
       isCurrentlyFollowing = preferences.followedSources.any(
         (s) => s.id == entity.id,
       );
+    } else if (entity is Country) {
+      isCurrentlyFollowing = preferences.followedCountries.any(
+        (c) => c.id == entity.id,
+      );
     }
 
     if (state.isFollowing != isCurrentlyFollowing) {

lib/entity_details/view/entity_details_page.dart

@@ -52,6 +52,7 @@ class EntityDetailsPage extends StatelessWidget {
       create: (context) {
         final topicsRepository = context.read<DataRepository<Topic>>();
         final sourcesRepository = context.read<DataRepository<Source>>();
+        final countriesRepository = context.read<DataRepository<Country>>();
         final feedDecoratorService = FeedDecoratorService(
           topicsRepository: topicsRepository,
           sourcesRepository: sourcesRepository,
@@ -61,6 +62,7 @@ class EntityDetailsPage extends StatelessWidget {
               headlinesRepository: context.read<DataRepository<Headline>>(),
               topicRepository: topicsRepository,
               sourceRepository: sourcesRepository,
+              countryRepository: countriesRepository,
               accountBloc: context.read<AccountBloc>(),
               appBloc: context.read<AppBloc>(),
               feedDecoratorService: feedDecoratorService,
@@ -131,6 +133,8 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
         name = l10n.entityDetailsTopicTitle;
       case ContentType.source:
         name = l10n.entityDetailsSourceTitle;
+      case ContentType.country:
+        name = l10n.entityDetailsCountryTitle;
       default:
         name = l10n.detailsPageTitle;
     }
@@ -190,6 +194,10 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
             final src = state.entity! as Source;
             appBarTitleText = src.name;
             appBarIconData = Icons.source_outlined;
+          } else if (state.entity is Country) {
+            final country = state.entity! as Country;
+            appBarTitleText = country.name;
+            appBarIconData = Icons.flag_outlined;
           } else {
             appBarTitleText = l10n.detailsPageTitle;
           }
@@ -198,10 +206,8 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
               ? (state.entity! as Topic).description
               : state.entity is Source
               ? (state.entity! as Source).description
-              : null;
-
-          final entityIconUrl = (state.entity is Topic)
-              ? (state.entity! as Topic).iconUrl
+              : state.entity is Country
+              ? (state.entity! as Country).name // Using name as description for country
               : null;
 
           final followButton = IconButton(
@@ -219,6 +225,12 @@ 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;
+
           final Widget appBarTitleWidget = Row(
             mainAxisSize: MainAxisSize.min,
             children: [