Skip to content

feat: map legends #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2025
Merged

feat: map legends #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c310ed
feat: map legends
kamiya4047 Aug 6, 2025
4c57766
feat: radar unit
kamiya4047 Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions lib/app/map/_lib/managers/monitor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import 'dart:async';
import 'dart:collection';

import 'package:flutter/material.dart';

import 'package:i18n_extension/i18n_extension.dart';
import 'package:maplibre_gl/maplibre_gl.dart';
import 'package:material_symbols_icons/material_symbols_icons.dart';
import 'package:provider/provider.dart';
import 'package:styled_text/styled_text.dart';

import 'package:dpip/api/model/eew.dart';
import 'package:dpip/app/map/_lib/manager.dart';
import 'package:dpip/app/map/_lib/utils.dart';
Expand All @@ -17,12 +25,6 @@ import 'package:dpip/utils/instrumental_intensity_color.dart';
import 'package:dpip/utils/log.dart';
import 'package:dpip/widgets/map/map.dart';
import 'package:dpip/widgets/sheet/morphing_sheet.dart';
import 'package:flutter/material.dart';
import 'package:i18n_extension/i18n_extension.dart';
import 'package:maplibre_gl/maplibre_gl.dart';
import 'package:material_symbols_icons/material_symbols_icons.dart';
import 'package:provider/provider.dart';
import 'package:styled_text/styled_text.dart';

class MonitorMapLayerManager extends MapLayerManager {
final bool isReplayMode;
Expand Down Expand Up @@ -798,7 +800,10 @@ class _MonitorMapLayerSheetState extends State<MonitorMapLayerSheet> {
),
],
),
Icon(Symbols.expand_less_rounded, color: context.colors.onErrorContainer, size: 24
Icon(
Symbols.expand_less_rounded,
color: context.colors.onErrorContainer,
size: 24,
),
],
),
Expand Down Expand Up @@ -881,7 +886,11 @@ class _MonitorMapLayerSheetState extends State<MonitorMapLayerSheet> {
),
],
),
Icon(Symbols.expand_more_rounded, color: context.colors.onErrorContainer, size: 24),
Icon(
Symbols.expand_more_rounded,
color: context.colors.onErrorContainer,
size: 24,
),
],
),
Padding(
Expand All @@ -896,8 +905,12 @@ class _MonitorMapLayerSheetState extends State<MonitorMapLayerSheet> {
'magnitude': data.info.magnitude.toStringAsFixed(1),
'intensity': localIntensity.asIntensityLabel,
}),
style: context.textTheme.bodyLarge!.copyWith(color: context.colors.onErrorContainer),
tags: {'bold': StyledTextTag(style: const TextStyle(fontWeight: FontWeight.bold))},
style: context.textTheme.bodyLarge!.copyWith(
color: context.colors.onErrorContainer,
),
tags: {
'bold': StyledTextTag(style: const TextStyle(fontWeight: FontWeight.bold)),
},
),
),
Selector<SettingsLocationModel, String?>(
Expand Down Expand Up @@ -972,14 +985,18 @@ class _MonitorMapLayerSheetState extends State<MonitorMapLayerSheet> {
text: countdown.toString(),
style: TextStyle(
fontSize:
context.textTheme.displayMedium!.fontSize! *
context
.textTheme
.displayMedium!
.fontSize! *
1.15,
),
),
TextSpan(
text: ' 秒'.i18n,
style: TextStyle(
fontSize: context.textTheme.labelLarge!.fontSize,
fontSize:
context.textTheme.labelLarge!.fontSize,
),
),
],
Expand Down
Loading
Loading