EQAPI v1 対応への下ごしらえ (#547)

* add
YumNumm · Jan 30, 2024 · 900ffd6 · 900ffd6
1 parent 57a5958
commit 900ffd6
Show file tree

Hide file tree

Showing 49 changed files with 2,307 additions and 151 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -266,7 +266,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e
   FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
+  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e
   GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34

diff --git a/lib/app.dart b/lib/app.dart
@@ -1,7 +1,9 @@
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:eqmonitor/core/provider/package_info.dart';
 import 'package:eqmonitor/core/router/router.dart';
 import 'package:eqmonitor/core/theme/custom_colors.dart';
 import 'package:eqmonitor/gen/fonts.gen.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
@@ -67,6 +69,18 @@ class App extends HookConsumerWidget {
         );
       },
     );
+    if (kDebugMode) {
+      final packageInfo = ref.watch(packageInfoProvider);
+      return Directionality(
+        textDirection: TextDirection.ltr,
+        child: Banner(
+          message: 'v${packageInfo.version}-${packageInfo.buildNumber}',
+          location: BannerLocation.bottomStart,
+          color: Colors.red.shade900,
+          child: app,
+        ),
+      );
+    }
     return app;
   }
 }
diff --git a/lib/core/component/intenisty/jma_forecast_intensity_icon.dart b/lib/core/component/intenisty/jma_forecast_intensity_icon.dart
@@ -1,4 +1,4 @@
-import 'package:eqapi_types/eqapi_types.dart';
+import 'package:eqapi_types/model/v3/telegram_v3.dart';
 import 'package:eqmonitor/core/component/intenisty/intensity_icon_type.dart';
 import 'package:eqmonitor/core/provider/config/theme/intensity_color/intensity_color_provider.dart';
 import 'package:eqmonitor/core/provider/config/theme/intensity_color/model/intensity_color_model.dart';

diff --git a/lib/core/component/intenisty/jma_forecast_lg_intensity_icon.dart b/lib/core/component/intenisty/jma_forecast_lg_intensity_icon.dart
@@ -1,4 +1,5 @@
 import 'package:eqapi_types/eqapi_types.dart';
+import 'package:eqapi_types/model/v3/telegram_v3.dart';
 import 'package:eqmonitor/core/component/intenisty/intensity_icon_type.dart';
 import 'package:eqmonitor/core/provider/config/theme/intensity_color/intensity_color_provider.dart';
 import 'package:eqmonitor/core/provider/config/theme/intensity_color/model/intensity_color_model.dart';

diff --git a/lib/core/provider/map/map_config.dart b/lib/core/provider/map/map_config.dart
@@ -48,11 +48,27 @@ class MapColorScheme with _$MapColorScheme {
       );
 
   factory MapColorScheme.dark({required ColorScheme colorScheme}) =>
+      /*
       MapColorScheme(
-        backgroundColor: colorScheme.surfaceVariant,
-        worldLandColor: colorScheme.surface,
+        backgroundColor: colorScheme.surface,
+        worldLandColor: Color.lerp(
+          Colors.blue,
+          colorScheme.surfaceVariant,
+          0.9,
+        )!,
         worldLineColor: colorScheme.onSurfaceVariant,
-        japanLandColor: colorScheme.surface,
+        japanLandColor: Color.lerp(
+          Colors.blue.shade700,
+          colorScheme.surface,
+          0.75,
+        )!,
+        japanLineColor: colorScheme.onSurfaceVariant,
+      );*/
+      MapColorScheme(
+        backgroundColor: colorScheme.surface,
+        worldLandColor: colorScheme.surfaceVariant,
+        worldLineColor: colorScheme.onSurfaceVariant,
+        japanLandColor: colorScheme.surfaceVariant,
         japanLineColor: colorScheme.onSurfaceVariant,
       );
 }
diff --git a/lib/core/provider/map/map_config.freezed.dart b/lib/core/provider/map/map_config.freezed.dart
diff --git a/lib/feature/earthquake_history/model/state/earthquake_history_item.dart b/lib/feature/earthquake_history/model/state/earthquake_history_item.dart
@@ -1,11 +1,4 @@
-import 'package:eqapi_types/model/components/comments.dart';
-import 'package:eqapi_types/model/components/earthquake.dart';
-import 'package:eqapi_types/model/components/intensity.dart';
-import 'package:eqapi_types/model/components/tsunami-information/comments.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_estimation.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_forecast.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_observations.dart';
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'earthquake_history_item.freezed.dart';

