@@ -470,70 +470,22 @@ GoRouter createRouter({
470470 GoRoute (
471471 path: Routes .feedFilterTopics,
472472 name: Routes .feedFilterTopicsName,
473- // Wrap with BlocProviderUserContentPreferencesRepository
474- builder: (context, state) => BlocProvider (
475- create: (context) => TopicsFilterBloc (
476- topicsRepository: context
477- .read <DataRepository <Topic >>(),
478- userContentPreferencesRepository: context
479- .read <DataRepository <UserContentPreferences >>(),
480- appBloc: context.read <AppBloc >(),
481- ),
482- child: const TopicFilterPage (),
483- ),
473+ builder: (context, state) => const TopicFilterPage (),
484474 ),
485475 // Sub-route for source selection
486476 GoRoute (
487477 path: Routes .feedFilterSources,
488478 name: Routes .feedFilterSourcesName,
489- // Wrap with BlocProvider
490- builder: (context, state) => BlocProvider (
491- create: (context) => SourcesFilterBloc (
492- sourcesRepository: context
493- .read <DataRepository <Source >>(),
494- countriesRepository: context
495- .read <DataRepository <Country >>(),
496- userContentPreferencesRepository: context
497- .read <DataRepository <UserContentPreferences >>(),
498- appBloc: context.read <AppBloc >(),
499- ),
500- // Pass initialSelectedSources from state.extra
501- child: Builder (
502- builder: (context) {
503- final initialSources =
504- state.extra as List <Source >? ?? const [];
505-
506- return SourceFilterPage (
507- initialSelectedSources: initialSources,
508- );
509- },
510- ),
511- ),
479+ builder: (context, state) => const SourceFilterPage (),
512480 ),
513481 GoRoute (
514482 path: Routes .feedFilterEventCountries,
515483 name: Routes .feedFilterEventCountriesName,
516484 pageBuilder: (context, state) {
517485 final l10n = context.l10n;
518- final initialSelection =
519- state.extra as List <Country >? ;
520486 return MaterialPage (
521- child: BlocProvider (
522- create: (context) => CountriesFilterBloc (
523- countriesRepository: context
524- .read <DataRepository <Country >>(),
525- userContentPreferencesRepository: context
526- .read<
527- DataRepository <UserContentPreferences >
528- > (),
529- appBloc: context.read <AppBloc >(),
530- ),
531- child: CountryFilterPage (
532- title:
533- l10n.headlinesFeedFilterEventCountryLabel,
534- filter: CountryFilterUsage .hasActiveHeadlines,
535- key: ValueKey (initialSelection.hashCode),
536- ),
487+ child: CountryFilterPage (
488+ title: l10n.headlinesFeedFilterEventCountryLabel,
537489 ),
538490 );
539491 },
0 commit comments