♻️ refactor: ドメイン層とインフラストラクチャ層のディレクトリ構成を変更

Issue #145

lib/repositories/app_data_repository.dart → lib/domain/app_data/repositories/app_data_repository.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import 'hive/app_data_repository.dart';
-import 'repo_repository.dart';
+import '../../../infrastructure/hive/app_data_repository.dart';
+import '../../repo/repositories/repo_repository.dart';
 
 /// アプリデータRepositoryプロバイダー
 final appDataRepositoryProvider = Provider<AppDataRepository>(

lib/entities/owner/owner_data.dart → lib/domain/repo/entities/owner_data.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-import 'owner.dart';
+import '../../../infrastructure/github/json_object/owner/owner.dart';
 
 /// UI用オーナーEntity
 class OwnerData {

lib/entities/repo/repo_data.dart → lib/domain/repo/entities/repo_data.dart

@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:number_display/number_display.dart';
 
-import '../../utils/extensions.dart';
-import '../owner/owner_data.dart';
-import 'repo.dart';
+import '../../../infrastructure/github/json_object/repo/repo.dart';
+import '../../../utils/extensions.dart';
+import 'owner_data.dart';
 
 /// UI用リポジトリEntity
 class RepoData {

lib/repositories/repo_repository.dart → lib/domain/repo/repositories/repo_repository.dart

@@ -4,9 +4,9 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../entities/repo/repo.dart';
-import '../entities/search_repos_result/search_repos_result.dart';
-import 'github/repo_repository.dart';
+import '../../../infrastructure/github/json_object/repo/repo.dart';
+import '../../../infrastructure/github/json_object/search_repos_result/search_repos_result.dart';
+import '../../../infrastructure/github/repo_repository.dart';
 
 final repoRepositoryProvider = Provider<RepoRepository>(
   (ref) => ref.watch(githubRepoRepositoryProvider),

lib/repositories/github/api.dart → lib/infrastructure/github/api.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
-import '../repo_repository.dart';
+import '../../domain/repo/repositories/repo_repository.dart';
 
 /// GitHub API の定義
 /// 各APIはUriを返す

lib/repositories/github/repo_repository.dart → lib/infrastructure/github/repo_repository.dart

@@ -4,12 +4,12 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../entities/repo/repo.dart';
-import '../../entities/search_repos_result/search_repos_result.dart';
-import '../repo_repository.dart';
+import '../../domain/repo/repositories/repo_repository.dart';
 import 'api.dart';
 import 'exception.dart';
 import 'http_client.dart';
+import 'json_object/repo/repo.dart';
+import 'json_object/search_repos_result/search_repos_result.dart';
 
 /// GitHub の URL
 const githubSiteUrl = 'https://github.com';

lib/repositories/hive/app_data_repository.dart → lib/infrastructure/hive/app_data_repository.dart

@@ -5,8 +5,8 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
-import '../app_data_repository.dart';
-import '../repo_repository.dart';
+import '../../domain/app_data/repositories/app_data_repository.dart';
+import '../../domain/repo/repositories/repo_repository.dart';
 
 /// Hive版アプリデータRepositoryプロバイダー
 final hiveAppDataRepositoryProvider = Provider<HiveAppDataRepository>(

lib/main.dart

@@ -7,8 +7,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
 import 'config/app.dart';
+import 'infrastructure/hive/app_data_repository.dart';
 import 'localizations/strings.g.dart';
-import 'repositories/hive/app_data_repository.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

lib/presentation/repo/components/repo_avatar_preview_view.dart

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:photo_view/photo_view.dart';
 
-import '../../../entities/repo/repo_data.dart';
+import '../../../domain/repo/entities/repo_data.dart';
 import 'repo_selected_repo.dart';
 
 /// アバター画像プレビューView

lib/presentation/repo/components/repo_detail_view.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
-import '../../../entities/repo/repo_data.dart';
+import '../../../domain/repo/entities/repo_data.dart';
 import '../../../utils/logger.dart';
 import '../../../utils/url_launcher.dart';
 import '../../common/components/cached_circle_avatar.dart';

lib/presentation/repo/components/repo_list_view.dart

@@ -9,7 +9,7 @@ import 'package:lottie/lottie.dart';
 import 'package:number_display/number_display.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
-import '../../../entities/repo/repo_data.dart';
+import '../../../domain/repo/entities/repo_data.dart';
 import '../../../localizations/strings.g.dart';
 import '../../../utils/assets/assets.gen.dart';
 import '../../../utils/logger.dart';

lib/presentation/repo/components/repo_list_view_notifier.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../../entities/repo/repo_data.dart';
-import '../../../repositories/repo_repository.dart';
+import '../../../domain/repo/entities/repo_data.dart';
+import '../../../domain/repo/repositories/repo_repository.dart';
 import '../../../utils/logger.dart';
 import 'repo_list_view_state.dart';
 import 'repo_search_repos_order.dart';

lib/presentation/repo/components/repo_list_view_state.dart

@@ -4,8 +4,8 @@
 
 import 'package:freezed_annotation/freezed_annotation.dart';
 
-import '../../../entities/repo/repo_data.dart';
-import '../../../entities/search_repos_result/search_repos_result.dart';
+import '../../../domain/repo/entities/repo_data.dart';
+import '../../../infrastructure/github/json_object/search_repos_result/search_repos_result.dart';
 
 part 'repo_list_view_state.freezed.dart';
 

lib/presentation/repo/components/repo_order_toggle_button.dart

@@ -5,8 +5,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import '../../../domain/repo/repositories/repo_repository.dart';
 import '../../../localizations/strings.g.dart';
-import '../../../repositories/repo_repository.dart';
 import '../../../utils/logger.dart';
 import 'repo_list_view_notifier.dart';
 import 'repo_search_repos_order.dart';

lib/presentation/repo/components/repo_readme_content.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../../entities/repo/repo_data.dart';
-import '../../../repositories/repo_repository.dart';
+import '../../../domain/repo/entities/repo_data.dart';
+import '../../../domain/repo/repositories/repo_repository.dart';
 import '../../../utils/logger.dart';
 
 /// リポジトリREADMEコンテンツプロバイダー（Family）

lib/presentation/repo/components/repo_readme_markdown.dart

@@ -11,7 +11,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:lottie/lottie.dart';
 import 'package:markdown/markdown.dart';
 
-import '../../../entities/repo/repo_data.dart';
+import '../../../domain/repo/entities/repo_data.dart';
 import '../../../utils/assets/assets.gen.dart';
 import '../../../utils/logger.dart';
 import '../../../utils/url_launcher.dart';

lib/presentation/repo/components/repo_search_repos_order.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../../repositories/app_data_repository.dart';
-import '../../../repositories/repo_repository.dart';
+import '../../../domain/app_data/repositories/app_data_repository.dart';
+import '../../../domain/repo/repositories/repo_repository.dart';
 
 /// リポジトリ検索用オーダー値プロバイダー
 final repoSearchReposOrderProvider =

lib/presentation/repo/components/repo_search_repos_sort.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../../repositories/app_data_repository.dart';
-import '../../../repositories/repo_repository.dart';
+import '../../../domain/app_data/repositories/app_data_repository.dart';
+import '../../../domain/repo/repositories/repo_repository.dart';
 
 /// リポジトリ検索用ソート値プロバイダー
 final repoSearchReposSortProvider =

lib/presentation/repo/components/repo_selected_repo.dart

@@ -6,8 +6,8 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
-import '../../../entities/repo/repo_data.dart';
-import '../../../repositories/repo_repository.dart';
+import '../../../domain/repo/entities/repo_data.dart';
+import '../../../domain/repo/repositories/repo_repository.dart';
 import '../../../utils/logger.dart';
 import '../repo_view_page.dart';
 

lib/presentation/repo/components/repo_sort_selector_bottom_sheet.dart

@@ -5,8 +5,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import '../../../domain/repo/repositories/repo_repository.dart';
 import '../../../localizations/strings.g.dart';
-import '../../../repositories/repo_repository.dart';
 import '../../../utils/logger.dart';
 import 'repo_order_toggle_button.dart';
 import 'repo_search_repos_sort.dart';

lib/utils/extensions.dart

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
 
+import '../infrastructure/github/exception.dart';
 import '../localizations/strings.g.dart';
-import '../repositories/github/exception.dart';
 
 extension IterableEx<E> on Iterable<E> {
   /// for Null Safety [firstWhere]

test/repositories/app_data_repository_test.dart → test/domain/app_data/repositories/app_data_repository_test.dart

@@ -6,11 +6,11 @@ import 'dart:io';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/app_data_repository.dart';
+import 'package:github_search/domain/app_data/repositories/app_data_repository.dart';
 
-import '../test_utils/hive.dart';
-import '../test_utils/locale.dart';
-import '../test_utils/mocks.dart';
+import '../../../test_utils/hive.dart';
+import '../../../test_utils/locale.dart';
+import '../../../test_utils/mocks.dart';
 
 void main() {
   late Directory tmpDir;

test/entities/owner/owner_data_test.dart → test/domain/repo/entities/owner_data_test.dart

@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/owner/owner.dart';
-import 'package:github_search/entities/owner/owner_data.dart';
+import 'package:github_search/domain/repo/entities/owner_data.dart';
+import 'package:github_search/infrastructure/github/json_object/owner/owner.dart';
 
-import '../../test_utils/utils.dart';
+import '../../../test_utils/utils.dart';
 
 void main() {
   final ownerJsonObject = TestAssets.readJsonMap('github/owner.json')!;

test/entities/repo/repo_data_test.dart → test/domain/repo/entities/repo_data_test.dart

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/repo/repo.dart';
-import 'package:github_search/entities/repo/repo_data.dart';
+import 'package:github_search/domain/repo/entities/repo_data.dart';
+import 'package:github_search/infrastructure/github/json_object/repo/repo.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-import '../../test_utils/utils.dart';
+import '../../../test_utils/utils.dart';
 
 void main() {
   late RepoData repoData;

test/repositories/repo_repository_test.dart → test/domain/repo/repositories/repo_repository_test.dart

@@ -4,10 +4,10 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/repo_repository.dart';
+import 'package:github_search/domain/repo/repositories/repo_repository.dart';
 
-import '../test_utils/locale.dart';
-import '../test_utils/mocks.dart';
+import '../../../test_utils/locale.dart';
+import '../../../test_utils/mocks.dart';
 
 void main() {
   late ProviderContainer container;

test/repositories/github/api_test.dart → test/infrastructure/github/api_test.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/github/api.dart';
-import 'package:github_search/repositories/repo_repository.dart';
+import 'package:github_search/domain/repo/repositories/repo_repository.dart';
+import 'package:github_search/infrastructure/github/api.dart';
 
 import '../../test_utils/locale.dart';
 

test/repositories/github/exception_test.dart → test/infrastructure/github/exception_test.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/github/exception.dart';
+import 'package:github_search/infrastructure/github/exception.dart';
 
 import '../../test_utils/locale.dart';
 

test/repositories/github/http_client_test.dart → test/infrastructure/github/http_client_test.dart

@@ -4,10 +4,10 @@
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/owner/owner.dart';
-import 'package:github_search/entities/repo/repo.dart';
-import 'package:github_search/repositories/github/exception.dart';
-import 'package:github_search/repositories/github/http_client.dart';
+import 'package:github_search/infrastructure/github/exception.dart';
+import 'package:github_search/infrastructure/github/http_client.dart';
+import 'package:github_search/infrastructure/github/json_object/owner/owner.dart';
+import 'package:github_search/infrastructure/github/json_object/repo/repo.dart';
 
 import '../../test_utils/locale.dart';
 import '../../test_utils/mocks.dart';

test/entities/owner/owner_test.dart → test/infrastructure/github/json_object/owner/owner_test.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/owner/owner.dart';
+import 'package:github_search/infrastructure/github/json_object/owner/owner.dart';
 
-import '../../test_utils/utils.dart';
+import '../../../../test_utils/utils.dart';
 
 void main() {
   final ownerJsonObject = TestAssets.readJsonMap('github/owner.json')!;

test/entities/repo/repo_test.dart → test/infrastructure/github/json_object/repo/repo_test.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/repo/repo.dart';
+import 'package:github_search/infrastructure/github/json_object/repo/repo.dart';
 
-import '../../test_utils/utils.dart';
+import '../../../../test_utils/utils.dart';
 
 void main() {
   final jsonMap =

test/entities/search_repos_result/search_repos_result_test.dart → test/infrastructure/github/json_object/search_repos_result/search_repos_result_test.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/search_repos_result/search_repos_result.dart';
+import 'package:github_search/infrastructure/github/json_object/search_repos_result/search_repos_result.dart';
 
-import '../../test_utils/utils.dart';
+import '../../../../test_utils/utils.dart';
 
 void main() {
   final jsonMap =

test/repositories/github/repo_repository_test.dart → test/infrastructure/github/repo_repository_test.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/github/exception.dart';
-import 'package:github_search/repositories/github/repo_repository.dart';
-import 'package:github_search/repositories/repo_repository.dart';
+import 'package:github_search/domain/repo/repositories/repo_repository.dart';
+import 'package:github_search/infrastructure/github/exception.dart';
+import 'package:github_search/infrastructure/github/repo_repository.dart';
 
 import '../../test_utils/locale.dart';
 import '../../test_utils/mocks.dart';

test/repositories/hive/app_data_repository_test.dart → test/infrastructure/hive/app_data_repository_test.dart

@@ -5,8 +5,8 @@
 import 'dart:io';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/repositories/hive/app_data_repository.dart';
-import 'package:github_search/repositories/repo_repository.dart';
+import 'package:github_search/domain/repo/repositories/repo_repository.dart';
+import 'package:github_search/infrastructure/hive/app_data_repository.dart';
 
 import '../../test_utils/hive.dart';
 import '../../test_utils/locale.dart';

test/presentation/common/components/error_view_test.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter_test/flutter_test.dart';
+import 'package:github_search/infrastructure/github/exception.dart';
 import 'package:github_search/localizations/strings.g.dart';
 import 'package:github_search/presentation/common/components/error_view.dart';
-import 'package:github_search/repositories/github/exception.dart';
 
 import '../../../test_utils/locale.dart';
 import '../../../test_utils/logger.dart';

test/presentation/repo/components/repo_detail_view_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:github_search/entities/repo/repo_data.dart';
+import 'package:github_search/domain/repo/entities/repo_data.dart';
 import 'package:github_search/presentation/common/components/cached_circle_avatar.dart';
 import 'package:github_search/presentation/common/components/error_view.dart';
 import 'package:github_search/presentation/repo/components/repo_detail_view.dart';