Merge pull request #4 from nozomi-koborinai/feature/refactor

Feature/refactor
nozomi-koborinai · Jan 26, 2025 · 79cf89d · 79cf89d
2 parents 51fc872 + f4a61de
commit 79cf89d
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 24 deletions.
diff --git a/lib/data/app_exception.dart b/lib/data/app_exception.dart
diff --git a/lib/data/auth_repository.dart → lib/data/auth/auth_repository.dart b/lib/data/auth_repository.dart → lib/data/auth/auth_repository.dart
diff --git a/lib/data/env.dart → lib/data/env/env.dart b/lib/data/env.dart → lib/data/env/env.dart
diff --git a/lib/data/env.freezed.dart → lib/data/env/env.freezed.dart b/lib/data/env.freezed.dart → lib/data/env/env.freezed.dart
diff --git a/lib/data/genkit_client.dart → lib/data/genkit/genkit_client.dart b/lib/data/genkit_client.dart → lib/data/genkit/genkit_client.dart
@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:flutter_gakkai_07/data/app_exception.dart';
-import 'package:flutter_gakkai_07/data/genkit_response.dart';
+import 'package:flutter_gakkai_07/data/genkit/genkit_response.dart';
 
 class GenkitClient {
   GenkitClient({
@@ -51,3 +50,13 @@ class GenkitClient {
   final errorMessage = '''Imagen3 による画像生成に失敗しました。
 再度、キャラクター生成をお試しください。''';
 }
+
+class AppException implements Exception {
+  final String message;
+  const AppException([this.message = 'エラーが発生しました']);
+
+  @override
+  String toString() {
+    return message;
+  }
+}
diff --git a/lib/data/genkit_response.dart → lib/data/genkit/genkit_response.dart b/lib/data/genkit_response.dart → lib/data/genkit/genkit_response.dart
diff --git a/lib/data/genkit_response.freezed.dart → lib/data/genkit/genkit_response.freezed.dart b/lib/data/genkit_response.freezed.dart → lib/data/genkit/genkit_response.freezed.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,12 +1,12 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_gakkai_07/data/env.dart';
-import 'package:flutter_gakkai_07/data/providers.dart';
+import 'package:flutter_gakkai_07/data/env/env.dart';
+import 'package:flutter_gakkai_07/providers.dart';
 import 'package:flutter_gakkai_07/firebase_options.dart';
-import 'package:flutter_gakkai_07/ui/overlay_loading.dart';
+import 'package:flutter_gakkai_07/ui/components/overlay_loading.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'character_input_page.dart';
+import 'ui/character_input_page.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();

diff --git a/lib/data/providers.dart → lib/providers.dart b/lib/data/providers.dart → lib/providers.dart
@@ -1,8 +1,8 @@
 import 'package:dio/dio.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_gakkai_07/data/auth_repository.dart';
-import 'package:flutter_gakkai_07/data/env.dart';
-import 'package:flutter_gakkai_07/data/genkit_client.dart';
+import 'package:flutter_gakkai_07/data/auth/auth_repository.dart';
+import 'package:flutter_gakkai_07/data/env/env.dart';
+import 'package:flutter_gakkai_07/data/genkit/genkit_client.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final envProvider = Provider<Env>(

diff --git a/lib/character_input_page.dart → lib/ui/character_input_page.dart b/lib/character_input_page.dart → lib/ui/character_input_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gakkai_07/character_result_page.dart';
-import 'package:flutter_gakkai_07/data/app_exception.dart';
-import 'package:flutter_gakkai_07/ui/failure_snackbar.dart';
+import 'package:flutter_gakkai_07/data/genkit/genkit_client.dart';
+import 'package:flutter_gakkai_07/ui/character_result_page.dart';
+import 'package:flutter_gakkai_07/ui/components/failure_snackbar.dart';
 import 'package:flutter_gakkai_07/usecase/generate_%20character_usecase.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 

diff --git a/lib/character_result_page.dart → lib/ui/character_result_page.dart b/lib/character_result_page.dart → lib/ui/character_result_page.dart
diff --git a/lib/ui/failure_snackbar.dart → lib/ui/components/failure_snackbar.dart b/lib/ui/failure_snackbar.dart → lib/ui/components/failure_snackbar.dart
diff --git a/lib/ui/overlay_loading.dart → lib/ui/components/overlay_loading.dart b/lib/ui/overlay_loading.dart → lib/ui/components/overlay_loading.dart
diff --git a/lib/usecase/generate_ character_usecase.dart b/lib/usecase/generate_ character_usecase.dart
@@ -1,6 +1,6 @@
-import 'package:flutter_gakkai_07/data/genkit_response.dart';
-import 'package:flutter_gakkai_07/data/providers.dart';
-import 'package:flutter_gakkai_07/ui/overlay_loading.dart';
+import 'package:flutter_gakkai_07/data/genkit/genkit_response.dart';
+import 'package:flutter_gakkai_07/providers.dart';
+import 'package:flutter_gakkai_07/ui/components/overlay_loading.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final generateImageUsecaseProvider = Provider<GenerateImageUsecase>(