refactor(content): use country_picker for edit source

Author: fulleni

lib/content_management/bloc/edit_source/edit_source_bloc.dart

@@ -1,9 +1,11 @@
 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/l10n/app_localizations.dart';
+import 'package:flutter_news_app_web_dashboard_full_source_code/shared/shared.dart';
 
 part 'edit_source_event.dart';
 part 'edit_source_state.dart';
@@ -13,10 +15,8 @@ class EditSourceBloc extends Bloc<EditSourceEvent, EditSourceState> {
   /// {@macro edit_source_bloc}
   EditSourceBloc({
     required DataRepository<Source> sourcesRepository,
-    required DataRepository<Country> countriesRepository,
     required String sourceId,
   }) : _sourcesRepository = sourcesRepository,
-       _countriesRepository = countriesRepository,
        _sourceId = sourceId,
        super(const EditSourceState()) {
     on<EditSourceLoaded>(_onLoaded);
@@ -31,7 +31,6 @@ class EditSourceBloc extends Bloc<EditSourceEvent, EditSourceState> {
   }
 
   final DataRepository<Source> _sourcesRepository;
-  final DataRepository<Country> _countriesRepository;
   final String _sourceId;
 
   Future<void> _onLoaded(
@@ -40,14 +39,7 @@ class EditSourceBloc extends Bloc<EditSourceEvent, EditSourceState> {
   ) async {
     emit(state.copyWith(status: EditSourceStatus.loading));
     try {
-      final [sourceResponse, countriesResponse] = await Future.wait([
-        _sourcesRepository.read(id: _sourceId),
-        _countriesRepository.readAll(
-          sort: [const SortOption('updatedAt', SortOrder.desc)],
-        ),
-      ]);
-      final source = sourceResponse as Source;
-      final countries = (countriesResponse as PaginatedResponse<Country>).items;
+      final source = await _sourcesRepository.read(id: _sourceId);
       emit(
         state.copyWith(
           status: EditSourceStatus.initial,
@@ -59,7 +51,6 @@ class EditSourceBloc extends Bloc<EditSourceEvent, EditSourceState> {
           language: source.language,
           headquarters: () => source.headquarters,
           contentStatus: source.status,
-          countries: countries,
         ),
       );
     } on HttpException catch (e) {
@@ -128,12 +119,16 @@ class EditSourceBloc extends Bloc<EditSourceEvent, EditSourceState> {
     EditSourceHeadquartersChanged event,
     Emitter<EditSourceState> emit,
   ) {
-    emit(
-      state.copyWith(
-        headquarters: () => event.headquarters,
-        status: EditSourceStatus.initial,
-      ),
-    );
+    final packageCountry = event.headquarters;
+    if (packageCountry == null) {
+      emit(state.copyWith(headquarters: () => null));
+    } else {
+      final coreCountry = adaptPackageCountryToCoreCountry(packageCountry);
+      emit(
+        state.copyWith(
+            headquarters: () => coreCountry, status: EditSourceStatus.initial),
+      );
+    }
   }
 
   void _onStatusChanged(

lib/content_management/bloc/edit_source/edit_source_event.dart

@@ -67,7 +67,7 @@ final class EditSourceLanguageChanged extends EditSourceEvent {
 final class EditSourceHeadquartersChanged extends EditSourceEvent {
   const EditSourceHeadquartersChanged(this.headquarters);
 
-  final Country? headquarters;
+  final picker.Country? headquarters;
 
   @override
   List<Object?> get props => [headquarters];

lib/content_management/bloc/edit_source/edit_source_state.dart

@@ -29,7 +29,6 @@ final class EditSourceState extends Equatable {
     this.sourceType,
     this.language = '',
     this.headquarters,
-    this.countries = const [],
     this.contentStatus = ContentStatus.active,
     this.exception,
     this.updatedSource,
@@ -43,7 +42,6 @@ final class EditSourceState extends Equatable {
   final SourceType? sourceType;
   final String language;
   final Country? headquarters;
-  final List<Country> countries;
   final ContentStatus contentStatus;
   final HttpException? exception;
   final Source? updatedSource;
@@ -66,7 +64,6 @@ final class EditSourceState extends Equatable {
     ValueGetter<SourceType?>? sourceType,
     String? language,
     ValueGetter<Country?>? headquarters,
-    List<Country>? countries,
     ContentStatus? contentStatus,
     HttpException? exception,
     Source? updatedSource,
@@ -80,7 +77,6 @@ final class EditSourceState extends Equatable {
       sourceType: sourceType != null ? sourceType() : this.sourceType,
       language: language ?? this.language,
       headquarters: headquarters != null ? headquarters() : this.headquarters,
-      countries: countries ?? this.countries,
       contentStatus: contentStatus ?? this.contentStatus,
       exception: exception,
       updatedSource: updatedSource ?? this.updatedSource,
@@ -97,7 +93,6 @@ final class EditSourceState extends Equatable {
     sourceType,
     language,
     headquarters,
-    countries,
     contentStatus,
     exception,
     updatedSource,

lib/content_management/view/edit_source_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';
@@ -25,7 +26,6 @@ class EditSourcePage extends StatelessWidget {
     return BlocProvider(
       create: (context) => EditSourceBloc(
         sourcesRepository: context.read<DataRepository<Source>>(),
-        countriesRepository: context.read<DataRepository<Country>>(),
         sourceId: sourceId,
       )..add(const EditSourceLoaded()),
       child: const _EditSourceView(),
@@ -151,19 +151,6 @@ class _EditSourceViewState extends State<_EditSourceView> {
             );
           }
 
-          // Find the correct Country instance from the list to ensure
-          // the Dropdown can display the selection correctly.
-          Country? selectedHeadquarters;
-          if (state.headquarters != null) {
-            try {
-              selectedHeadquarters = state.countries.firstWhere(
-                (c) => c.id == state.headquarters!.id,
-              );
-            } catch (_) {
-              selectedHeadquarters = null;
-            }
-          }
-
           return SingleChildScrollView(
             child: Padding(
               padding: const EdgeInsets.all(AppSpacing.lg),
@@ -237,24 +224,18 @@ class _EditSourceViewState extends State<_EditSourceView> {
                       ),
                     ),
                     const SizedBox(height: AppSpacing.lg),
-                    DropdownButtonFormField<Country?>(
-                      value: selectedHeadquarters,
-                      decoration: InputDecoration(
-                        labelText: l10n.headquarters,
-                        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<EditSourceBloc>().add(
-                        EditSourceHeadquartersChanged(value),
-                      ),
+                    CountryPickerFormField(
+                      labelText: l10n.headquarters,
+                      initialValue: state.headquarters != null
+                          ? adaptCoreCountryToPackageCountry(
+                              state.headquarters!,
+                            )
+                          : null,
+                      onChanged: (picker.Country country) {
+                        context.read<EditSourceBloc>().add(
+                              EditSourceHeadquartersChanged(country),
+                            );
+                      },
                     ),
                     const SizedBox(height: AppSpacing.lg),
                     DropdownButtonFormField<ContentStatus>(