Merge branch 'dev' of https://github.com/schwarzwald0906/My_Gourmet i…

…nto fetch-and-display-img-time
MyGourmet · Jan 20, 2025 · 6e992dc · 6e992dc
2 parents 8728746 + a5546cf
commit 6e992dc
Show file tree

Hide file tree

Showing 42 changed files with 625 additions and 407 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -10,4 +10,6 @@ analyzer:
   plugins:
     - custom_lint
   errors:
-    asset_does_not_exist: ignore
+    asset_does_not_exist: ignore
+    # riverpod_generatorの影響でg.dart末尾に不要な指定が付いてしまうため
+    duplicate_ignore: ignore
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -45,6 +45,7 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		1B236D312D3C98C100ACE616 /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = "<group>"; };
 		1B36104C2C925753000FE2A7 /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = "<group>"; };
 		1B36104D2C92575B000FE2A7 /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = "<group>"; };
 		1BACE4782C906331001D7771 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
@@ -131,6 +132,7 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
+				1B236D312D3C98C100ACE616 /* RunnerDebug.entitlements */,
 				65C0E1162C2A547C005BA11C /* GoogleService-Info.plist */,
 				CF71F2D12C0DA7650008B4BD /* PrivacyInfo.xcprivacy */,
 				65D6EA612C24347500584D7F /* dev.xcconfig */,

diff --git a/ios/Runner/RunnerDebug.entitlements b/ios/Runner/RunnerDebug.entitlements
@@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
+    <key>aps-environment</key>
+    <string>development</string>
 </dict>
 </plist>
diff --git a/ios/Runner/RunnerProfile.entitlements b/ios/Runner/RunnerProfile.entitlements
@@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
+    <key>aps-environment</key>
+    <string>development</string>
 </dict>
 </plist>
diff --git a/ios/Runner/RunnerRelease.entitlements b/ios/Runner/RunnerRelease.entitlements
@@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
+    <key>aps-environment</key>
+    <string>development</string>
 </dict>
 </plist>
diff --git a/lib/core/database/database.dart → lib/core/local_database/local_database.dart b/lib/core/database/database.dart → lib/core/local_database/local_database.dart
@@ -2,13 +2,15 @@ import 'dart:io';
 
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'database.g.dart';
+part 'local_database.g.dart';
 
 /// 写真テーブル
-@DataClassName('Photo')
+@DataClassName('LocalPhoto')
 class Photos extends Table {
   /// 写真のid
   TextColumn get id => text()();
@@ -34,7 +36,7 @@ class Photos extends Table {
 }
 
 /// 写真情報を保存するテーブル
-@DataClassName('PhotoDetail')
+@DataClassName('LocalPhotoDetail')
 class PhotoDetails extends Table {
   /// 最後の写真id
   TextColumn get lastId => text()();
@@ -87,10 +89,8 @@ LazyDatabase _openConnection() {
   });
 }
 
-/// DBインスタンス生成
-final AppDatabase appDatabase = AppDatabase();
-
-/// DBインスタンス取得
-AppDatabase getAppDatabaseInstance() {
-  return appDatabase;
+/// [AppDatabase]インスタンス用Provider
+@riverpod
+AppDatabase appDatabase(Ref ref) {
+  return AppDatabase();
 }