♻️ refactor: 依存関係を明確化するために、readするだけのProviderは明示的にreadするように修正

Issue #145
susatthi · May 30, 2022 · 8f1ec61 · 8f1ec61
1 parent 18b8d0b
commit 8f1ec61
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/lib/presentation/repo/state/list_view_state.dart b/lib/presentation/repo/state/list_view_state.dart
@@ -21,7 +21,6 @@ part 'list_view_state.freezed.dart';
 final repoListViewStateProvider = StateNotifierProvider.autoDispose<
     RepoListViewNotifier, AsyncValue<RepoListViewState>?>(
   (ref) {
-    final repoRepository = ref.watch(repoRepositoryProvider);
     final query = ref.watch(repoSearchReposQueryProvider);
     final sort = ref.watch(repoSearchReposSortProvider);
     final order = ref.watch(repoSearchReposOrderProvider);
@@ -30,7 +29,7 @@ final repoListViewStateProvider = StateNotifierProvider.autoDispose<
       'sort = ${sort.name}, order = ${order.name}',
     );
     return RepoListViewNotifier(
-      repoRepository,
+      ref.read,
       query: query,
       sort: sort,
       order: order,
@@ -63,11 +62,12 @@ class RepoListViewState with _$RepoListViewState {
 class RepoListViewNotifier
     extends StateNotifier<AsyncValue<RepoListViewState>?> {
   RepoListViewNotifier(
-    this._repoRepository, {
+    Reader read, {
     required this.query,
     required this.sort,
     required this.order,
-  }) : super(null) {
+  })  : _repoRepository = read(repoRepositoryProvider),
+        super(null) {
     _search();
   }
 

diff --git a/lib/presentation/repo/state/readme_content.dart b/lib/presentation/repo/state/readme_content.dart
@@ -12,13 +12,12 @@ import '../../../utils/logger.dart';
 final repoReadmeContentProviderFamily = StateNotifierProvider.family
     .autoDispose<RepoReadmeContentNotifier, AsyncValue<String>, Repo>(
   (ref, repo) {
-    final repoRepository = ref.watch(repoRepositoryProvider);
     logger.i(
       'Create RepoReadmeContentNotifier: fullName = ${repo.fullName}, '
       'defaultBranch = ${repo.defaultBranch}',
     );
     return RepoReadmeContentNotifier(
-      repoRepository,
+      ref.read,
       repo: repo,
     );
   },
@@ -27,9 +26,10 @@ final repoReadmeContentProviderFamily = StateNotifierProvider.family
 /// リポジトリREADMEコンテンツNotifier
 class RepoReadmeContentNotifier extends StateNotifier<AsyncValue<String>> {
   RepoReadmeContentNotifier(
-    this._repoRepository, {
+    Reader read, {
     required this.repo,
-  }) : super(const AsyncValue.loading()) {
+  })  : _repoRepository = read(repoRepositoryProvider),
+        super(const AsyncValue.loading()) {
     _get();
   }
 

diff --git a/lib/presentation/repo/state/search_repos_order.dart b/lib/presentation/repo/state/search_repos_order.dart
@@ -10,7 +10,7 @@ import '../../../domain/repositories/app_data_repository.dart';
 /// リポジトリ検索用オーダー値プロバイダー
 final repoSearchReposOrderProvider = StateProvider<SearchReposOrder>(
   (ref) {
-    final appDataRepository = ref.watch(appDataRepositoryProvider);
+    final appDataRepository = ref.read(appDataRepositoryProvider);
     return appDataRepository.getSearchReposOrder();
   },
 );
@@ -19,7 +19,7 @@ final repoSearchReposOrderProvider = StateProvider<SearchReposOrder>(
 final repoSearchReposOrderUpdaterProvider = Provider(
   (ref) {
     final notifier = ref.read(repoSearchReposOrderProvider.notifier);
-    final appDataRepository = ref.watch(appDataRepositoryProvider);
+    final appDataRepository = ref.read(appDataRepositoryProvider);
     return (SearchReposOrder order) {
       appDataRepository.setSearchReposOrder(order);
       notifier.state = appDataRepository.getSearchReposOrder();

diff --git a/lib/presentation/repo/state/search_repos_query.dart b/lib/presentation/repo/state/search_repos_query.dart
@@ -18,5 +18,5 @@ final repoSearchReposInitQueryProvider = Provider<String>(
 
 /// リポジトリ検索文字列プロバイダー
 final repoSearchReposQueryProvider = StateProvider<String>(
-  (ref) => ref.watch(repoSearchReposInitQueryProvider),
+  (ref) => ref.read(repoSearchReposInitQueryProvider),
 );
diff --git a/lib/presentation/repo/state/search_repos_sort.dart b/lib/presentation/repo/state/search_repos_sort.dart
@@ -10,7 +10,7 @@ import '../../../domain/repositories/app_data_repository.dart';
 /// リポジトリ検索用ソート値プロバイダー
 final repoSearchReposSortProvider = StateProvider<SearchReposSort>(
   (ref) {
-    final appDataRepository = ref.watch(appDataRepositoryProvider);
+    final appDataRepository = ref.read(appDataRepositoryProvider);
     return appDataRepository.getSearchReposSort();
   },
 );
@@ -19,7 +19,7 @@ final repoSearchReposSortProvider = StateProvider<SearchReposSort>(
 final repoSearchReposSortUpdaterProvider = Provider(
   (ref) {
     final notifier = ref.read(repoSearchReposSortProvider.notifier);
-    final appDataRepository = ref.watch(appDataRepositoryProvider);
+    final appDataRepository = ref.read(appDataRepositoryProvider);
     return (SearchReposSort sort) {
       appDataRepository.setSearchReposSort(sort);
       notifier.state = appDataRepository.getSearchReposSort();

diff --git a/lib/presentation/repo/state/selected_repo.dart b/lib/presentation/repo/state/selected_repo.dart
@@ -21,10 +21,9 @@ final repoSelectedRepoProvider = StateNotifierProvider.autoDispose<
 final repoSelectedRepoProviderFamily = StateNotifierProvider.family.autoDispose<
     RepoSelectedRepoNotifier, AsyncValue<Repo>, RepoSelectedRepoParameter>(
   (ref, parameter) {
-    final repoRepository = ref.watch(repoRepositoryProvider);
     logger.i('Create RepoSelectedRepoNotifier: parameter = $parameter');
     return RepoSelectedRepoNotifier(
-      repoRepository,
+      ref.read,
       parameter: parameter,
     );
   },
@@ -62,9 +61,10 @@ class RepoSelectedRepoParameter extends Equatable {
 /// 選択中のリポジトリNotifier
 class RepoSelectedRepoNotifier extends StateNotifier<AsyncValue<Repo>> {
   RepoSelectedRepoNotifier(
-    this._repoRepository, {
+    Reader read, {
     required this.parameter,
-  }) : super(const AsyncValue.loading()) {
+  })  : _repoRepository = read(repoRepositoryProvider),
+        super(const AsyncValue.loading()) {
     final value = parameter.extra;
     if (value != null) {
       // extra があればそのまま使う