Merge pull request #154 from FltSv/149-exhibit-detail-bugfix

#149 展示詳細画面下部が灰色になる不具合の修正
FltSv · Nov 19, 2024 · 3fffc4c · 3fffc4c
2 parents b7b3af1 + f8f7197
commit 3fffc4c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -10,7 +10,8 @@
     "ms-vscode.live-server",
     "Gruntfuggly.todo-tree",
     "bradlc.vscode-tailwindcss",
-    "dart-code.flutter"
+    "dart-code.flutter",
+    "streetsidesoftware.code-spell-checker"
   ],
 
   // List of extensions recommended by VS Code that should not be recommended for users of this workspace.

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -16,5 +16,13 @@
   "files.associations": {
     "*.css": "tailwindcss"
   },
-  "yaml.schemaStore.enable": false
+  "yaml.schemaStore.enable": false,
+
+  // スペルチェック除外リスト
+  "cSpell.words": ["appcheck", "firestore", "Mypage"],
+  "cSpell.ignoreRegExpList": [
+    "\\..*", // プロパティ名などを無視
+    "/.*", // パス名などを無視
+    "key.*" // APIKeyなど、keyをSuffixとした変数以降の値を無視
+  ]
 }
diff --git a/mobile/lib/screens/exhibit_detail_screen.dart b/mobile/lib/screens/exhibit_detail_screen.dart
@@ -32,18 +32,24 @@ class _ExhibitDetailScreenState extends State<ExhibitDetailScreen> {
       body: ListView(
         padding: const EdgeInsets.all(16),
         children: [
-          Image.network(exhibit.imageUrl),
-          const Gap(8),
-          Text(exhibit.displayDate),
-          LinkText(
-              text: exhibit.location,
-              onTap: () => NavigateProvider.push(
-                  context, MapScreen(query: exhibit.location))),
-          LinkText(
-              text: creator.name,
-              onTap: () => NavigateProvider.push(
-                  context, CreatorDetailScreen(creator: creator))),
-        ].intersperse(const Gap(8)).toList(),
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Image.network(exhibit.imageUrl),
+              const Gap(8),
+              Text(exhibit.displayDate),
+              LinkText(
+                  text: exhibit.location,
+                  onTap: () => NavigateProvider.push(
+                      context, MapScreen(query: exhibit.location))),
+              LinkText(
+                  text: creator.name,
+                  onTap: () => NavigateProvider.push(
+                      context, CreatorDetailScreen(creator: creator))),
+            ].intersperse(const Gap(8)).toList(),
+          )
+        ],
       ),
     );
   }

diff --git a/mobile/lib/widgets/link_text.dart b/mobile/lib/widgets/link_text.dart
@@ -13,7 +13,8 @@ class LinkText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Expanded(
+    return Flexible(
+      fit: FlexFit.loose,
       child: RichText(
         overflow: TextOverflow.fade,
         maxLines: 1,

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
@@ -1,5 +1,5 @@
 name: mobile
-description: "Gallery Found Sp App"
+description: "Gallery Found Mobile App"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.0+14
+version: 0.4.0
 
 environment:
   sdk: ">=3.4.3 <4.0.0"