From 6dee81f268b8c60830c19bae59787d2f09087515 Mon Sep 17 00:00:00 2001 From: cobo <39579511+nzmgfdprs@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:36:03 +0900 Subject: [PATCH 1/4] chore: Change directory structure --- lib/main.dart | 4 ++-- lib/{ => ui}/character_input_page.dart | 4 ++-- lib/{ => ui}/character_result_page.dart | 0 lib/ui/{ => components}/failure_snackbar.dart | 0 lib/ui/{ => components}/overlay_loading.dart | 0 lib/usecase/generate_ character_usecase.dart | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename lib/{ => ui}/character_input_page.dart (98%) rename lib/{ => ui}/character_result_page.dart (100%) rename lib/ui/{ => components}/failure_snackbar.dart (100%) rename lib/ui/{ => components}/overlay_loading.dart (100%) diff --git a/lib/main.dart b/lib/main.dart index be1394d..72d951d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,9 +4,9 @@ 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/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/character_input_page.dart b/lib/ui/character_input_page.dart similarity index 98% rename from lib/character_input_page.dart rename to lib/ui/character_input_page.dart index 58c32ba..15e36e1 100644 --- a/lib/character_input_page.dart +++ b/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/ui/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/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 b/lib/ui/character_result_page.dart similarity index 100% rename from lib/character_result_page.dart rename to lib/ui/character_result_page.dart diff --git a/lib/ui/failure_snackbar.dart b/lib/ui/components/failure_snackbar.dart similarity index 100% rename from lib/ui/failure_snackbar.dart rename to lib/ui/components/failure_snackbar.dart diff --git a/lib/ui/overlay_loading.dart b/lib/ui/components/overlay_loading.dart similarity index 100% rename from lib/ui/overlay_loading.dart rename to lib/ui/components/overlay_loading.dart diff --git a/lib/usecase/generate_ character_usecase.dart b/lib/usecase/generate_ character_usecase.dart index 28bc33b..0ea41af 100644 --- 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/ui/components/overlay_loading.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; final generateImageUsecaseProvider = Provider( From a16772349a3a79f7992d5dc144ee61293a16f2f9 Mon Sep 17 00:00:00 2001 From: cobo <39579511+nzmgfdprs@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:44:31 +0900 Subject: [PATCH 2/4] chore: Change directory structure --- lib/data/app_exception.dart | 9 --------- lib/data/{ => auth}/auth_repository.dart | 0 lib/data/{ => env}/env.dart | 0 lib/data/{ => env}/env.freezed.dart | 0 lib/data/{ => genkit}/genkit_client.dart | 13 +++++++++++-- lib/data/{ => genkit}/genkit_response.dart | 0 lib/data/{ => genkit}/genkit_response.freezed.dart | 0 lib/{data => }/providers.dart | 6 +++--- lib/ui/character_input_page.dart | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 lib/data/app_exception.dart rename lib/data/{ => auth}/auth_repository.dart (100%) rename lib/data/{ => env}/env.dart (100%) rename lib/data/{ => env}/env.freezed.dart (100%) rename lib/data/{ => genkit}/genkit_client.dart (82%) rename lib/data/{ => genkit}/genkit_response.dart (100%) rename lib/data/{ => genkit}/genkit_response.freezed.dart (100%) rename lib/{data => }/providers.dart (86%) diff --git a/lib/data/app_exception.dart b/lib/data/app_exception.dart deleted file mode 100644 index ac1fe0f..0000000 --- a/lib/data/app_exception.dart +++ /dev/null @@ -1,9 +0,0 @@ -class AppException implements Exception { - final String message; - const AppException([this.message = 'エラーが発生しました']); - - @override - String toString() { - return message; - } -} diff --git a/lib/data/auth_repository.dart b/lib/data/auth/auth_repository.dart similarity index 100% rename from lib/data/auth_repository.dart rename to lib/data/auth/auth_repository.dart diff --git a/lib/data/env.dart b/lib/data/env/env.dart similarity index 100% rename from lib/data/env.dart rename to lib/data/env/env.dart diff --git a/lib/data/env.freezed.dart b/lib/data/env/env.freezed.dart similarity index 100% rename from lib/data/env.freezed.dart rename to lib/data/env/env.freezed.dart diff --git a/lib/data/genkit_client.dart b/lib/data/genkit/genkit_client.dart similarity index 82% rename from lib/data/genkit_client.dart rename to lib/data/genkit/genkit_client.dart index b171163..af6b435 100644 --- a/lib/data/genkit_client.dart +++ b/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 b/lib/data/genkit/genkit_response.dart similarity index 100% rename from lib/data/genkit_response.dart rename to lib/data/genkit/genkit_response.dart diff --git a/lib/data/genkit_response.freezed.dart b/lib/data/genkit/genkit_response.freezed.dart similarity index 100% rename from lib/data/genkit_response.freezed.dart rename to lib/data/genkit/genkit_response.freezed.dart diff --git a/lib/data/providers.dart b/lib/providers.dart similarity index 86% rename from lib/data/providers.dart rename to lib/providers.dart index 303637b..f1e1a34 100644 --- a/lib/data/providers.dart +++ b/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( diff --git a/lib/ui/character_input_page.dart b/lib/ui/character_input_page.dart index 15e36e1..6e0cc82 100644 --- a/lib/ui/character_input_page.dart +++ b/lib/ui/character_input_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.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/data/app_exception.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'; From a2847d71bbf0be752feae91a963f4d9eb39011b0 Mon Sep 17 00:00:00 2001 From: cobo <39579511+nzmgfdprs@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:44:48 +0900 Subject: [PATCH 3/4] chore: Change directory structure --- lib/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 72d951d..45e57a8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,8 @@ 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/components/overlay_loading.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; From f4a61def3fe5d7d91b6a258fa60618e72a50c802 Mon Sep 17 00:00:00 2001 From: cobo <39579511+nzmgfdprs@users.noreply.github.com> Date: Sun, 26 Jan 2025 13:45:04 +0900 Subject: [PATCH 4/4] chore: Change directory structure --- lib/usecase/generate_ character_usecase.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/usecase/generate_ character_usecase.dart b/lib/usecase/generate_ character_usecase.dart index 0ea41af..44655d4 100644 --- a/lib/usecase/generate_ character_usecase.dart +++ b/lib/usecase/generate_ character_usecase.dart @@ -1,5 +1,5 @@ -import 'package:flutter_gakkai_07/data/genkit_response.dart'; -import 'package:flutter_gakkai_07/data/providers.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';