add: 市区町村レベルの震度を表示できるように

YumNumm · Jan 1, 2024 · 33d5118 · 33d5118
1 parent d2c7a6d
commit 33d5118
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 3 deletions.
diff --git a/lib/feature/earthquake_history_details/component/prefecture_intensity.dart b/lib/feature/earthquake_history_details/component/prefecture_intensity.dart
@@ -98,6 +98,12 @@ class PrefectureIntensityWidget extends HookConsumerWidget {
                 subtitle: Text(
                   kv.value.map((e) => e.prefecture.name).join(', '),
                 ),
+                onTap: () => _PrefectureModalBottomSheet.show(
+                  context: context,
+                  intensity: kv.key,
+                  prefectures: kv.value,
+                ),
+                trailing: const Icon(Icons.chevron_right),
               ),
           ],
         ),
@@ -115,6 +121,121 @@ class PrefectureIntensityWidget extends HookConsumerWidget {
   }
 }
 
+class _PrefectureModalBottomSheet extends StatelessWidget {
+  const _PrefectureModalBottomSheet({
+    required this.intensity,
+    required this.prefectures,
+  });
+
+  static Future<void> show({
+    required BuildContext context,
+    required JmaIntensity intensity,
+    required List<_MergedPrefectureIntensity> prefectures,
+  }) {
+    return showModalBottomSheet<void>(
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(
+          top: Radius.circular(16),
+        ),
+      ),
+      context: context,
+      builder: (context) {
+        return _PrefectureModalBottomSheet(
+          intensity: intensity,
+          prefectures: prefectures,
+        );
+      },
+    );
+  }
+
+  final JmaIntensity intensity;
+  final List<_MergedPrefectureIntensity> prefectures;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          "震度${intensity.type.replaceAll('+', '強').replaceAll('-', '弱')}"
+          'の地域',
+        ),
+      ),
+      body: ListView(
+        children: [
+          for (final prefecture in prefectures)
+            _PrefectureListTile(prefecture: prefecture),
+        ],
+      ),
+    );
+  }
+}
+
+class _PrefectureListTile extends HookWidget {
+  const _PrefectureListTile({
+    required this.prefecture,
+  });
+
+  final _MergedPrefectureIntensity prefecture;
+
+  @override
+  Widget build(BuildContext context) {
+    final isExpanded = useState(false);
+    final shrinked = ListTile(
+      title: Text(
+        prefecture.prefecture.name,
+        style: const TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      trailing: const Icon(Icons.expand_more),
+      onTap: () => isExpanded.value = true,
+    );
+    final expanded = ListTile(
+      title: Text(
+        prefecture.prefecture.name,
+        style: const TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          for (final city in prefecture.cities)
+            Text.rich(
+              TextSpan(
+                children: [
+                  TextSpan(
+                    text: '${city.city.name}: ',
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  for (final station in city.stations)
+                    TextSpan(
+                      text: '${station.name} ',
+                      style: const TextStyle(
+                        color: Colors.grey,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+        ],
+      ),
+      onTap: () => isExpanded.value = false,
+      trailing: const Icon(Icons.expand_less),
+    );
+    return AnimatedCrossFade(
+      firstChild: shrinked,
+      secondChild: expanded,
+      crossFadeState: isExpanded.value
+          ? CrossFadeState.showSecond
+          : CrossFadeState.showFirst,
+      duration: const Duration(milliseconds: 300),
+    );
+  }
+}
+
 class _MergedPrefectureIntensity {
   factory _MergedPrefectureIntensity.fromIntensity(
     RegionIntensity prefecture,

diff --git a/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart b/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart
@@ -456,7 +456,7 @@ class _EarthquakeCommentWidget extends StatelessWidget {
       return BorderedContainer(
         padding: const EdgeInsets.all(8),
         elevation: 1,
-        child: Markdown(
+        child: MarkdownBody(
           data: switch ((comment.forecast?.text, comment.free)) {
             (final String text, final String free) => '$text\n\n$free',
             (final String text, _) => text,
@@ -475,8 +475,6 @@ class _EarthquakeCommentWidget extends StatelessWidget {
               uri,
             );
           },
-          shrinkWrap: true,
-          padding: EdgeInsets.zero,
         ),
       );
     }