refactor(content): use country_picker for edit headline

Author: fulleni

lib/content_management/bloc/edit_headline/edit_headline_bloc.dart

@@ -1,8 +1,10 @@
 import 'package:bloc/bloc.dart';
 import 'package:core/core.dart';
+import 'package:country_picker/country_picker.dart' as picker;
 import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter_news_app_web_dashboard_full_source_code/shared/shared.dart';
 
 part 'edit_headline_event.dart';
 part 'edit_headline_state.dart';
@@ -14,12 +16,10 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
     required DataRepository<Headline> headlinesRepository,
     required DataRepository<Source> sourcesRepository,
     required DataRepository<Topic> topicsRepository,
-    required DataRepository<Country> countriesRepository,
     required String headlineId,
   }) : _headlinesRepository = headlinesRepository,
        _sourcesRepository = sourcesRepository,
        _topicsRepository = topicsRepository,
-       _countriesRepository = countriesRepository,
        _headlineId = headlineId,
        super(const EditHeadlineState()) {
     on<EditHeadlineLoaded>(_onLoaded);
@@ -37,7 +37,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
   final DataRepository<Headline> _headlinesRepository;
   final DataRepository<Source> _sourcesRepository;
   final DataRepository<Topic> _topicsRepository;
-  final DataRepository<Country> _countriesRepository;
   final String _headlineId;
 
   Future<void> _onLoaded(
@@ -50,7 +49,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
         headlineResponse,
         sourcesResponse,
         topicsResponse,
-        countriesResponse,
       ] = await Future.wait([
         _headlinesRepository.read(id: _headlineId),
         _sourcesRepository.readAll(
@@ -59,15 +57,11 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
         _topicsRepository.readAll(
           sort: [const SortOption('updatedAt', SortOrder.desc)],
         ),
-        _countriesRepository.readAll(
-          sort: [const SortOption('updatedAt', SortOrder.desc)],
-        ),
       ]);
 
       final headline = headlineResponse as Headline;
       final sources = (sourcesResponse as PaginatedResponse<Source>).items;
       final topics = (topicsResponse as PaginatedResponse<Topic>).items;
-      final countries = (countriesResponse as PaginatedResponse<Country>).items;
 
       emit(
         state.copyWith(
@@ -82,7 +76,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
           eventCountry: () => headline.eventCountry,
           sources: sources,
           topics: topics,
-          countries: countries,
           contentStatus: headline.status,
         ),
       );
@@ -166,12 +159,16 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
     EditHeadlineCountryChanged event,
     Emitter<EditHeadlineState> emit,
   ) {
-    emit(
-      state.copyWith(
-        eventCountry: () => event.country,
-        status: EditHeadlineStatus.initial,
-      ),
-    );
+    final packageCountry = event.country;
+    if (packageCountry == null) {
+      emit(state.copyWith(eventCountry: () => null));
+    } else {
+      final coreCountry = adaptPackageCountryToCoreCountry(packageCountry);
+      emit(
+        state.copyWith(
+            eventCountry: () => coreCountry, status: EditHeadlineStatus.initial),
+      );
+    }
   }
 
   void _onStatusChanged(

lib/content_management/bloc/edit_headline/edit_headline_event.dart

@@ -64,7 +64,7 @@ final class EditHeadlineTopicChanged extends EditHeadlineEvent {
 /// Event for when the headline's country is changed.
 final class EditHeadlineCountryChanged extends EditHeadlineEvent {
   const EditHeadlineCountryChanged(this.country);
-  final Country? country;
+  final picker.Country? country;
   @override
   List<Object?> get props => [country];
 }

lib/content_management/bloc/edit_headline/edit_headline_state.dart

@@ -32,7 +32,6 @@ final class EditHeadlineState extends Equatable {
     this.eventCountry,
     this.sources = const [],
     this.topics = const [],
-    this.countries = const [],
     this.contentStatus = ContentStatus.active,
     this.exception,
     this.updatedHeadline,
@@ -49,7 +48,6 @@ final class EditHeadlineState extends Equatable {
   final Country? eventCountry;
   final List<Source> sources;
   final List<Topic> topics;
-  final List<Country> countries;
   final ContentStatus contentStatus;
   final HttpException? exception;
   final Headline? updatedHeadline;
@@ -76,7 +74,6 @@ final class EditHeadlineState extends Equatable {
     ValueGetter<Country?>? eventCountry,
     List<Source>? sources,
     List<Topic>? topics,
-    List<Country>? countries,
     ContentStatus? contentStatus,
     HttpException? exception,
     Headline? updatedHeadline,
@@ -93,7 +90,6 @@ final class EditHeadlineState extends Equatable {
       eventCountry: eventCountry != null ? eventCountry() : this.eventCountry,
       sources: sources ?? this.sources,
       topics: topics ?? this.topics,
-      countries: countries ?? this.countries,
       contentStatus: contentStatus ?? this.contentStatus,
       exception: exception,
       updatedHeadline: updatedHeadline ?? this.updatedHeadline,
@@ -113,7 +109,6 @@ final class EditHeadlineState extends Equatable {
     eventCountry,
     sources,
     topics,
-    countries,
     contentStatus,
     exception,
     updatedHeadline,

lib/content_management/view/edit_headline_page.dart

@@ -1,4 +1,5 @@
 import 'package:core/core.dart';
+import 'package:country_picker/country_picker.dart' as picker;
 import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -27,7 +28,6 @@ class EditHeadlinePage extends StatelessWidget {
         headlinesRepository: context.read<DataRepository<Headline>>(),
         sourcesRepository: context.read<DataRepository<Source>>(),
         topicsRepository: context.read<DataRepository<Topic>>(),
-        countriesRepository: context.read<DataRepository<Country>>(),
         headlineId: headlineId,
       )..add(const EditHeadlineLoaded()),
       child: const _EditHeadlineView(),
@@ -178,17 +178,6 @@ class _EditHeadlineViewState extends State<_EditHeadlineView> {
             }
           }
 
-          Country? selectedCountry;
-          if (state.eventCountry != null) {
-            try {
-              selectedCountry = state.countries.firstWhere(
-                (c) => c.id == state.eventCountry!.id,
-              );
-            } catch (_) {
-              selectedCountry = null;
-            }
-          }
-
           return SingleChildScrollView(
             child: Padding(
               padding: const EdgeInsets.all(AppSpacing.lg),
@@ -282,24 +271,18 @@ class _EditHeadlineViewState extends State<_EditHeadlineView> {
                           .add(EditHeadlineTopicChanged(value)),
                     ),
                     const SizedBox(height: AppSpacing.lg),
-                    DropdownButtonFormField<Country?>(
-                      value: selectedCountry,
-                      decoration: InputDecoration(
-                        labelText: l10n.countryName,
-                        border: const OutlineInputBorder(),
-                      ),
-                      items: [
-                        DropdownMenuItem(value: null, child: Text(l10n.none)),
-                        ...state.countries.map(
-                          (country) => DropdownMenuItem(
-                            value: country,
-                            child: Text(country.name),
-                          ),
-                        ),
-                      ],
-                      onChanged: (value) => context
-                          .read<EditHeadlineBloc>()
-                          .add(EditHeadlineCountryChanged(value)),
+                    CountryPickerFormField(
+                      labelText: l10n.countryName,
+                      initialValue: state.eventCountry != null
+                          ? adaptCoreCountryToPackageCountry(
+                              state.eventCountry!,
+                            )
+                          : null,
+                      onChanged: (picker.Country country) {
+                        context.read<EditHeadlineBloc>().add(
+                              EditHeadlineCountryChanged(country),
+                            );
+                      },
                     ),
                     const SizedBox(height: AppSpacing.lg),
                     DropdownButtonFormField<ContentStatus>(