diff --git a/lib/feature/earthquake_history/use_case/earthquake_history_use_case.dart b/lib/feature/earthquake_history/use_case/earthquake_history_use_case.dart
@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:eqmonitor/feature/earthquake_history/data/telegram_history_data_source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

diff --git a/lib/feature/earthquake_history/viewmodel/earthquake_history_view_model.dart b/lib/feature/earthquake_history/viewmodel/earthquake_history_view_model.dart
@@ -1,12 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:eqapi_types/model/components/comments.dart';
-import 'package:eqapi_types/model/components/earthquake.dart';
-import 'package:eqapi_types/model/components/intensity.dart';
-import 'package:eqapi_types/model/components/tsunami-information/comments.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_estimation.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_forecast.dart';
-import 'package:eqapi_types/model/components/tsunami-information/tsunami_observations.dart';
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:eqmonitor/core/extension/async_value.dart';
 import 'package:eqmonitor/core/provider/app_lifecycle.dart';
 import 'package:eqmonitor/core/provider/config/earthquake_history/earthquake_history_config_provider.dart';

diff --git a/lib/feature/home/features/estimated_intensity/provider/estimated_intensity_provider.dart b/lib/feature/home/features/estimated_intensity/provider/estimated_intensity_provider.dart
@@ -1,4 +1,4 @@
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:eqmonitor/core/provider/log/talker.dart';
 import 'package:eqmonitor/feature/earthquake_history/model/state/earthquake_history_item.dart';
 import 'package:eqmonitor/feature/home/features/eew/provider/eew_alive_telegram.dart';

diff --git a/lib/feature/home/features/map/view/main_map_view.dart b/lib/feature/home/features/map/view/main_map_view.dart
@@ -159,6 +159,16 @@ class MainMapView extends HookConsumerWidget {
               ),
             ].wait,
           );
+          Future<void>.delayed(
+            const Duration(
+              milliseconds: 100,
+            ),
+            () async => notifier.moveCameraToDefaultPosition(
+              bottom: 100,
+              left: 10,
+              right: 10,
+            ),
+          );
         },
         rotateGesturesEnabled: false,
         tiltGesturesEnabled: false,

diff --git a/lib/feature/home/features/telegram_ws/model/telegram_ws_model.dart b/lib/feature/home/features/telegram_ws/model/telegram_ws_model.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: invalid_annotation_target
 
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'telegram_ws_model.freezed.dart';

diff --git a/lib/feature/home/features/telegram_ws/provider/telegram_provider.dart b/lib/feature/home/features/telegram_ws/provider/telegram_provider.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:eqapi_types/model/telegram_v3.dart';
+import 'package:eqapi_types/eqapi_types.dart';
 import 'package:eqmonitor/core/provider/log/talker.dart';
 import 'package:eqmonitor/feature/home/features/telegram_ws/model/socket_status.dart';
 import 'package:eqmonitor/feature/home/features/telegram_ws/provider/telegram_socket_io.dart';

diff --git a/packages/eqapi_client/lib/src/eqapi_client.dart b/packages/eqapi_client/lib/src/eqapi_client.dart
@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:eqapi_types/eqapi_types.dart';
+import 'package:eqapi_types/lib.dart';
 import 'package:retrofit/retrofit.dart';
 
 part 'eqapi_client.g.dart';
@@ -17,6 +18,34 @@ class EqApi {
       );
 }
 
+@RestApi()
+abstract class V1 {
+  factory V1(Dio dio, {String baseUrl}) = _V1;
+
+  @GET('/v1/earthquake')
+  Future<List<EarthquakeV1>> getEarthquake({
+    /// 1~100
+    @Query('limit') int limit = 100,
+
+    /// 0~100000
+    @Query('offset') int offset = 0,
+
+    /// 0~10
+    @Query('magnitudeLte') double? magnitudeLte,
+
+    /// 0~10
+    @Query('magnitudeGte') double? magnitudeGte,
+
+    /// 0~1000
+    @Query('depthLte') double? depthLte,
+
+    /// 0~1000
+    @Query('depthGte') double? depthGte,
+    @Query('intensityLte') JmaIntensity? intensityLte,
+    @Query('intensityGte') JmaIntensity? intensityGte,
+  });
+}
+
 @RestApi()
 abstract class V3 {
   factory V3(Dio dio, {String baseUrl}) = _V3;