-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- API Schema - Fix LatLng Type
- Loading branch information
Showing
24 changed files
with
239 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
lib/feature/earthquake_history_details/component/eq_map.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import 'package:eqapi_schema/model/lat_lng.dart'; | ||
| import 'package:eqmonitor/common/component/map/map.dart'; | ||
| import 'package:eqmonitor/common/component/map/view_model/map_viemwodel.dart'; | ||
| import 'package:eqmonitor/feature/earthquake_history/model/state/earthquake_history_item.dart'; | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||
|
|
||
| class EarthquakeHistoryMap extends HookConsumerWidget { | ||
| EarthquakeHistoryMap({required this.item, super.key}) : super() { | ||
| mapKey = GlobalKey(debugLabel: 'eq-history-map-${item.eventId}'); | ||
| } | ||
| final EarthquakeHistoryItem item; | ||
| late final Key mapKey; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context, WidgetRef ref) { | ||
| useEffect( | ||
| () { | ||
| WidgetsBinding.instance.endOfFrame.then((_) { | ||
| ref.read(mapViewModelProvider(mapKey).notifier) | ||
| ..registerWidgetSize( | ||
| context.size!, | ||
| ) | ||
| ..fitBounds( | ||
| [ | ||
| const LatLng(45.3, 145.1), | ||
| const LatLng(30, 128.8), | ||
| ], | ||
| ); | ||
| }); | ||
| return null; | ||
| }, | ||
| [], | ||
| ); | ||
| return ClipRRect( | ||
| child: Stack( | ||
| children: [ | ||
| // background | ||
| Container( | ||
| color: const Color.fromARGB(255, 179, 230, 255), | ||
| ), | ||
| ClipRRect( | ||
| child: Stack( | ||
| children: [ | ||
| BaseMapWidget(mapKey: mapKey), | ||
| ], | ||
| ), | ||
| ), | ||
| MapTouchHandlerWidget(mapKey: mapKey), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| List<LatLng> _getShowBounds(EarthquakeHistoryItem item) { | ||
| if (item.earthquake.intensity == null) { | ||
| if (item.earthquake.earthquake != null) { | ||
| // return []; | ||
| } | ||
| } | ||
| return [ | ||
| const LatLng(45.3, 145.1), | ||
| const LatLng(30, 128.8), | ||
| ]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 0 additions & 60 deletions
60
lib/feature/setup/pages/02_quick_guide_about_eew copy.dart
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import 'package:eqmonitor/common/component/button/action_button.dart'; | ||
| import 'package:eqmonitor/feature/setup/component/background_image.dart'; | ||
| import 'package:eqmonitor/feature/setup/component/earthquake_restriction.dart'; | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| class QuickGuideAboutEewPage extends StatelessWidget { | ||
| const QuickGuideAboutEewPage({required this.onNext, super.key}); | ||
| final void Function() onNext; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final theme = Theme.of(context); | ||
| return Scaffold( | ||
| body: SetupBackgroundImageWidget( | ||
| child: SingleChildScrollView( | ||
| child: Column( | ||
| children: [ | ||
| // 画面上部のタイトル | ||
| Padding( | ||
| padding: const EdgeInsets.all(16), | ||
| child: Text( | ||
| '緊急地震速報の限界について', | ||
| style: theme.textTheme.titleLarge!.copyWith( | ||
| fontWeight: FontWeight.bold, | ||
| color: Colors.white, | ||
| ), | ||
| ), | ||
| ), | ||
| const Padding( | ||
| padding: EdgeInsets.symmetric(vertical: 16), | ||
| child: EarthquakeRestrictionWidget(), | ||
| ), | ||
| Padding( | ||
| padding: const EdgeInsets.all(16), | ||
| child: ActionButton( | ||
| isEnabled: true, | ||
| onPressed: onNext, | ||
| child: const Padding( | ||
| padding: EdgeInsets.symmetric(vertical: 12), | ||
| child: SizedBox( | ||
| width: double.infinity, | ||
| child: Center( | ||
| child: Text( | ||
| '次へ', | ||
| style: TextStyle( | ||
| fontWeight: FontWeight.bold, | ||
| color: Colors.white, | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ) | ||
| ], | ||
| ), | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.