diff --git a/lib/common/provider/config/theme/intensity_color/model/intensity_color_model.dart b/lib/common/provider/config/theme/intensity_color/model/intensity_color_model.dart index c54f911f0..f8d3b7fea 100644 --- a/lib/common/provider/config/theme/intensity_color/model/intensity_color_model.dart +++ b/lib/common/provider/config/theme/intensity_color/model/intensity_color_model.dart @@ -12,69 +12,69 @@ class IntensityColorModel with _$IntensityColorModel { const factory IntensityColorModel({ /// 震度不明 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityUnknownFront, + required Color intensityUnknownFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityUnknownBack, + required Color intensityUnknownBack, /// 震度0 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityZeroFront, + required Color intensityZeroFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityZeroBack, + required Color intensityZeroBack, /// 震度1 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityOneFront, + required Color intensityOneFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityOneBack, + required Color intensityOneBack, /// 震度2 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityTwoFront, + required Color intensityTwoFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityTwoBack, + required Color intensityTwoBack, /// 震度3 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityThreeFront, + required Color intensityThreeFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityThreeBack, + required Color intensityThreeBack, /// 震度4 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFourFront, + required Color intensityFourFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFourBack, + required Color intensityFourBack, /// 震度5弱 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFiveLowerFront, + required Color intensityFiveLowerFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFiveLowerBack, + required Color intensityFiveLowerBack, /// 震度5強 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFiveUpperFront, + required Color intensityFiveUpperFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensityFiveUpperBack, + required Color intensityFiveUpperBack, /// 震度6弱 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySixLowerFront, + required Color intensitySixLowerFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySixLowerBack, + required Color intensitySixLowerBack, /// 震度6強 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySixUpperFront, + required Color intensitySixUpperFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySixUpperBack, + required Color intensitySixUpperBack, /// 震度7 @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySevenFront, + required Color intensitySevenFront, @JsonKey(fromJson: colorFromJson, toJson: colorToJson) - required Color intensitySevenBack, + required Color intensitySevenBack, }) = _IntensityColorModel; factory IntensityColorModel.fromJson(Map json) => diff --git a/lib/feature/earthquake_history/model/data/telegram_history.dart b/lib/feature/earthquake_history/model/data/telegram_history.dart index 78690ecb7..bb97c5b43 100644 --- a/lib/feature/earthquake_history/model/data/telegram_history.dart +++ b/lib/feature/earthquake_history/model/data/telegram_history.dart @@ -11,7 +11,7 @@ class TelegramHistoryV3 with _$TelegramHistoryV3 { fromJson: _telegramHistoryV3DataFromJson, toJson: _telegramHistoryV3DataToJson, ) - required Map>? results, + required Map>? results, required bool success, required D1DbExecutionResult meta, }) = _TelegramHistoryV3; diff --git a/lib/feature/home/component/map/base_map.dart b/lib/feature/home/component/map/base_map.dart index 015c2c1e8..2d60270da 100644 --- a/lib/feature/home/component/map/base_map.dart +++ b/lib/feature/home/component/map/base_map.dart @@ -12,7 +12,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; - /// 各種マップのベースマップ /// baseMapViewModelProviderからMapStateを取得すること class BaseMapWidget extends HookConsumerWidget { diff --git a/lib/feature/home/component/map/model/map_state.dart b/lib/feature/home/component/map/model/map_state.dart index 4cecfa982..e18250402 100644 --- a/lib/feature/home/component/map/model/map_state.dart +++ b/lib/feature/home/component/map/model/map_state.dart @@ -12,13 +12,13 @@ part 'map_state.g.dart'; class MapState with _$MapState { const factory MapState({ @JsonKey(fromJson: _offsetFromJson, toJson: _offsetToJson) - required Offset offset, + required Offset offset, required double zoomLevel, @JsonKey( fromJson: _globalPointFromJson, toJson: _globalPointToJson, ) - required GlobalPoint? focalPoint, + required GlobalPoint? focalPoint, }) = _MapState; factory MapState.fromJson(Map json) => diff --git a/lib/feature/home/component/map/view_model/base_map_viemwodel.dart b/lib/feature/home/component/map/view_model/base_map_viemwodel.dart index 19663adae..6659838e6 100644 --- a/lib/feature/home/component/map/view_model/base_map_viemwodel.dart +++ b/lib/feature/home/component/map/view_model/base_map_viemwodel.dart @@ -31,8 +31,6 @@ class BaseMapViewModel extends _$BaseMapViewModel { Animation? moveAnimation = null; Animation? scaleAnimation = null; - - void handleScaleStart(ScaleStartDetails details) { if (details.pointerCount == 1) { return;