From ec414b477ffc01038b867d0b70b97d2086e4133c Mon Sep 17 00:00:00 2001 From: lowrt Date: Fri, 30 Oct 2026 19:56:47 +0800 Subject: [PATCH 1/6] ci: flutter 3.47.8 --- mise.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mise.toml b/mise.toml index d1cc18b60..9f395915d 100644 --- a/mise.toml +++ b/mise.toml @@ -2,4 +2,4 @@ # Pin the numeric stable release only — the platform URLs already append # `-stable`. A bare `"3.44.8-stable"` makes mise request # `…_3.44.8-stable-stable.{tar.xz,zip}` and 404s on install (breaks CI). -flutter = { version = "3.47.0", platforms = { linux-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_{{ version }}-stable.tar.xz" }, macos-arm64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_{{ version }}-stable.zip" }, macos-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_{{ version }}-stable.zip" }, windows-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_{{ version }}-stable.zip" } }, version_expr = 'fromJSON(body).releases | filter({ #.channel == "stable" }) | map({ replace(#.version, "-stable", "") }) | sortVersions()', version_list_url = "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json" } +flutter = { version = "3.47.8", platforms = { linux-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_{{ version }}-stable.tar.xz" }, macos-arm64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_{{ version }}-stable.zip" }, macos-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_{{ version }}-stable.zip" }, windows-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_{{ version }}-stable.zip" } }, version_expr = 'fromJSON(body).releases | filter({ #.channel == "stable" }) | map({ replace(#.version, "-stable", "") }) | sortVersions()', version_list_url = "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json" } From 4f3e92bce98c8d41828400f32c411d10554f9a99 Mon Sep 17 00:00:00 2001 From: lowrt Date: Fri, 13 Nov 2026 20:08:45 +0800 Subject: [PATCH 2/6] chore: upgrade Flutter to 3.50.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Platform: all Optimization(zh-Hant): 更新 Flutter 版本,維持應用程式相容性 Optimization(en-US): update Flutter to maintain app compatibility --- lib/app/app.dart | 8 +- lib/app/router/app_router.dart | 219 +++++++++++++----- lib/app/shell/main_shell.dart | 2 +- lib/app/theme/app_glass.dart | 2 +- lib/app/theme/app_gold.dart | 2 +- lib/app/theme/app_theme.dart | 2 +- lib/bootstrap.dart | 2 +- .../notifications/notification_channels.dart | 2 +- lib/core/settings/display_settings.dart | 2 +- lib/core/settings/locale_config.dart | 34 ++- lib/core/settings/theme_controller.dart | 2 +- lib/core/weather/weather_condition.dart | 2 +- .../presentation/pages/bug_list_page.dart | 2 +- .../presentation/pages/bug_thread_page.dart | 2 +- .../presentation/widgets/bug_tag_badge.dart | 2 +- .../presentation/pages/changelog_page.dart | 2 +- .../pages/version_notes_page.dart | 2 +- .../widgets/release_contributors.dart | 2 +- .../widgets/release_note_markdown.dart | 2 +- .../presentation/widgets/update_prompt.dart | 2 +- .../data/presentation/pages/almanac_page.dart | 2 +- .../data/presentation/pages/data_page.dart | 2 +- .../data/presentation/pages/moon_page.dart | 2 +- .../data/presentation/pages/planets_page.dart | 2 +- .../presentation/pages/sky_chart_page.dart | 2 +- .../data/presentation/pages/sun_page.dart | 2 +- .../data/presentation/pages/tide_page.dart | 2 +- .../data/presentation/pages/tonight_page.dart | 2 +- .../data/presentation/widgets/astro_card.dart | 2 +- .../presentation/widgets/moon_calendar.dart | 2 +- .../data/presentation/widgets/moon_glyph.dart | 2 +- .../presentation/pages/earthquake_page.dart | 2 +- .../pages/report_detail_page.dart | 2 +- .../presentation/pages/report_list_page.dart | 2 +- .../pages/report_replay_page.dart | 2 +- .../presentation/widgets/eew_card.dart | 2 +- .../widgets/report_filter_sheet.dart | 2 +- .../presentation/pages/events_page.dart | 2 +- .../presentation/widgets/event_timeline.dart | 2 +- .../home/presentation/pages/home_page.dart | 2 +- .../widgets/home_active_events_section.dart | 2 +- .../presentation/widgets/home_content.dart | 2 +- .../widgets/home_eew_section.dart | 2 +- .../widgets/home_forecast_section.dart | 2 +- .../widgets/home_map_backdrop.dart | 2 +- .../widgets/home_monitor_banner.dart | 2 +- .../widgets/home_rain_trend_section.dart | 2 +- .../home/presentation/widgets/home_sheet.dart | 2 +- .../widgets/home_sheet_header.dart | 2 +- .../widgets/weather_sky/card_water_field.dart | 2 +- .../weather_sky/precipitation_field.dart | 2 +- .../widgets/weather_sky/rain_on_card.dart | 2 +- .../widgets/weather_sky/rain_on_glass.dart | 2 +- .../widgets/weather_sky/sky_deck.dart | 2 +- .../widgets/weather_sky/sky_lut_cache.dart | 2 +- .../weather_sky/weather_sky_background.dart | 2 +- .../weather_sky/weather_sky_painter.dart | 2 +- .../presentation/pages/region_city_page.dart | 2 +- .../pages/region_manage_page.dart | 2 +- .../pages/region_select_page.dart | 2 +- .../widgets/region_town_tile.dart | 2 +- .../log/presentation/pages/log_page.dart | 2 +- .../layers/admin_outline_chrome.dart | 2 +- .../layers/disaster_map_layer.dart | 2 +- .../presentation/layers/humidity_layer.dart | 2 +- .../presentation/layers/lightning_layer.dart | 2 +- .../layers/lightning_strike_overlay.dart | 2 +- .../layers/location_track_layer.dart | 2 +- .../presentation/layers/mesh_node_layer.dart | 2 +- .../presentation/layers/pressure_layer.dart | 2 +- .../presentation/layers/qpesums_layer.dart | 2 +- .../map/presentation/layers/radar_layer.dart | 2 +- .../map/presentation/layers/rain_layer.dart | 2 +- .../map/presentation/layers/rts_layer.dart | 2 +- .../presentation/layers/satellite_layer.dart | 2 +- .../layers/scan_range_overlay_chrome.dart | 2 +- .../layers/temperature_layer.dart | 2 +- .../presentation/layers/tsunami_layer.dart | 2 +- .../presentation/layers/typhoon_layer.dart | 2 +- .../layers/weather_station_layer.dart | 2 +- .../layers/wind_arrow_overlay.dart | 2 +- .../layers/wind_forecast_layer.dart | 2 +- .../map/presentation/layers/wind_layer.dart | 2 +- .../map/presentation/pages/map_page.dart | 2 +- .../widgets/disaster_map_overlay_menu.dart | 2 +- .../map/presentation/widgets/dpm_sheet.dart | 2 +- .../widgets/forecast_overlay_menu.dart | 2 +- .../widgets/location_track_sheet.dart | 2 +- .../presentation/widgets/mesh_node_sheet.dart | 2 +- .../widgets/monitor_eew_card.dart | 2 +- .../widgets/radar_overlay_menu.dart | 2 +- .../widgets/rts_monitor_panel.dart | 2 +- .../widgets/satellite_legend.dart | 2 +- .../widgets/satellite_style_menu.dart | 2 +- .../widgets/scan_range_overlay_menu.dart | 2 +- .../presentation/widgets/station_sheet.dart | 2 +- .../presentation/widgets/tsunami_panel.dart | 2 +- .../widgets/typhoon_forecast_callouts.dart | 2 +- .../widgets/typhoon_overlay_menu.dart | 2 +- .../presentation/widgets/typhoon_panel.dart | 2 +- lib/features/map/presentation/wind_speed.dart | 2 +- .../presentation/pages/meshtastic_page.dart | 2 +- .../widgets/mesh_chart_section.dart | 2 +- .../presentation/widgets/mesh_charts.dart | 2 +- .../widgets/mesh_ratio_chart.dart | 2 +- .../more/presentation/pages/more_page.dart | 2 +- .../presentation/notify_labels.dart | 2 +- .../pages/notification_test_page.dart | 2 +- .../presentation/pages/notify_page.dart | 2 +- .../presentation/pages/onboarding_page.dart | 2 +- .../widgets/onboarding_intro.dart | 2 +- .../widgets/onboarding_notify_presets.dart | 2 +- .../widgets/onboarding_permissions.dart | 2 +- .../widgets/onboarding_scaffold.dart | 2 +- .../widgets/onboarding_terms.dart | 2 +- .../pages/release_highlights_page.dart | 2 +- .../presentation/widgets/highlight_card.dart | 2 +- .../presentation/seismometer_page.dart | 2 +- .../pages/default_map_layer_page.dart | 2 +- .../presentation/pages/developer_page.dart | 2 +- .../presentation/pages/display_page.dart | 2 +- .../presentation/pages/eew_source_page.dart | 2 +- .../presentation/pages/experimental_page.dart | 2 +- .../presentation/pages/language_page.dart | 2 +- .../presentation/pages/permissions_page.dart | 2 +- .../pages/spoken_intensity_page.dart | 2 +- .../presentation/widgets/display_preview.dart | 2 +- .../widgets/network_usage_chart.dart | 2 +- .../widgets/storage_breakdown.dart | 2 +- .../presentation/pages/sponsor_page.dart | 2 +- .../pages/server_status_page.dart | 2 +- .../pages/weather_ranking_page.dart | 2 +- .../widgets/ranking_time_sheet.dart | 2 +- .../widgets/weather_ranking_row.dart | 2 +- lib/shared/color_hex.dart | 2 +- lib/shared/diagnostics/dump_action.dart | 2 +- lib/shared/map/base_map.dart | 2 +- lib/shared/map/basemap_overlay_sync.dart | 2 +- lib/shared/map/default_map_layer_ui.dart | 2 +- lib/shared/map/map_compass.dart | 2 +- lib/shared/map/map_gsi_overlay.dart | 2 +- lib/shared/map/map_immersive_chrome.dart | 2 +- lib/shared/map/map_layer_switcher.dart | 2 +- lib/shared/map/map_scaffold.dart | 2 +- lib/shared/map/map_terrain_toggle.dart | 2 +- lib/shared/map/map_timeline.dart | 2 +- lib/shared/map/map_town_labels.dart | 2 +- lib/shared/map/maps_launcher.dart | 2 +- lib/shared/map/raster_timeline_layer.dart | 2 +- lib/shared/seismic/intensity_colors.dart | 2 +- lib/shared/seismic/report_colors.dart | 2 +- lib/shared/widgets/alert_cycle_chip.dart | 2 +- lib/shared/widgets/area_page_sync.dart | 2 +- lib/shared/widgets/async_view.dart | 2 +- .../widgets/collapsible_map_legend.dart | 2 +- lib/shared/widgets/dump_link_dialog.dart | 2 +- lib/shared/widgets/dump_upload_dialog.dart | 2 +- lib/shared/widgets/eew_cancelled_notice.dart | 2 +- lib/shared/widgets/eew_estimate_tile.dart | 2 +- lib/shared/widgets/eew_feed_down_notice.dart | 2 +- lib/shared/widgets/empty_view.dart | 2 +- lib/shared/widgets/error_view.dart | 2 +- lib/shared/widgets/event_icon.dart | 2 +- lib/shared/widgets/freshness_banner.dart | 2 +- lib/shared/widgets/frosted_surface.dart | 2 +- lib/shared/widgets/intensity_badge.dart | 2 +- lib/shared/widgets/intensity_legend.dart | 2 +- .../widgets/intensity_ranking_card.dart | 2 +- lib/shared/widgets/language_picker.dart | 2 +- lib/shared/widgets/loading_view.dart | 2 +- lib/shared/widgets/map_chip_button.dart | 2 +- lib/shared/widgets/map_color_legend.dart | 2 +- lib/shared/widgets/map_menu_toggle_row.dart | 2 +- lib/shared/widgets/permission_checklist.dart | 2 +- .../widgets/permission_settings_sheet.dart | 2 +- lib/shared/widgets/realtime_view.dart | 2 +- lib/shared/widgets/region_bar.dart | 2 +- lib/shared/widgets/region_pager.dart | 2 +- lib/shared/widgets/region_swipe_area.dart | 2 +- lib/shared/widgets/section_header.dart | 2 +- lib/shared/widgets/selectable_pill.dart | 2 +- lib/shared/widgets/sheet_extent.dart | 2 +- lib/shared/widgets/sheet_surface.dart | 2 +- mise.toml | 2 +- pubspec.lock | 46 +++- pubspec.yaml | 2 + test/app/app_test.dart | 2 +- test/app/router/app_router_test.dart | 19 +- test/app/router/route_params_test.dart | 2 +- .../app/router/shell_route_observer_test.dart | 2 +- test/app/shell/main_shell_test.dart | 6 +- test/app/shell/replay_leave_test.dart | 2 +- test/app/theme/app_glass_test.dart | 2 +- test/app/theme/app_gold_test.dart | 2 +- test/app/theme/app_theme_test.dart | 2 +- test/core/di/provider_graph_test.dart | 2 +- test/core/di/providers_test.dart | 5 +- test/core/platform/screen_wake_test.dart | 2 +- .../settings/appearance_controllers_test.dart | 2 +- test/core/settings/display_settings_test.dart | 2 +- test/core/settings/locale_config_test.dart | 47 +++- test/core/weather/weather_condition_test.dart | 2 +- test/core/weather/weather_icons_test.dart | 2 +- .../pages/bug_list_page_test.dart | 6 +- .../pages/bug_thread_page_test.dart | 6 +- .../widgets/bug_tag_badge_test.dart | 2 +- .../changelog/changelog_page_test.dart | 6 +- .../changelog/release_note_markdown_test.dart | 2 +- .../changelog/update_prompt_test.dart | 6 +- .../changelog/version_notes_page_test.dart | 6 +- test/features/data/data_page_test.dart | 9 +- test/features/data/moon_page_test.dart | 11 +- .../presentation/observer_place_test.dart | 2 +- .../presentation/pages/almanac_page_test.dart | 7 +- .../presentation/pages/planets_page_test.dart | 7 +- .../pages/sky_chart_page_test.dart | 7 +- .../presentation/pages/sun_page_test.dart | 7 +- .../presentation/pages/tide_page_test.dart | 5 +- .../presentation/pages/tonight_page_test.dart | 7 +- .../presentation/widgets/astro_card_test.dart | 2 +- .../widgets/moon_calendar_test.dart | 2 +- .../presentation/widgets/moon_glyph_test.dart | 2 +- .../pages/earthquake_page_test.dart | 5 +- .../pages/report_detail_page_test.dart | 10 +- .../pages/report_list_page_test.dart | 6 +- .../pages/report_replay_page_test.dart | 12 +- .../presentation/widgets/eew_card_test.dart | 5 +- .../widgets/intensity_legend_chip_test.dart | 5 +- .../widgets/report_filter_sheet_test.dart | 5 +- .../earthquake/report_day_header_test.dart | 5 +- test/features/events/events_page_test.dart | 5 +- .../widgets/event_timeline_test.dart | 5 +- test/features/home/home_providers_test.dart | 2 +- .../presentation/pages/home_page_test.dart | 7 +- .../home_active_events_section_test.dart | 5 +- .../widgets/home_content_test.dart | 5 +- .../widgets/home_eew_section_test.dart | 16 +- .../widgets/home_forecast_section_test.dart | 7 +- .../widgets/home_hero_preview_test.dart | 6 +- .../home_map_backdrop_widget_test.dart | 2 +- .../widgets/home_monitor_banner_test.dart | 5 +- .../widgets/home_rain_trend_section_test.dart | 5 +- .../home_sheet_header_silhouette_test.dart | 6 +- .../widgets/home_sheet_header_test.dart | 6 +- .../presentation/widgets/home_sheet_test.dart | 5 +- .../weather_sky/card_water_worlds_test.dart | 2 +- .../weather_sky/rain_on_card_test.dart | 2 +- .../widgets/weather_sky/sky_deck_test.dart | 2 +- .../weather_sky/weather_sky_painter_test.dart | 2 +- .../weather_sky/card_water_pipeline_test.dart | 2 +- .../weather_sky/precipitation_field_test.dart | 2 +- .../weather_sky/rain_on_card_pace_test.dart | 2 +- .../weather_sky/rain_on_glass_field_test.dart | 2 +- .../home/weather_sky/rain_on_glass_test.dart | 2 +- .../home/weather_sky/sky_frame_pace_test.dart | 2 +- .../weather_sky_background_test.dart | 2 +- .../pages/region_city_page_test.dart | 11 +- .../pages/region_manage_page_test.dart | 5 +- .../pages/region_select_page_test.dart | 7 +- test/features/log/log_page_test.dart | 5 +- .../map/basemap_overlay_sync_test.dart | 2 +- .../disaster_map_layer_render_test.dart | 6 +- .../layers/humidity_layer_test.dart | 9 +- .../layers/lightning_layer_test.dart | 9 +- .../layers/lightning_strike_marks_test.dart | 5 +- .../layers/mesh_node_layer_render_test.dart | 8 +- .../layers/pressure_layer_test.dart | 9 +- .../layers/qpesums_chrome_test.dart | 5 +- .../layers/radar_legend_and_errors_test.dart | 5 +- .../layers/rain_layer_decisions_test.dart | 5 +- .../layers/raster_timeline_edges_test.dart | 5 +- .../layers/satellite_channel_label_test.dart | 2 +- .../layers/satellite_style_path_test.dart | 5 +- .../layers/temperature_layer_test.dart | 11 +- .../layers/wind_forecast_chrome_test.dart | 5 +- .../presentation/layers/wind_layer_test.dart | 9 +- .../map/presentation/map_scaffold_test.dart | 6 +- .../map/presentation/pages/map_page_test.dart | 5 +- .../disaster_map_overlay_menu_test.dart | 5 +- .../widgets/dpm_sheet_bodies_test.dart | 5 +- .../widgets/forecast_overlay_menu_test.dart | 5 +- .../widgets/location_track_sheet_test.dart | 6 +- .../widgets/mesh_node_sheet_test.dart | 5 +- .../widgets/monitor_eew_card_test.dart | 6 +- .../widgets/overlay_menu_chrome_test.dart | 7 +- .../widgets/rts_monitor_panel_eew_test.dart | 5 +- .../widgets/station_sheet_states_test.dart | 6 +- .../station_sheet_wind_touch_test.dart | 2 +- .../typhoon_forecast_callout_data_test.dart | 2 +- ...typhoon_forecast_callout_overlay_test.dart | 2 +- .../widgets/typhoon_panel_test.dart | 5 +- test/features/map/qpesums_layer_test.dart | 7 +- .../features/map/radar_overlay_menu_test.dart | 5 +- test/features/map/rain_color_scale_test.dart | 2 +- test/features/map/rain_legend_test.dart | 5 +- test/features/map/satellite_legend_test.dart | 5 +- .../map/satellite_style_menu_test.dart | 7 +- .../map/typhoon_overlay_menu_test.dart | 7 +- .../map/wind_forecast_layer_test.dart | 10 +- .../meshtastic/byte_limit_formatter_test.dart | 2 +- .../meshtastic/mesh_battery_chart_test.dart | 5 +- .../meshtastic/mesh_ratio_chart_test.dart | 5 +- .../meshtastic_page_channel_test.dart | 12 +- .../meshtastic/meshtastic_page_test.dart | 6 +- test/features/more/more_page_test.dart | 6 +- .../presentation/notify_labels_test.dart | 2 +- .../pages/notification_test_page_test.dart | 5 +- .../presentation/pages/notify_page_test.dart | 5 +- .../pages/onboarding_page_test.dart | 5 +- .../widgets/onboarding_intro_test.dart | 5 +- .../onboarding_notify_presets_test.dart | 5 +- .../widgets/onboarding_permissions_test.dart | 5 +- .../widgets/onboarding_scaffold_test.dart | 2 +- .../widgets/onboarding_terms_test.dart | 5 +- .../widgets/highlight_card_test.dart | 2 +- .../release_highlights_page_test.dart | 5 +- .../seismometer/seismometer_page_test.dart | 2 +- .../settings/default_map_layer_page_test.dart | 5 +- test/features/settings/display_page_test.dart | 5 +- .../settings/eew_source_page_test.dart | 5 +- .../settings/experimental_page_test.dart | 5 +- .../features/settings/language_page_test.dart | 5 +- .../pages/developer_page_test.dart | 12 +- .../pages/experimental_page_test.dart | 5 +- .../pages/permissions_page_test.dart | 5 +- .../widgets/network_usage_chart_test.dart | 2 +- .../widgets/storage_breakdown_test.dart | 2 +- .../settings/spoken_intensity_page_test.dart | 5 +- .../presentation/pages/sponsor_page_test.dart | 10 +- .../status/server_status_page_test.dart | 5 +- .../pages/weather_ranking_page_test.dart | 6 +- .../widgets/ranking_time_sheet_test.dart | 2 +- .../widgets/weather_ranking_row_test.dart | 2 +- test/shaders/card_water_preview_test.dart | 2 +- test/shaders/moon_shader_test.dart | 2 +- test/shaders/preview_render_test.dart | 2 +- test/shaders/rain_on_glass_test.dart | 2 +- test/shaders/sky_gradient_parity_test.dart | 2 +- test/shaders/weather_sky_shader_test.dart | 2 +- test/shared/color_hex_test.dart | 2 +- test/shared/diagnostics/dump_action_test.dart | 6 +- test/shared/map/base_map_tab_test.dart | 2 +- .../shared/map/default_map_layer_ui_test.dart | 2 +- test/shared/map/map_basemap_menu_test.dart | 9 +- test/shared/map/map_compass_test.dart | 7 +- test/shared/map/map_gsi_overlay_test.dart | 2 +- test/shared/map/map_layer_defaults_test.dart | 2 +- test/shared/map/map_layer_switcher_test.dart | 5 +- test/shared/map/map_timeline_test.dart | 7 +- test/shared/map/map_town_labels_test.dart | 5 +- test/shared/map/maps_launcher_copy_test.dart | 5 +- test/shared/map/maps_launcher_test.dart | 7 +- .../navigation/active_while_visible_test.dart | 2 +- .../instrumental_intensity_colors_test.dart | 2 +- test/shared/seismic/report_colors_test.dart | 2 +- .../shared/semantics_overlay_portal_test.dart | 2 +- .../shared/widgets/alert_cycle_chip_test.dart | 2 +- test/shared/widgets/area_page_sync_test.dart | 2 +- test/shared/widgets/async_view_test.dart | 6 +- .../widgets/collapsible_map_legend_test.dart | 7 +- .../shared/widgets/dump_link_dialog_test.dart | 5 +- .../widgets/dump_upload_dialog_test.dart | 5 +- .../widgets/eew_estimate_tile_test.dart | 2 +- .../widgets/eew_feed_down_notice_test.dart | 5 +- test/shared/widgets/empty_view_test.dart | 2 +- test/shared/widgets/error_view_test.dart | 5 +- test/shared/widgets/event_icon_test.dart | 2 +- .../shared/widgets/freshness_banner_test.dart | 2 +- test/shared/widgets/frosted_surface_test.dart | 2 +- test/shared/widgets/intensity_badge_test.dart | 2 +- .../shared/widgets/intensity_legend_test.dart | 2 +- .../widgets/intensity_ranking_card_test.dart | 5 +- test/shared/widgets/language_picker_test.dart | 12 +- test/shared/widgets/loading_view_test.dart | 5 +- test/shared/widgets/map_chip_button_test.dart | 2 +- .../shared/widgets/map_color_legend_test.dart | 5 +- .../widgets/map_menu_toggle_row_test.dart | 2 +- .../widgets/permission_checklist_test.dart | 6 +- .../permission_settings_sheet_test.dart | 5 +- test/shared/widgets/realtime_view_test.dart | 5 +- test/shared/widgets/region_chrome_test.dart | 5 +- test/shared/widgets/second_ticker_test.dart | 2 +- test/shared/widgets/sheet_chrome_test.dart | 2 +- .../urgent_notification_section_test.dart | 5 +- 384 files changed, 994 insertions(+), 650 deletions(-) diff --git a/lib/app/app.dart b/lib/app/app.dart index ac282ac20..b3b5f8c14 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -28,7 +28,7 @@ import 'package:dpip/core/settings/theme_controller.dart'; import 'package:dpip/shared/map/base_map.dart'; import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:provider/single_child_widget.dart'; @@ -125,7 +125,11 @@ class DpipApp extends StatelessWidget { display.textScale.factor, ), ), - child: child ?? const SizedBox.shrink(), + // Dependencies may still use Flutter's original Material widgets. + // ignore: deprecated_member_use + child: MaterialUiCompatibilityBridge( + child: child ?? const SizedBox.shrink(), + ), ); }, ), diff --git a/lib/app/router/app_router.dart b/lib/app/router/app_router.dart index ae733dc71..aa9467e5b 100644 --- a/lib/app/router/app_router.dart +++ b/lib/app/router/app_router.dart @@ -47,8 +47,8 @@ import 'package:dpip/features/weather/domain/weather_ranking.dart'; import 'package:dpip/features/weather/presentation/pages/weather_ranking_page.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; -import 'package:flutter/foundation.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Fires when a redirect *input* changes outside any navigation — today only @@ -90,11 +90,14 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.onboardingPath, name: AppRoutes.onboarding, - builder: (_, _) => const OnboardingPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const OnboardingPage()), ), StatefulShellRoute.indexedStack( - builder: (context, state, navigationShell) => - MainShell(navigationShell: navigationShell), + pageBuilder: (context, state, navigationShell) => MaterialPage( + key: state.pageKey, + child: MainShell(navigationShell: navigationShell), + ), branches: [ _branch( AppRoutes.homePath, @@ -113,30 +116,42 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.dataPath, name: AppRoutes.data, - builder: (_, _) => const DataPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const DataPage(), + ), routes: [ GoRoute( path: AppRoutes.earthquakePath, name: AppRoutes.earthquake, - builder: (_, _) => const ReportListPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const ReportListPage(), + ), routes: [ GoRoute( path: AppRoutes.earthquakeReportPath, name: AppRoutes.earthquakeReport, redirect: reportRedirect, - builder: (_, state) => ReportDetailPage( - reportId: state.pathParameters['id'] ?? '', + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: ReportDetailPage( + reportId: state.pathParameters['id'] ?? '', + ), ), routes: [ GoRoute( path: AppRoutes.earthquakeReplayPath, name: AppRoutes.earthquakeReplay, redirect: replayRedirect, - builder: (_, state) => ReportReplayPage( - // [replayRedirect] has already turned a link - // without a usable `t` away; this only keeps the - // builder total. - replayTimestamp: replayTimestampOf(state) ?? 0, + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: ReportReplayPage( + // [replayRedirect] has already turned a link + // without a usable `t` away; this only keeps the + // builder total. + replayTimestamp: replayTimestampOf(state) ?? 0, + ), ), ), ], @@ -146,17 +161,23 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.eewPath, name: AppRoutes.eew, - builder: (_, _) => const EarthquakePage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const EarthquakePage(), + ), ), GoRoute( path: AppRoutes.weatherRankingPath, name: AppRoutes.weatherRanking, - builder: (_, state) { + pageBuilder: (_, state) { final rawTab = state.uri.queryParameters['tab']; - return WeatherRankingPage( - initialTab: WeatherRankingTab.parse(rawTab), - initialTempMetric: TempRankMetric.parse( - state.uri.queryParameters['metric'] ?? rawTab, + return MaterialPage( + key: state.pageKey, + child: WeatherRankingPage( + initialTab: WeatherRankingTab.parse(rawTab), + initialTempMetric: TempRankMetric.parse( + state.uri.queryParameters['metric'] ?? rawTab, + ), ), ); }, @@ -164,43 +185,66 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.moonPath, name: AppRoutes.moon, - builder: (_, _) => const MoonPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const MoonPage(), + ), ), GoRoute( path: AppRoutes.seismometerPath, name: AppRoutes.seismometer, - builder: (_, _) => - const SeismometerPage(tabIndex: DataPage.tabIndex), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const SeismometerPage(tabIndex: DataPage.tabIndex), + ), ), GoRoute( path: AppRoutes.sunPath, name: AppRoutes.sun, - builder: (_, _) => const SunPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const SunPage(), + ), ), GoRoute( path: AppRoutes.planetsPath, name: AppRoutes.planets, - builder: (_, _) => const PlanetsPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const PlanetsPage(), + ), ), GoRoute( path: AppRoutes.tonightPath, name: AppRoutes.tonight, - builder: (_, _) => const TonightPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const TonightPage(), + ), ), GoRoute( path: AppRoutes.almanacPath, name: AppRoutes.almanac, - builder: (_, _) => const AlmanacPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const AlmanacPage(), + ), ), GoRoute( path: AppRoutes.skyChartPath, name: AppRoutes.skyChart, - builder: (_, _) => const SkyChartPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const SkyChartPage(), + ), ), GoRoute( path: AppRoutes.tidePath, name: AppRoutes.tide, - builder: (_, _) => const TidePage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const TidePage(), + ), ), ], ), @@ -213,89 +257,120 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.experimentalPath, name: AppRoutes.experimental, - builder: (_, _) => ExperimentalPage( - watchWeatherCode: (context) => - context.select( - (controller) => controller.weather?.data.weatherCode, - ), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: ExperimentalPage( + watchWeatherCode: (context) => + context.select( + (controller) => controller.weather?.data.weatherCode, + ), + ), ), ), GoRoute( path: AppRoutes.logPath, name: AppRoutes.log, - builder: (_, _) => const LogPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const LogPage()), ), GoRoute( path: AppRoutes.meshtasticPath, name: AppRoutes.meshtastic, - builder: (_, _) => const MeshtasticPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const MeshtasticPage()), ), GoRoute( path: AppRoutes.changelogPath, name: AppRoutes.changelog, - builder: (_, _) => const ChangelogPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const ChangelogPage()), ), GoRoute( path: AppRoutes.versionNotesPath, name: AppRoutes.versionNotes, - builder: (_, _) => const VersionNotesPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const VersionNotesPage(), + ), ), GoRoute( path: AppRoutes.releaseHighlightsPath, name: AppRoutes.releaseHighlights, - builder: (_, _) => const ReleaseHighlightsPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const ReleaseHighlightsPage(), + ), ), GoRoute( path: AppRoutes.developerPath, name: AppRoutes.developer, - builder: (_, _) => const DeveloperPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const DeveloperPage()), ), GoRoute( path: AppRoutes.displayPath, name: AppRoutes.display, - builder: (_, _) => const DisplayPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const DisplayPage()), ), GoRoute( path: AppRoutes.languagePath, name: AppRoutes.language, - builder: (_, _) => const LanguagePage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const LanguagePage()), ), GoRoute( path: AppRoutes.defaultMapLayerPath, name: AppRoutes.defaultMapLayer, - builder: (_, _) => const DefaultMapLayerPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const DefaultMapLayerPage(), + ), ), GoRoute( path: AppRoutes.eewSourcePath, name: AppRoutes.eewSource, - builder: (_, _) => const EewSourcePage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const EewSourcePage()), ), GoRoute( path: AppRoutes.spokenIntensityPath, name: AppRoutes.spokenIntensity, - builder: (_, _) => const SpokenIntensityPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const SpokenIntensityPage(), + ), ), GoRoute( path: AppRoutes.regionManagePath, name: AppRoutes.regionManage, - builder: (_, _) => const RegionManagePage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const RegionManagePage(), + ), ), GoRoute( path: AppRoutes.regionSelectPath, name: AppRoutes.regionSelect, - builder: (_, state) => RegionSelectPage( - replaceCode: state.uri.queryParameters['replace'], - returnToMore: state.uri.queryParameters['returnToMore'] == '1', + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: RegionSelectPage( + replaceCode: state.uri.queryParameters['replace'], + returnToMore: state.uri.queryParameters['returnToMore'] == '1', + ), ), routes: [ GoRoute( path: AppRoutes.regionSelectCityPath, name: AppRoutes.regionSelectCity, redirect: regionCityRedirect, - builder: (_, state) => RegionCityPage( - city: state.pathParameters['city'] ?? '', - replaceCode: state.uri.queryParameters['replace'], - returnToMore: state.uri.queryParameters['returnToMore'] == '1', + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: RegionCityPage( + city: state.pathParameters['city'] ?? '', + replaceCode: state.uri.queryParameters['replace'], + returnToMore: state.uri.queryParameters['returnToMore'] == '1', + ), ), ), ], @@ -303,40 +378,55 @@ final GoRouter appRouter = GoRouter( GoRoute( path: AppRoutes.permissionsPath, name: AppRoutes.permissions, - builder: (_, _) => const PermissionsPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const PermissionsPage(), + ), ), GoRoute( path: AppRoutes.notifySettingsPath, name: AppRoutes.notifySettings, - builder: (_, _) => const NotifyPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const NotifyPage()), routes: [ GoRoute( path: AppRoutes.notifyTestPath, name: AppRoutes.notifyTest, - builder: (_, _) => const NotificationTestPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const NotificationTestPage(), + ), ), ], ), GoRoute( path: AppRoutes.sponsorPath, name: AppRoutes.sponsor, - builder: (_, _) => const SponsorPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const SponsorPage()), ), GoRoute( path: AppRoutes.serverStatusPath, name: AppRoutes.serverStatus, - builder: (_, _) => const ServerStatusPage(), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: const ServerStatusPage(), + ), ), GoRoute( path: AppRoutes.bugTrackerPath, name: AppRoutes.bugTracker, - builder: (_, _) => const BugListPage(), + pageBuilder: (_, state) => + MaterialPage(key: state.pageKey, child: const BugListPage()), routes: [ GoRoute( path: AppRoutes.bugThreadPath, name: AppRoutes.bugThread, redirect: bugThreadRedirect, - builder: (_, state) => BugThreadPage(id: bugThreadIdOf(state) ?? 0), + pageBuilder: (_, state) => MaterialPage( + key: state.pageKey, + child: BugThreadPage(id: bugThreadIdOf(state) ?? 0), + ), ), ], ), @@ -349,5 +439,14 @@ StatefulShellBranch _branch( String name, GoRouterWidgetBuilder builder, ) => StatefulShellBranch( - routes: [GoRoute(path: path, name: name, builder: builder)], + routes: [ + GoRoute( + path: path, + name: name, + pageBuilder: (context, state) => MaterialPage( + key: state.pageKey, + child: builder(context, state), + ), + ), + ], ); diff --git a/lib/app/shell/main_shell.dart b/lib/app/shell/main_shell.dart index 7fa1fa4ce..d4f7ce9f9 100644 --- a/lib/app/shell/main_shell.dart +++ b/lib/app/shell/main_shell.dart @@ -18,7 +18,7 @@ import 'package:dpip/shared/map/map_immersive.dart'; import 'package:dpip/shared/map/map_trace.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/app/theme/app_glass.dart b/lib/app/theme/app_glass.dart index b89ddbe26..2af964619 100644 --- a/lib/app/theme/app_glass.dart +++ b/lib/app/theme/app_glass.dart @@ -1,7 +1,7 @@ import 'package:dpip/core/a11y/color_vision.dart'; import 'package:dpip/core/realtime/app_time.dart'; import 'package:dpip/core/settings/weather_mode.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Reveal-driven "glass" tinting for content layered over the weather backdrop. /// diff --git a/lib/app/theme/app_gold.dart b/lib/app/theme/app_gold.dart index 065860075..054eeb59e 100644 --- a/lib/app/theme/app_gold.dart +++ b/lib/app/theme/app_gold.dart @@ -27,7 +27,7 @@ library; import 'package:dpip/core/a11y/color_vision.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The gold pair for one brightness. @immutable diff --git a/lib/app/theme/app_theme.dart b/lib/app/theme/app_theme.dart index d81780955..90caf31eb 100644 --- a/lib/app/theme/app_theme.dart +++ b/lib/app/theme/app_theme.dart @@ -1,5 +1,5 @@ import 'package:dpip/core/settings/display_settings.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Centralized Material 3 theming for light and dark modes. abstract final class AppTheme { diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart index 1ee66c3bf..2ec6c2026 100644 --- a/lib/bootstrap.dart +++ b/lib/bootstrap.dart @@ -93,7 +93,7 @@ import 'package:dpip/firebase_options.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/foundation.dart' show LicenseEntry, LicenseEntryWithLineBreaks, LicenseRegistry; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:path_provider/path_provider.dart'; import 'package:sqlite_async/sqlite_async.dart'; diff --git a/lib/core/notifications/notification_channels.dart b/lib/core/notifications/notification_channels.dart index 75ca38ea0..97e66e0dd 100644 --- a/lib/core/notifications/notification_channels.dart +++ b/lib/core/notifications/notification_channels.dart @@ -1,5 +1,5 @@ import 'package:awesome_notifications/awesome_notifications.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The DPIP notification channel + group catalogue. /// diff --git a/lib/core/settings/display_settings.dart b/lib/core/settings/display_settings.dart index 5504dce93..6d3dd7599 100644 --- a/lib/core/settings/display_settings.dart +++ b/lib/core/settings/display_settings.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/core/settings/setting_keys.dart'; import 'package:dpip/core/settings/settings_store.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// UI text size, as a multiplier on whatever the OS accessibility setting /// already gives. diff --git a/lib/core/settings/locale_config.dart b/lib/core/settings/locale_config.dart index 2c2c37a3d..193135ae3 100644 --- a/lib/core/settings/locale_config.dart +++ b/lib/core/settings/locale_config.dart @@ -2,9 +2,14 @@ library; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +// Legacy localization types are needed by unmigrated third-party widgets. +// ignore: deprecated_member_use +import 'package:flutter/material.dart' as legacy_material; +// ignore: deprecated_member_use +import 'package:flutter/cupertino.dart' as legacy_cupertino; +import 'package:flutter_localizations/flutter_localizations.dart' as legacy; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// The app's home locale: Traditional Chinese for Taiwan (`zh_TW`). @@ -53,8 +58,31 @@ List> get appLocalizationsDelegates => [ unsupported: [Locale('yue')], replacement: kHomeLocale, ), + ...GlobalMaterialLocalizations.delegates, + const _WidgetsFallbackDelegate( + loadWith: _loadLegacyMaterial, + unsupported: [Locale('yue')], + replacement: kHomeLocale, + ), + const _WidgetsFallbackDelegate( + loadWith: _loadLegacyCupertino, + unsupported: [Locale('yue')], + replacement: kHomeLocale, + ), ]; +Future _loadLegacyMaterial( + Locale locale, +) => + // ignore: deprecated_member_use + legacy.GlobalMaterialLocalizations.delegate.load(locale); + +Future _loadLegacyCupertino( + Locale locale, +) => + // ignore: deprecated_member_use + legacy.GlobalCupertinoLocalizations.delegate.load(locale); + Future _loadMaterial(Locale locale) => GlobalMaterialLocalizations.delegate.load(locale); diff --git a/lib/core/settings/theme_controller.dart b/lib/core/settings/theme_controller.dart index 21763958d..22a3af044 100644 --- a/lib/core/settings/theme_controller.dart +++ b/lib/core/settings/theme_controller.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/core/settings/setting_keys.dart'; import 'package:dpip/core/settings/settings_store.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Holds the user's chosen [ThemeMode], persisted across launches. /// diff --git a/lib/core/weather/weather_condition.dart b/lib/core/weather/weather_condition.dart index ce6763808..d00109374 100644 --- a/lib/core/weather/weather_condition.dart +++ b/lib/core/weather/weather_condition.dart @@ -7,7 +7,7 @@ library; import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/core/weather/weather_code.dart'; import 'package:dpip/core/weather/weather_icons.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// CWB families 100 (晴) / 200 (多雲) / 300 (陰) each carry the same 20 /// phenomenon suffixes (ones digits 1–19, `0` = the plain family sky). `0` diff --git a/lib/features/bug_tracker/presentation/pages/bug_list_page.dart b/lib/features/bug_tracker/presentation/pages/bug_list_page.dart index d3adf69af..6da3b43ca 100644 --- a/lib/features/bug_tracker/presentation/pages/bug_list_page.dart +++ b/lib/features/bug_tracker/presentation/pages/bug_list_page.dart @@ -20,7 +20,7 @@ import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/bug_tracker/presentation/pages/bug_thread_page.dart b/lib/features/bug_tracker/presentation/pages/bug_thread_page.dart index d2b2a6110..6a6d256ed 100644 --- a/lib/features/bug_tracker/presentation/pages/bug_thread_page.dart +++ b/lib/features/bug_tracker/presentation/pages/bug_thread_page.dart @@ -19,7 +19,7 @@ import 'package:dpip/features/bug_tracker/presentation/widgets/bug_tag_badge.dar import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/bug_tracker/presentation/widgets/bug_tag_badge.dart b/lib/features/bug_tracker/presentation/widgets/bug_tag_badge.dart index 7ffd6981d..654e0c17d 100644 --- a/lib/features/bug_tracker/presentation/widgets/bug_tag_badge.dart +++ b/lib/features/bug_tracker/presentation/widgets/bug_tag_badge.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Which known tag this is, driving the badge's icon and accent colour. /// diff --git a/lib/features/changelog/presentation/pages/changelog_page.dart b/lib/features/changelog/presentation/pages/changelog_page.dart index c9c624cc1..9cf387fb3 100644 --- a/lib/features/changelog/presentation/pages/changelog_page.dart +++ b/lib/features/changelog/presentation/pages/changelog_page.dart @@ -17,7 +17,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/changelog/presentation/pages/version_notes_page.dart b/lib/features/changelog/presentation/pages/version_notes_page.dart index 2986d8a42..fa3d1181d 100644 --- a/lib/features/changelog/presentation/pages/version_notes_page.dart +++ b/lib/features/changelog/presentation/pages/version_notes_page.dart @@ -24,7 +24,7 @@ import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; diff --git a/lib/features/changelog/presentation/widgets/release_contributors.dart b/lib/features/changelog/presentation/widgets/release_contributors.dart index 74ad64440..cb818247a 100644 --- a/lib/features/changelog/presentation/widgets/release_contributors.dart +++ b/lib/features/changelog/presentation/widgets/release_contributors.dart @@ -13,7 +13,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/changelog/domain/changelog_repository.dart'; import 'package:dpip/features/changelog/domain/release_note.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/features/changelog/presentation/widgets/release_note_markdown.dart b/lib/features/changelog/presentation/widgets/release_note_markdown.dart index f27b619a4..5c556e702 100644 --- a/lib/features/changelog/presentation/widgets/release_note_markdown.dart +++ b/lib/features/changelog/presentation/widgets/release_note_markdown.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:markdown/markdown.dart' as md; diff --git a/lib/features/changelog/presentation/widgets/update_prompt.dart b/lib/features/changelog/presentation/widgets/update_prompt.dart index a27a61bf1..f04a61215 100644 --- a/lib/features/changelog/presentation/widgets/update_prompt.dart +++ b/lib/features/changelog/presentation/widgets/update_prompt.dart @@ -23,7 +23,7 @@ import 'package:dpip/features/changelog/domain/update_check.dart'; import 'package:dpip/features/changelog/domain/update_destination.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/data/presentation/pages/almanac_page.dart b/lib/features/data/presentation/pages/almanac_page.dart index 379758e56..2066ce6e7 100644 --- a/lib/features/data/presentation/pages/almanac_page.dart +++ b/lib/features/data/presentation/pages/almanac_page.dart @@ -14,7 +14,7 @@ import 'package:dpip/features/data/presentation/observer_place.dart'; import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; class AlmanacPage extends StatefulWidget { diff --git a/lib/features/data/presentation/pages/data_page.dart b/lib/features/data/presentation/pages/data_page.dart index 2dd3a794f..aed5f19e0 100644 --- a/lib/features/data/presentation/pages/data_page.dart +++ b/lib/features/data/presentation/pages/data_page.dart @@ -9,7 +9,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; /// Catalogue of in-app data surfaces. The shell's 4th tab; entries push nested diff --git a/lib/features/data/presentation/pages/moon_page.dart b/lib/features/data/presentation/pages/moon_page.dart index b3688067f..1d50735fe 100644 --- a/lib/features/data/presentation/pages/moon_page.dart +++ b/lib/features/data/presentation/pages/moon_page.dart @@ -38,7 +38,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_timeline.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:intl/intl.dart'; diff --git a/lib/features/data/presentation/pages/planets_page.dart b/lib/features/data/presentation/pages/planets_page.dart index cd88342bc..d09b3ce63 100644 --- a/lib/features/data/presentation/pages/planets_page.dart +++ b/lib/features/data/presentation/pages/planets_page.dart @@ -20,7 +20,7 @@ import 'package:dpip/features/data/presentation/observer_place.dart'; import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; const Duration _taiwanOffset = Duration(hours: 8); diff --git a/lib/features/data/presentation/pages/sky_chart_page.dart b/lib/features/data/presentation/pages/sky_chart_page.dart index 8a1d43cc7..fa2709342 100644 --- a/lib/features/data/presentation/pages/sky_chart_page.dart +++ b/lib/features/data/presentation/pages/sky_chart_page.dart @@ -27,7 +27,7 @@ import 'package:dpip/core/realtime/app_time.dart'; import 'package:dpip/features/data/presentation/observer_place.dart'; import 'package:dpip/features/data/presentation/pages/planets_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SkyChartPage extends StatefulWidget { const SkyChartPage({super.key}); diff --git a/lib/features/data/presentation/pages/sun_page.dart b/lib/features/data/presentation/pages/sun_page.dart index f5ad3ab81..8ae4866f5 100644 --- a/lib/features/data/presentation/pages/sun_page.dart +++ b/lib/features/data/presentation/pages/sun_page.dart @@ -20,7 +20,7 @@ import 'package:dpip/features/data/presentation/observer_place.dart'; import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// Taiwan's fixed offset — the wall clock every time on this page is read in. diff --git a/lib/features/data/presentation/pages/tide_page.dart b/lib/features/data/presentation/pages/tide_page.dart index 80d54eef0..015a4c153 100644 --- a/lib/features/data/presentation/pages/tide_page.dart +++ b/lib/features/data/presentation/pages/tide_page.dart @@ -16,7 +16,7 @@ import 'package:dpip/features/data/presentation/observer_place.dart'; import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; const Duration _taiwanOffset = Duration(hours: 8); diff --git a/lib/features/data/presentation/pages/tonight_page.dart b/lib/features/data/presentation/pages/tonight_page.dart index 75eca1c12..18d3e568d 100644 --- a/lib/features/data/presentation/pages/tonight_page.dart +++ b/lib/features/data/presentation/pages/tonight_page.dart @@ -29,7 +29,7 @@ import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/data/presentation/widgets/astro_card.dart b/lib/features/data/presentation/widgets/astro_card.dart index 8735f2834..b9f601f12 100644 --- a/lib/features/data/presentation/widgets/astro_card.dart +++ b/lib/features/data/presentation/widgets/astro_card.dart @@ -9,7 +9,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One icon / label / value line. typedef AstroReading = (IconData icon, String label, String value); diff --git a/lib/features/data/presentation/widgets/moon_calendar.dart b/lib/features/data/presentation/widgets/moon_calendar.dart index 5fa12b608..23a55e2d0 100644 --- a/lib/features/data/presentation/widgets/moon_calendar.dart +++ b/lib/features/data/presentation/widgets/moon_calendar.dart @@ -16,7 +16,7 @@ import 'package:dpip/app/theme/app_motion.dart'; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/data/presentation/widgets/moon_glyph.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MoonCalendar extends StatelessWidget { const MoonCalendar({ diff --git a/lib/features/data/presentation/widgets/moon_glyph.dart b/lib/features/data/presentation/widgets/moon_glyph.dart index 124afdfd4..f68ad80ec 100644 --- a/lib/features/data/presentation/widgets/moon_glyph.dart +++ b/lib/features/data/presentation/widgets/moon_glyph.dart @@ -15,7 +15,7 @@ library; import 'dart:math' as math; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MoonGlyph extends StatelessWidget { const MoonGlyph({ diff --git a/lib/features/earthquake/presentation/pages/earthquake_page.dart b/lib/features/earthquake/presentation/pages/earthquake_page.dart index c11a95900..bf535ecac 100644 --- a/lib/features/earthquake/presentation/pages/earthquake_page.dart +++ b/lib/features/earthquake/presentation/pages/earthquake_page.dart @@ -5,7 +5,7 @@ import 'package:dpip/features/earthquake/presentation/widgets/eew_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/realtime_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Earthquake monitor — the live EEW feed rendered through the async-state diff --git a/lib/features/earthquake/presentation/pages/report_detail_page.dart b/lib/features/earthquake/presentation/pages/report_detail_page.dart index 7ed6c57f6..5e5cc971d 100644 --- a/lib/features/earthquake/presentation/pages/report_detail_page.dart +++ b/lib/features/earthquake/presentation/pages/report_detail_page.dart @@ -46,7 +46,7 @@ import 'package:dpip/shared/widgets/intensity_badge.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/lib/features/earthquake/presentation/pages/report_list_page.dart b/lib/features/earthquake/presentation/pages/report_list_page.dart index bbd4369af..bc9d1a9ed 100644 --- a/lib/features/earthquake/presentation/pages/report_list_page.dart +++ b/lib/features/earthquake/presentation/pages/report_list_page.dart @@ -19,7 +19,7 @@ import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/earthquake/presentation/pages/report_replay_page.dart b/lib/features/earthquake/presentation/pages/report_replay_page.dart index 29aec1495..5afc3385c 100644 --- a/lib/features/earthquake/presentation/pages/report_replay_page.dart +++ b/lib/features/earthquake/presentation/pages/report_replay_page.dart @@ -73,7 +73,7 @@ import 'package:dpip/shared/widgets/collapsible_map_legend.dart'; import 'package:dpip/shared/widgets/intensity_legend.dart'; import 'package:dpip/shared/widgets/intensity_ranking_card.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/lib/features/earthquake/presentation/widgets/eew_card.dart b/lib/features/earthquake/presentation/widgets/eew_card.dart index ac4ddd38d..08bd5da5e 100644 --- a/lib/features/earthquake/presentation/widgets/eew_card.dart +++ b/lib/features/earthquake/presentation/widgets/eew_card.dart @@ -41,7 +41,7 @@ import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/eew_cancelled_notice.dart'; import 'package:dpip/shared/widgets/eew_estimate_tile.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; class EewCard extends StatelessWidget { diff --git a/lib/features/earthquake/presentation/widgets/report_filter_sheet.dart b/lib/features/earthquake/presentation/widgets/report_filter_sheet.dart index 0da4d2521..6fe31af1e 100644 --- a/lib/features/earthquake/presentation/widgets/report_filter_sheet.dart +++ b/lib/features/earthquake/presentation/widgets/report_filter_sheet.dart @@ -14,7 +14,7 @@ import 'package:dpip/features/earthquake/domain/report_list_query.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:dpip/shared/widgets/sheet_surface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; diff --git a/lib/features/events/presentation/pages/events_page.dart b/lib/features/events/presentation/pages/events_page.dart index 4d4244a86..0cedfa7e3 100644 --- a/lib/features/events/presentation/pages/events_page.dart +++ b/lib/features/events/presentation/pages/events_page.dart @@ -7,7 +7,7 @@ import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/region_bar.dart'; import 'package:dpip/shared/widgets/region_pager.dart'; import 'package:dpip/shared/widgets/region_swipe_area.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Disaster-event feed — a per-area timeline of events from the DPIP history diff --git a/lib/features/events/presentation/widgets/event_timeline.dart b/lib/features/events/presentation/widgets/event_timeline.dart index aabed2e7d..5138cf3ee 100644 --- a/lib/features/events/presentation/widgets/event_timeline.dart +++ b/lib/features/events/presentation/widgets/event_timeline.dart @@ -3,7 +3,7 @@ import 'package:dpip/features/events/domain/event.dart'; import 'package:dpip/features/events/domain/event_repository.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:dpip/shared/widgets/event_icon.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/pages/home_page.dart b/lib/features/home/presentation/pages/home_page.dart index 018029cb9..6c0e5d4fc 100644 --- a/lib/features/home/presentation/pages/home_page.dart +++ b/lib/features/home/presentation/pages/home_page.dart @@ -31,7 +31,7 @@ import 'package:dpip/shared/widgets/frosted_surface.dart' show mapChromeBlursBackdrop; import 'package:dpip/shared/widgets/region_bar.dart'; import 'package:dpip/shared/widgets/region_swipe_area.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/home_active_events_section.dart b/lib/features/home/presentation/widgets/home_active_events_section.dart index 97f3c7b46..fa0c6cfb0 100644 --- a/lib/features/home/presentation/widgets/home_active_events_section.dart +++ b/lib/features/home/presentation/widgets/home_active_events_section.dart @@ -10,7 +10,7 @@ import 'package:dpip/features/home/presentation/home_active_events_controller.da import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/event_icon.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/home_content.dart b/lib/features/home/presentation/widgets/home_content.dart index 0c862df73..a49632104 100644 --- a/lib/features/home/presentation/widgets/home_content.dart +++ b/lib/features/home/presentation/widgets/home_content.dart @@ -14,7 +14,7 @@ import 'package:dpip/features/home/presentation/widgets/home_sheet_header.dart'; import 'package:dpip/features/weather/domain/rain_hour_trend.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_card.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// The scrollable home dashboard shown inside the draggable sheet — the surface diff --git a/lib/features/home/presentation/widgets/home_eew_section.dart b/lib/features/home/presentation/widgets/home_eew_section.dart index cad68ce73..4296c1589 100644 --- a/lib/features/home/presentation/widgets/home_eew_section.dart +++ b/lib/features/home/presentation/widgets/home_eew_section.dart @@ -44,7 +44,7 @@ import 'package:dpip/shared/widgets/eew_cancelled_notice.dart'; import 'package:dpip/shared/widgets/eew_estimate_tile.dart'; import 'package:dpip/shared/widgets/eew_feed_down_notice.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/home_forecast_section.dart b/lib/features/home/presentation/widgets/home_forecast_section.dart index e79c61017..7732c53c8 100644 --- a/lib/features/home/presentation/widgets/home_forecast_section.dart +++ b/lib/features/home/presentation/widgets/home_forecast_section.dart @@ -16,7 +16,7 @@ import 'package:dpip/core/weather/solar_time.dart'; import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// 24-hour forecast block under the home header. diff --git a/lib/features/home/presentation/widgets/home_map_backdrop.dart b/lib/features/home/presentation/widgets/home_map_backdrop.dart index 66a37abac..e05ec4b1f 100644 --- a/lib/features/home/presentation/widgets/home_map_backdrop.dart +++ b/lib/features/home/presentation/widgets/home_map_backdrop.dart @@ -18,7 +18,7 @@ import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/map/raster_frame_source.dart'; import 'package:dpip/shared/widgets/region_bar.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/home_monitor_banner.dart b/lib/features/home/presentation/widgets/home_monitor_banner.dart index 83aff4767..e0f69adf0 100644 --- a/lib/features/home/presentation/widgets/home_monitor_banner.dart +++ b/lib/features/home/presentation/widgets/home_monitor_banner.dart @@ -42,7 +42,7 @@ import 'package:dpip/shared/map/base_map.dart'; import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/eew_feed_down_notice.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/home_rain_trend_section.dart b/lib/features/home/presentation/widgets/home_rain_trend_section.dart index 7c532992b..54da1aee2 100644 --- a/lib/features/home/presentation/widgets/home_rain_trend_section.dart +++ b/lib/features/home/presentation/widgets/home_rain_trend_section.dart @@ -15,7 +15,7 @@ import 'package:dpip/features/weather/domain/rain_hour_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // intl 0.20 defines its own `TextDirection` class, which would shadow dart:ui's // enum used by `TextPainter` — pull only `DateFormat` to keep them apart. import 'package:intl/intl.dart' show DateFormat; diff --git a/lib/features/home/presentation/widgets/home_sheet.dart b/lib/features/home/presentation/widgets/home_sheet.dart index 3c36cd492..6bb45224a 100644 --- a/lib/features/home/presentation/widgets/home_sheet.dart +++ b/lib/features/home/presentation/widgets/home_sheet.dart @@ -10,7 +10,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_ import 'package:dpip/shared/widgets/frosted_surface.dart' show mapChromeBlursBackdrop; import 'package:flutter/foundation.dart' show ValueListenable; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// The draggable home sheet: a frosted panel over the map that reveals an diff --git a/lib/features/home/presentation/widgets/home_sheet_header.dart b/lib/features/home/presentation/widgets/home_sheet_header.dart index 450ded715..99c9212bd 100644 --- a/lib/features/home/presentation/widgets/home_sheet_header.dart +++ b/lib/features/home/presentation/widgets/home_sheet_header.dart @@ -15,7 +15,7 @@ import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_station_handoff.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/home/presentation/widgets/weather_sky/card_water_field.dart b/lib/features/home/presentation/widgets/weather_sky/card_water_field.dart index 8f548cb68..4be84d58e 100644 --- a/lib/features/home/presentation/widgets/weather_sky/card_water_field.dart +++ b/lib/features/home/presentation/widgets/weather_sky/card_water_field.dart @@ -3,7 +3,7 @@ import 'dart:math' as math; import 'dart:typed_data'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Rain landing on a card and pooling along its top edge — a CPU port of /// The reference's **panel** water. diff --git a/lib/features/home/presentation/widgets/weather_sky/precipitation_field.dart b/lib/features/home/presentation/widgets/weather_sky/precipitation_field.dart index 1a7bbfc1c..02baf72a4 100644 --- a/lib/features/home/presentation/widgets/weather_sky/precipitation_field.dart +++ b/lib/features/home/presentation/widgets/weather_sky/precipitation_field.dart @@ -2,7 +2,7 @@ import 'dart:math' as math; import 'dart:typed_data'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A CPU particle field for rain and snow, drawn with `Canvas.drawAtlas`. /// diff --git a/lib/features/home/presentation/widgets/weather_sky/rain_on_card.dart b/lib/features/home/presentation/widgets/weather_sky/rain_on_card.dart index bef61e542..3ad170f93 100644 --- a/lib/features/home/presentation/widgets/weather_sky/rain_on_card.dart +++ b/lib/features/home/presentation/widgets/weather_sky/rain_on_card.dart @@ -10,7 +10,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cach import 'package:dpip/features/home/presentation/widgets/weather_sky/card_water_field.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_raster.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_glass.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart' show RenderRepaintBoundary; import 'package:flutter/services.dart' show rootBundle; diff --git a/lib/features/home/presentation/widgets/weather_sky/rain_on_glass.dart b/lib/features/home/presentation/widgets/weather_sky/rain_on_glass.dart index 2622c735e..af41068ee 100644 --- a/lib/features/home/presentation/widgets/weather_sky/rain_on_glass.dart +++ b/lib/features/home/presentation/widgets/weather_sky/rain_on_glass.dart @@ -5,8 +5,8 @@ import 'package:dpip/core/logging/log.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/card_water_field.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_frame_pace.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_raster.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; /// Edge of the droplet-coverage bake, in pixels. The refract pass samples /// this instead of rebuilding the field at the card's resolution. diff --git a/lib/features/home/presentation/widgets/weather_sky/sky_deck.dart b/lib/features/home/presentation/widgets/weather_sky/sky_deck.dart index 50c74df8c..bac21e751 100644 --- a/lib/features/home/presentation/widgets/weather_sky/sky_deck.dart +++ b/lib/features/home/presentation/widgets/weather_sky/sky_deck.dart @@ -3,7 +3,7 @@ import 'dart:ui' as ui; import 'package:dpip/core/logging/log.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_clouds.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Fraction of the on-screen widget the cloud deck is rasterized at. /// diff --git a/lib/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart b/lib/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart index 442031f79..e3390c96f 100644 --- a/lib/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart +++ b/lib/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Bakes and caches the two atmospheric lookup tables the sky is drawn from. /// diff --git a/lib/features/home/presentation/widgets/weather_sky/weather_sky_background.dart b/lib/features/home/presentation/widgets/weather_sky/weather_sky_background.dart index 4ca2a4632..0683526cf 100644 --- a/lib/features/home/presentation/widgets/weather_sky/weather_sky_background.dart +++ b/lib/features/home/presentation/widgets/weather_sky/weather_sky_background.dart @@ -16,7 +16,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; import 'package:dpip/core/weather/solar_time.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show rootBundle; /// GPU-rendered layered sky backdrop, ported from the reference engine. diff --git a/lib/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart b/lib/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart index 3d72a34c9..a269d933b 100644 --- a/lib/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart +++ b/lib/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart @@ -6,7 +6,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_deck.dar import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/precipitation_field.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The per-frame scene state the painter renders. /// diff --git a/lib/features/location/presentation/pages/region_city_page.dart b/lib/features/location/presentation/pages/region_city_page.dart index 0a462abe3..8710ddfbc 100644 --- a/lib/features/location/presentation/pages/region_city_page.dart +++ b/lib/features/location/presentation/pages/region_city_page.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/location/presentation/widgets/region_town_tile.dar import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/location/presentation/pages/region_manage_page.dart b/lib/features/location/presentation/pages/region_manage_page.dart index 3a54c299b..5c2cc66f2 100644 --- a/lib/features/location/presentation/pages/region_manage_page.dart +++ b/lib/features/location/presentation/pages/region_manage_page.dart @@ -8,7 +8,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/location/presentation/pages/region_select_page.dart b/lib/features/location/presentation/pages/region_select_page.dart index 9548b4b53..0f23f64b3 100644 --- a/lib/features/location/presentation/pages/region_select_page.dart +++ b/lib/features/location/presentation/pages/region_select_page.dart @@ -11,7 +11,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/location/presentation/widgets/region_town_tile.dart b/lib/features/location/presentation/widgets/region_town_tile.dart index e585101be..e98d34ef9 100644 --- a/lib/features/location/presentation/widgets/region_town_tile.dart +++ b/lib/features/location/presentation/widgets/region_town_tile.dart @@ -7,7 +7,7 @@ import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; /// A township row: name, code + centroid coordinates, and a star that diff --git a/lib/features/log/presentation/pages/log_page.dart b/lib/features/log/presentation/pages/log_page.dart index acf68b1a9..664e00afb 100644 --- a/lib/features/log/presentation/pages/log_page.dart +++ b/lib/features/log/presentation/pages/log_page.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:talker_flutter/talker_flutter.dart'; diff --git a/lib/features/map/presentation/layers/admin_outline_chrome.dart b/lib/features/map/presentation/layers/admin_outline_chrome.dart index 5e0715fe4..3ccee03b9 100644 --- a/lib/features/map/presentation/layers/admin_outline_chrome.dart +++ b/lib/features/map/presentation/layers/admin_outline_chrome.dart @@ -13,7 +13,7 @@ import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/map/admin_outline.dart'; import 'package:dpip/shared/map/raster_timeline_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The reference admin frame a weather raster can sit over. diff --git a/lib/features/map/presentation/layers/disaster_map_layer.dart b/lib/features/map/presentation/layers/disaster_map_layer.dart index 705cea198..9a0023279 100644 --- a/lib/features/map/presentation/layers/disaster_map_layer.dart +++ b/lib/features/map/presentation/layers/disaster_map_layer.dart @@ -22,7 +22,7 @@ import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// Sheet-driven [MapLayer] for the disaster-prevention map (DPM). diff --git a/lib/features/map/presentation/layers/humidity_layer.dart b/lib/features/map/presentation/layers/humidity_layer.dart index 4fd0f3fdb..533e45e0b 100644 --- a/lib/features/map/presentation/layers/humidity_layer.dart +++ b/lib/features/map/presentation/layers/humidity_layer.dart @@ -6,7 +6,7 @@ import 'package:dpip/features/map/presentation/layers/weather_station_layer.dart import 'package:dpip/features/weather/domain/weather_snapshot.dart'; import 'package:dpip/features/weather/domain/weather_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class HumidityMapLayer extends diff --git a/lib/features/map/presentation/layers/lightning_layer.dart b/lib/features/map/presentation/layers/lightning_layer.dart index f358df704..51b9cbb2a 100644 --- a/lib/features/map/presentation/layers/lightning_layer.dart +++ b/lib/features/map/presentation/layers/lightning_layer.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/weather/domain/meteor_lightning_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; class LightningMapLayer with MapLayerDefaults implements MapLayer { diff --git a/lib/features/map/presentation/layers/lightning_strike_overlay.dart b/lib/features/map/presentation/layers/lightning_strike_overlay.dart index d912ec124..2417e5452 100644 --- a/lib/features/map/presentation/layers/lightning_strike_overlay.dart +++ b/lib/features/map/presentation/layers/lightning_strike_overlay.dart @@ -25,7 +25,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// Draws lightning strikes on one map surface. diff --git a/lib/features/map/presentation/layers/location_track_layer.dart b/lib/features/map/presentation/layers/location_track_layer.dart index 201dce549..55bd89c1e 100644 --- a/lib/features/map/presentation/layers/location_track_layer.dart +++ b/lib/features/map/presentation/layers/location_track_layer.dart @@ -20,7 +20,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/camera_fit.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The windows the sheet offers. [week] is the default: long enough to show a diff --git a/lib/features/map/presentation/layers/mesh_node_layer.dart b/lib/features/map/presentation/layers/mesh_node_layer.dart index cbac74419..8eee97d10 100644 --- a/lib/features/map/presentation/layers/mesh_node_layer.dart +++ b/lib/features/map/presentation/layers/mesh_node_layer.dart @@ -26,7 +26,7 @@ import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:dpip/shared/map/map_station_labels.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// Traceroute state shared by the sheet's button and the dashed overlay. diff --git a/lib/features/map/presentation/layers/pressure_layer.dart b/lib/features/map/presentation/layers/pressure_layer.dart index 49d9add55..caa4e73a8 100644 --- a/lib/features/map/presentation/layers/pressure_layer.dart +++ b/lib/features/map/presentation/layers/pressure_layer.dart @@ -6,7 +6,7 @@ import 'package:dpip/features/map/presentation/layers/weather_station_layer.dart import 'package:dpip/features/weather/domain/weather_snapshot.dart'; import 'package:dpip/features/weather/domain/weather_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class PressureMapLayer extends diff --git a/lib/features/map/presentation/layers/qpesums_layer.dart b/lib/features/map/presentation/layers/qpesums_layer.dart index 7cb5ccbdb..32c9809d4 100644 --- a/lib/features/map/presentation/layers/qpesums_layer.dart +++ b/lib/features/map/presentation/layers/qpesums_layer.dart @@ -10,7 +10,7 @@ import 'package:dpip/shared/map/map_style.dart' show townLabelLayerId; import 'package:dpip/shared/map/raster_timeline_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The QPESUMS next-1-hour precipitation forecast (未來一小時降水預報) raster /// overlay. diff --git a/lib/features/map/presentation/layers/radar_layer.dart b/lib/features/map/presentation/layers/radar_layer.dart index 29be93c88..e51e99436 100644 --- a/lib/features/map/presentation/layers/radar_layer.dart +++ b/lib/features/map/presentation/layers/radar_layer.dart @@ -20,7 +20,7 @@ import 'package:dpip/shared/map/map_style.dart' show townLabelLayerId; import 'package:dpip/shared/map/raster_timeline_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The radar echo (雷達回波) raster overlay. diff --git a/lib/features/map/presentation/layers/rain_layer.dart b/lib/features/map/presentation/layers/rain_layer.dart index 34fb6d3c8..91d8ce379 100644 --- a/lib/features/map/presentation/layers/rain_layer.dart +++ b/lib/features/map/presentation/layers/rain_layer.dart @@ -13,7 +13,7 @@ import 'package:dpip/shared/map/map_town_labels.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Localised labels for [RainInterval] (domain stays Flutter-free). extension RainIntervalL10n on RainInterval { diff --git a/lib/features/map/presentation/layers/rts_layer.dart b/lib/features/map/presentation/layers/rts_layer.dart index 5808bff91..dd8241335 100644 --- a/lib/features/map/presentation/layers/rts_layer.dart +++ b/lib/features/map/presentation/layers/rts_layer.dart @@ -38,7 +38,7 @@ import 'package:dpip/shared/seismic/intensity_icon_renderer.dart'; import 'package:dpip/shared/widgets/intensity_legend.dart'; import 'package:dpip/shared/widgets/intensity_ranking_card.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The EEW map overlay as GeoJSON: per active alert an epicentre cross plus the diff --git a/lib/features/map/presentation/layers/satellite_layer.dart b/lib/features/map/presentation/layers/satellite_layer.dart index a65e81268..3368976b9 100644 --- a/lib/features/map/presentation/layers/satellite_layer.dart +++ b/lib/features/map/presentation/layers/satellite_layer.dart @@ -10,7 +10,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/map/raster_timeline_layer.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The satellite cloud (衛星雲圖) raster overlay for one [SatelliteChannel] — diff --git a/lib/features/map/presentation/layers/scan_range_overlay_chrome.dart b/lib/features/map/presentation/layers/scan_range_overlay_chrome.dart index e5d950895..d50c75543 100644 --- a/lib/features/map/presentation/layers/scan_range_overlay_chrome.dart +++ b/lib/features/map/presentation/layers/scan_range_overlay_chrome.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/map/presentation/layers/admin_outline_chrome.dart' import 'package:dpip/features/map/presentation/layers/radar_scan_range.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The reference chrome a weather raster can sit over. diff --git a/lib/features/map/presentation/layers/temperature_layer.dart b/lib/features/map/presentation/layers/temperature_layer.dart index 71d2fce84..8886de644 100644 --- a/lib/features/map/presentation/layers/temperature_layer.dart +++ b/lib/features/map/presentation/layers/temperature_layer.dart @@ -6,7 +6,7 @@ import 'package:dpip/features/map/presentation/layers/weather_station_layer.dart import 'package:dpip/features/weather/domain/weather_snapshot.dart'; import 'package:dpip/features/weather/domain/weather_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TemperatureMapLayer extends diff --git a/lib/features/map/presentation/layers/tsunami_layer.dart b/lib/features/map/presentation/layers/tsunami_layer.dart index 6a936517e..4cee9ad16 100644 --- a/lib/features/map/presentation/layers/tsunami_layer.dart +++ b/lib/features/map/presentation/layers/tsunami_layer.dart @@ -16,7 +16,7 @@ import 'package:dpip/shared/map/map_station_labels.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/seismic/intensity_icon_renderer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// A sheet layer: one event, no frames and no timeline. diff --git a/lib/features/map/presentation/layers/typhoon_layer.dart b/lib/features/map/presentation/layers/typhoon_layer.dart index e823d12a1..202dbf5f8 100644 --- a/lib/features/map/presentation/layers/typhoon_layer.dart +++ b/lib/features/map/presentation/layers/typhoon_layer.dart @@ -38,7 +38,7 @@ import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/map/raster_frame_source.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// A tappable storm waypoint parsed from the overlay geojson. diff --git a/lib/features/map/presentation/layers/weather_station_layer.dart b/lib/features/map/presentation/layers/weather_station_layer.dart index 124f1d37d..7f6bfd6a6 100644 --- a/lib/features/map/presentation/layers/weather_station_layer.dart +++ b/lib/features/map/presentation/layers/weather_station_layer.dart @@ -20,7 +20,7 @@ import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_station_labels.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// A sheet-driven [MapLayer]: renders every station as a dot coloured by its diff --git a/lib/features/map/presentation/layers/wind_arrow_overlay.dart b/lib/features/map/presentation/layers/wind_arrow_overlay.dart index a17afb590..8acc5ef18 100644 --- a/lib/features/map/presentation/layers/wind_arrow_overlay.dart +++ b/lib/features/map/presentation/layers/wind_arrow_overlay.dart @@ -25,7 +25,7 @@ import 'package:dpip/features/weather/domain/weather_snapshot.dart'; import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// Draws station wind arrows on one map surface. diff --git a/lib/features/map/presentation/layers/wind_forecast_layer.dart b/lib/features/map/presentation/layers/wind_forecast_layer.dart index 6da6a3dde..e1cb265f1 100644 --- a/lib/features/map/presentation/layers/wind_forecast_layer.dart +++ b/lib/features/map/presentation/layers/wind_forecast_layer.dart @@ -19,7 +19,7 @@ import 'package:dpip/shared/map/map_style.dart' show townLabelLayerId; import 'package:dpip/shared/map/raster_timeline_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// The wind forecast (風場) raster overlay for one model. diff --git a/lib/features/map/presentation/layers/wind_layer.dart b/lib/features/map/presentation/layers/wind_layer.dart index 1b32cbae0..26c75c185 100644 --- a/lib/features/map/presentation/layers/wind_layer.dart +++ b/lib/features/map/presentation/layers/wind_layer.dart @@ -18,7 +18,7 @@ import 'package:dpip/features/weather/domain/weather_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; class WindMapLayer diff --git a/lib/features/map/presentation/pages/map_page.dart b/lib/features/map/presentation/pages/map_page.dart index 15217c494..4ec843a16 100644 --- a/lib/features/map/presentation/pages/map_page.dart +++ b/lib/features/map/presentation/pages/map_page.dart @@ -50,7 +50,7 @@ import 'package:dpip/features/weather/domain/wind_forecast_model.dart'; import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_scaffold.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Full-screen map tab. diff --git a/lib/features/map/presentation/widgets/disaster_map_overlay_menu.dart b/lib/features/map/presentation/widgets/disaster_map_overlay_menu.dart index 1eee1ba1c..37216ad0d 100644 --- a/lib/features/map/presentation/widgets/disaster_map_overlay_menu.dart +++ b/lib/features/map/presentation/widgets/disaster_map_overlay_menu.dart @@ -10,7 +10,7 @@ import 'package:dpip/shared/map/map_town_labels.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Compact icon chip that opens the DPM overlay menu (same chrome as typhoon). class DisasterMapOverlayMenu extends StatelessWidget { diff --git a/lib/features/map/presentation/widgets/dpm_sheet.dart b/lib/features/map/presentation/widgets/dpm_sheet.dart index 00441b51d..1c2404d1f 100644 --- a/lib/features/map/presentation/widgets/dpm_sheet.dart +++ b/lib/features/map/presentation/widgets/dpm_sheet.dart @@ -14,7 +14,7 @@ import 'package:dpip/shared/map/maps_launcher.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Peek / rest / full sheet for DPM detail. class DpmSheet extends StatefulWidget { diff --git a/lib/features/map/presentation/widgets/forecast_overlay_menu.dart b/lib/features/map/presentation/widgets/forecast_overlay_menu.dart index 2fd1b17bb..0b45ba433 100644 --- a/lib/features/map/presentation/widgets/forecast_overlay_menu.dart +++ b/lib/features/map/presentation/widgets/forecast_overlay_menu.dart @@ -10,7 +10,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Compact icon chip that opens [layer]'s overlay options — the same chrome and /// position as the radar/QPESUMS menus, so "layer options" is one affordance diff --git a/lib/features/map/presentation/widgets/location_track_sheet.dart b/lib/features/map/presentation/widgets/location_track_sheet.dart index 4e2f006dd..d888dac4d 100644 --- a/lib/features/map/presentation/widgets/location_track_sheet.dart +++ b/lib/features/map/presentation/widgets/location_track_sheet.dart @@ -18,7 +18,7 @@ import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:dpip/shared/widgets/selectable_pill.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; diff --git a/lib/features/map/presentation/widgets/mesh_node_sheet.dart b/lib/features/map/presentation/widgets/mesh_node_sheet.dart index 7e3ca9637..6ccec5742 100644 --- a/lib/features/map/presentation/widgets/mesh_node_sheet.dart +++ b/lib/features/map/presentation/widgets/mesh_node_sheet.dart @@ -22,7 +22,7 @@ import 'package:dpip/shared/models/series_runs.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MeshNodeSheet extends StatefulWidget { const MeshNodeSheet({ diff --git a/lib/features/map/presentation/widgets/monitor_eew_card.dart b/lib/features/map/presentation/widgets/monitor_eew_card.dart index 71a685a21..bf4067bbb 100644 --- a/lib/features/map/presentation/widgets/monitor_eew_card.dart +++ b/lib/features/map/presentation/widgets/monitor_eew_card.dart @@ -32,7 +32,7 @@ import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/eew_cancelled_notice.dart'; import 'package:dpip/shared/widgets/eew_estimate_tile.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// One live EEW alert in the monitor's overlay sheet — compact so the map stays diff --git a/lib/features/map/presentation/widgets/radar_overlay_menu.dart b/lib/features/map/presentation/widgets/radar_overlay_menu.dart index 8598ae68f..8c97d7f45 100644 --- a/lib/features/map/presentation/widgets/radar_overlay_menu.dart +++ b/lib/features/map/presentation/widgets/radar_overlay_menu.dart @@ -8,7 +8,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The radar layer's own options chip — the shared chrome menu, titled for /// radar and carrying two extra rows the other rasters do not have: the diff --git a/lib/features/map/presentation/widgets/rts_monitor_panel.dart b/lib/features/map/presentation/widgets/rts_monitor_panel.dart index 0460a4ae8..eac258bc9 100644 --- a/lib/features/map/presentation/widgets/rts_monitor_panel.dart +++ b/lib/features/map/presentation/widgets/rts_monitor_panel.dart @@ -34,7 +34,7 @@ import 'package:dpip/shared/widgets/alert_cycle_chip.dart'; import 'package:dpip/shared/widgets/eew_feed_down_notice.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:dpip/shared/seismic/spoken_intensity.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/map/presentation/widgets/satellite_legend.dart b/lib/features/map/presentation/widgets/satellite_legend.dart index 5485f57e4..12bbf06f2 100644 --- a/lib/features/map/presentation/widgets/satellite_legend.dart +++ b/lib/features/map/presentation/widgets/satellite_legend.dart @@ -18,7 +18,7 @@ import 'package:dpip/features/weather/domain/satellite_channel.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The satellite layer's legend card, rebuilt when the band's [style] changes /// (grayscale vs cloud-top vs Dvorak are three different keys) or the 國界 diff --git a/lib/features/map/presentation/widgets/satellite_style_menu.dart b/lib/features/map/presentation/widgets/satellite_style_menu.dart index 7cf5e2599..a76afe592 100644 --- a/lib/features/map/presentation/widgets/satellite_style_menu.dart +++ b/lib/features/map/presentation/widgets/satellite_style_menu.dart @@ -11,7 +11,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Compact icon chip that opens the satellite band's colour-style menu. /// diff --git a/lib/features/map/presentation/widgets/scan_range_overlay_menu.dart b/lib/features/map/presentation/widgets/scan_range_overlay_menu.dart index 9ba5e1353..2a53c77cd 100644 --- a/lib/features/map/presentation/widgets/scan_range_overlay_menu.dart +++ b/lib/features/map/presentation/widgets/scan_range_overlay_menu.dart @@ -10,7 +10,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Compact icon chip that opens [layer]'s overlay options — the same chrome and /// position as the radar/typhoon menus, so "layer options" is one affordance diff --git a/lib/features/map/presentation/widgets/station_sheet.dart b/lib/features/map/presentation/widgets/station_sheet.dart index 9bc147361..75103e415 100644 --- a/lib/features/map/presentation/widgets/station_sheet.dart +++ b/lib/features/map/presentation/widgets/station_sheet.dart @@ -18,7 +18,7 @@ import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// A trend series to plot: absolute Unix-second [times] aligned index-wise to diff --git a/lib/features/map/presentation/widgets/tsunami_panel.dart b/lib/features/map/presentation/widgets/tsunami_panel.dart index ce42c3d18..3a36b357f 100644 --- a/lib/features/map/presentation/widgets/tsunami_panel.dart +++ b/lib/features/map/presentation/widgets/tsunami_panel.dart @@ -15,7 +15,7 @@ import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/selectable_pill.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// Collapsible tsunami bulletin sheet — the text half of the layer, on the same diff --git a/lib/features/map/presentation/widgets/typhoon_forecast_callouts.dart b/lib/features/map/presentation/widgets/typhoon_forecast_callouts.dart index d2dffb7ed..a8816b7f9 100644 --- a/lib/features/map/presentation/widgets/typhoon_forecast_callouts.dart +++ b/lib/features/map/presentation/widgets/typhoon_forecast_callouts.dart @@ -18,7 +18,7 @@ import 'package:dpip/features/typhoon/domain/compass_direction.dart'; import 'package:dpip/features/typhoon/domain/typhoon_track.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart' show mapChromeBlursBackdrop; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; /// Min zoom before forecast Flutter tips appear. diff --git a/lib/features/map/presentation/widgets/typhoon_overlay_menu.dart b/lib/features/map/presentation/widgets/typhoon_overlay_menu.dart index bc440d07f..3322613c6 100644 --- a/lib/features/map/presentation/widgets/typhoon_overlay_menu.dart +++ b/lib/features/map/presentation/widgets/typhoon_overlay_menu.dart @@ -12,7 +12,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Compact icon chip that opens a categorised overlay menu. class TyphoonOverlayMenu extends StatelessWidget { diff --git a/lib/features/map/presentation/widgets/typhoon_panel.dart b/lib/features/map/presentation/widgets/typhoon_panel.dart index 2424d563d..f36caf9b3 100644 --- a/lib/features/map/presentation/widgets/typhoon_panel.dart +++ b/lib/features/map/presentation/widgets/typhoon_panel.dart @@ -19,7 +19,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/selectable_pill.dart'; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class TyphoonPanel extends StatefulWidget { const TyphoonPanel({super.key, required this.layer}); diff --git a/lib/features/map/presentation/wind_speed.dart b/lib/features/map/presentation/wind_speed.dart index b5866ff18..09bccaf16 100644 --- a/lib/features/map/presentation/wind_speed.dart +++ b/lib/features/map/presentation/wind_speed.dart @@ -3,7 +3,7 @@ /// the trend plot agree by construction. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:dpip/core/a11y/color_vision.dart'; /// The five speed buckets, weakest first — the same thresholds / colours as the diff --git a/lib/features/meshtastic/presentation/pages/meshtastic_page.dart b/lib/features/meshtastic/presentation/pages/meshtastic_page.dart index e9d8d1b9b..71a295bfe 100644 --- a/lib/features/meshtastic/presentation/pages/meshtastic_page.dart +++ b/lib/features/meshtastic/presentation/pages/meshtastic_page.dart @@ -29,7 +29,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/second_ticker.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/meshtastic/presentation/widgets/mesh_chart_section.dart b/lib/features/meshtastic/presentation/widgets/mesh_chart_section.dart index bf362f84e..5cedb7c37 100644 --- a/lib/features/meshtastic/presentation/widgets/mesh_chart_section.dart +++ b/lib/features/meshtastic/presentation/widgets/mesh_chart_section.dart @@ -15,7 +15,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/core/realtime/app_time.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// How far back a chart looks. enum MeshChartRange { diff --git a/lib/features/meshtastic/presentation/widgets/mesh_charts.dart b/lib/features/meshtastic/presentation/widgets/mesh_charts.dart index 7a19ea8e6..4e7beee58 100644 --- a/lib/features/meshtastic/presentation/widgets/mesh_charts.dart +++ b/lib/features/meshtastic/presentation/widgets/mesh_charts.dart @@ -21,7 +21,7 @@ import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/models/series_runs.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Channel/air utilization — how busy the mesh's airtime is. class MeshUtilizationChart extends StatelessWidget { diff --git a/lib/features/meshtastic/presentation/widgets/mesh_ratio_chart.dart b/lib/features/meshtastic/presentation/widgets/mesh_ratio_chart.dart index dc3edc9ec..7cd8565b9 100644 --- a/lib/features/meshtastic/presentation/widgets/mesh_ratio_chart.dart +++ b/lib/features/meshtastic/presentation/widgets/mesh_ratio_chart.dart @@ -19,7 +19,7 @@ library; import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/features/meshtastic/presentation/widgets/mesh_charts.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Which counter pair a chart plots. enum MeshRatio { diff --git a/lib/features/more/presentation/pages/more_page.dart b/lib/features/more/presentation/pages/more_page.dart index acbdf4c20..c5458289a 100644 --- a/lib/features/more/presentation/pages/more_page.dart +++ b/lib/features/more/presentation/pages/more_page.dart @@ -24,7 +24,7 @@ import 'package:dpip/core/permissions/permission_health.dart'; import 'package:dpip/shared/diagnostics/dump_action.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/features/notification/presentation/notify_labels.dart b/lib/features/notification/presentation/notify_labels.dart index 9cdd3d7ab..eed3726bd 100644 --- a/lib/features/notification/presentation/notify_labels.dart +++ b/lib/features/notification/presentation/notify_labels.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/features/notification/domain/notify_preset.dart'; import 'package:dpip/features/notification/domain/notify_settings.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The channel's display title. String notifyChannelTitle(NotifyChannel channel, AppLocalizations l10n) => diff --git a/lib/features/notification/presentation/pages/notification_test_page.dart b/lib/features/notification/presentation/pages/notification_test_page.dart index 2e1540006..b366e76e5 100644 --- a/lib/features/notification/presentation/pages/notification_test_page.dart +++ b/lib/features/notification/presentation/pages/notification_test_page.dart @@ -13,7 +13,7 @@ import 'package:dpip/core/notifications/notification_service.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Lets the user hear and see each alert channel on their own device. diff --git a/lib/features/notification/presentation/pages/notify_page.dart b/lib/features/notification/presentation/pages/notify_page.dart index b62192e85..2f5a9dd64 100644 --- a/lib/features/notification/presentation/pages/notify_page.dart +++ b/lib/features/notification/presentation/pages/notify_page.dart @@ -15,7 +15,7 @@ import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/onboarding/presentation/pages/onboarding_page.dart b/lib/features/onboarding/presentation/pages/onboarding_page.dart index 5d1044998..91bc8d8bf 100644 --- a/lib/features/onboarding/presentation/pages/onboarding_page.dart +++ b/lib/features/onboarding/presentation/pages/onboarding_page.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/onboarding/presentation/widgets/onboarding_permiss import 'package:dpip/features/onboarding/presentation/widgets/onboarding_terms.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/language_picker.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/onboarding/presentation/widgets/onboarding_intro.dart b/lib/features/onboarding/presentation/widgets/onboarding_intro.dart index 6d82ae386..e371cb01f 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_intro.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_intro.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_scaffold.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OnboardingIntroPage extends StatelessWidget { const OnboardingIntroPage({super.key, required this.onNext}); diff --git a/lib/features/onboarding/presentation/widgets/onboarding_notify_presets.dart b/lib/features/onboarding/presentation/widgets/onboarding_notify_presets.dart index 81dfe98ee..584491bd1 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_notify_presets.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_notify_presets.dart @@ -27,7 +27,7 @@ import 'package:dpip/features/notification/domain/notify_preset_applier.dart'; import 'package:dpip/features/notification/domain/notify_repository.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_scaffold.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; class OnboardingNotifyPresetsPage extends StatefulWidget { diff --git a/lib/features/onboarding/presentation/widgets/onboarding_permissions.dart b/lib/features/onboarding/presentation/widgets/onboarding_permissions.dart index 36bc658e7..ab628fbfa 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_permissions.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_permissions.dart @@ -13,7 +13,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_scaffold.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_checklist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OnboardingPermissionsPage extends StatefulWidget { const OnboardingPermissionsPage({super.key, required this.onFinish}); diff --git a/lib/features/onboarding/presentation/widgets/onboarding_scaffold.dart b/lib/features/onboarding/presentation/widgets/onboarding_scaffold.dart index 1ff2fce3d..3ca6c26f9 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_scaffold.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_scaffold.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A step layout: [child] scrolls; [actionBuilder] builds the pinned bottom bar /// and is told whether the content has been scrolled to the end (`atEnd`), so a diff --git a/lib/features/onboarding/presentation/widgets/onboarding_terms.dart b/lib/features/onboarding/presentation/widgets/onboarding_terms.dart index bc6942446..202cc24f9 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_terms.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_terms.dart @@ -6,7 +6,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_scaffold.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class OnboardingTermsPage extends StatefulWidget { const OnboardingTermsPage({super.key, required this.onAccept}); diff --git a/lib/features/release_highlights/presentation/pages/release_highlights_page.dart b/lib/features/release_highlights/presentation/pages/release_highlights_page.dart index 603e77037..befa6f4d2 100644 --- a/lib/features/release_highlights/presentation/pages/release_highlights_page.dart +++ b/lib/features/release_highlights/presentation/pages/release_highlights_page.dart @@ -7,7 +7,7 @@ import 'package:dpip/core/version/app_build.dart'; import 'package:dpip/features/release_highlights/domain/release_highlight.dart'; import 'package:dpip/features/release_highlights/presentation/widgets/highlight_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// The page behind the version card's chevron — the cycle's key highlights diff --git a/lib/features/release_highlights/presentation/widgets/highlight_card.dart b/lib/features/release_highlights/presentation/widgets/highlight_card.dart index 2506c87cc..4f7eafe94 100644 --- a/lib/features/release_highlights/presentation/widgets/highlight_card.dart +++ b/lib/features/release_highlights/presentation/widgets/highlight_card.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/release_highlights/domain/release_highlight.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The tag of the active locale, e.g. `zh_Hant`, `en`. String localeTagOf(BuildContext context) => diff --git a/lib/features/seismometer/presentation/seismometer_page.dart b/lib/features/seismometer/presentation/seismometer_page.dart index f28bed68a..d80b8d338 100644 --- a/lib/features/seismometer/presentation/seismometer_page.dart +++ b/lib/features/seismometer/presentation/seismometer_page.dart @@ -16,7 +16,7 @@ import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/seismic/intensity.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const _absent = '\u2014'; const _intensitySize = 96.0; diff --git a/lib/features/settings/presentation/pages/default_map_layer_page.dart b/lib/features/settings/presentation/pages/default_map_layer_page.dart index 5fa404757..8358c94e6 100644 --- a/lib/features/settings/presentation/pages/default_map_layer_page.dart +++ b/lib/features/settings/presentation/pages/default_map_layer_page.dart @@ -8,7 +8,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/default_map_layer_ui.dart'; import 'package:dpip/shared/map/map_layer_category.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Full-screen list of map overlays — the active choice carries a trailing diff --git a/lib/features/settings/presentation/pages/developer_page.dart b/lib/features/settings/presentation/pages/developer_page.dart index 26eda2783..12b1760a3 100644 --- a/lib/features/settings/presentation/pages/developer_page.dart +++ b/lib/features/settings/presentation/pages/developer_page.dart @@ -25,7 +25,7 @@ import 'package:dpip/shared/map/map_tile_cache.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/settings/presentation/pages/display_page.dart b/lib/features/settings/presentation/pages/display_page.dart index 9c5140350..8e13c8082 100644 --- a/lib/features/settings/presentation/pages/display_page.dart +++ b/lib/features/settings/presentation/pages/display_page.dart @@ -32,7 +32,7 @@ import 'package:dpip/features/settings/presentation/widgets/display_preview.dart import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/settings/presentation/pages/eew_source_page.dart b/lib/features/settings/presentation/pages/eew_source_page.dart index 4e89aa887..37d30f1d7 100644 --- a/lib/features/settings/presentation/pages/eew_source_page.dart +++ b/lib/features/settings/presentation/pages/eew_source_page.dart @@ -6,7 +6,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/settings/eew_cwa_only_settings.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Two-card choice — the active source is called out with a tinted surface, diff --git a/lib/features/settings/presentation/pages/experimental_page.dart b/lib/features/settings/presentation/pages/experimental_page.dart index 5f306575e..11469efd8 100644 --- a/lib/features/settings/presentation/pages/experimental_page.dart +++ b/lib/features/settings/presentation/pages/experimental_page.dart @@ -6,7 +6,7 @@ import 'package:dpip/core/settings/sky_time_mode.dart'; import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Experimental / in-progress features, reachable from the More tab. diff --git a/lib/features/settings/presentation/pages/language_page.dart b/lib/features/settings/presentation/pages/language_page.dart index 13f1b391a..65ab6aa40 100644 --- a/lib/features/settings/presentation/pages/language_page.dart +++ b/lib/features/settings/presentation/pages/language_page.dart @@ -6,7 +6,7 @@ import 'package:dpip/core/settings/language_options.dart'; import 'package:dpip/core/settings/locale_controller.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// A full-screen language list — "follow system" plus every supported language diff --git a/lib/features/settings/presentation/pages/permissions_page.dart b/lib/features/settings/presentation/pages/permissions_page.dart index 62f15f150..33edb9ce4 100644 --- a/lib/features/settings/presentation/pages/permissions_page.dart +++ b/lib/features/settings/presentation/pages/permissions_page.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_checklist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class PermissionsPage extends StatelessWidget { const PermissionsPage({super.key}); diff --git a/lib/features/settings/presentation/pages/spoken_intensity_page.dart b/lib/features/settings/presentation/pages/spoken_intensity_page.dart index db393d49b..dc613b326 100644 --- a/lib/features/settings/presentation/pages/spoken_intensity_page.dart +++ b/lib/features/settings/presentation/pages/spoken_intensity_page.dart @@ -6,7 +6,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/settings/eew_spoken_announcement_settings.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// One switch, not a two-card choice. diff --git a/lib/features/settings/presentation/widgets/display_preview.dart b/lib/features/settings/presentation/widgets/display_preview.dart index 6a1281923..e4a83855c 100644 --- a/lib/features/settings/presentation/widgets/display_preview.dart +++ b/lib/features/settings/presentation/widgets/display_preview.dart @@ -36,7 +36,7 @@ import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/seismic/report_colors.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// One mock report row. diff --git a/lib/features/settings/presentation/widgets/network_usage_chart.dart b/lib/features/settings/presentation/widgets/network_usage_chart.dart index 6882e8d31..eb2d612c5 100644 --- a/lib/features/settings/presentation/widgets/network_usage_chart.dart +++ b/lib/features/settings/presentation/widgets/network_usage_chart.dart @@ -7,7 +7,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/network/network_usage_store.dart'; import 'package:dpip/core/realtime/app_time.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Which series the chart plots: both stacked, or one on its own. enum NetworkChartMode { diff --git a/lib/features/settings/presentation/widgets/storage_breakdown.dart b/lib/features/settings/presentation/widgets/storage_breakdown.dart index df4c739d4..378d21140 100644 --- a/lib/features/settings/presentation/widgets/storage_breakdown.dart +++ b/lib/features/settings/presentation/widgets/storage_breakdown.dart @@ -9,7 +9,7 @@ library; import 'package:dpip/core/storage/app_storage_scan.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Colour for the [index]th slice — a fixed, distinguishable palette. const List storageSliceColors = [ diff --git a/lib/features/sponsor/presentation/pages/sponsor_page.dart b/lib/features/sponsor/presentation/pages/sponsor_page.dart index 60876a811..905aa0785 100644 --- a/lib/features/sponsor/presentation/pages/sponsor_page.dart +++ b/lib/features/sponsor/presentation/pages/sponsor_page.dart @@ -11,7 +11,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/features/status/presentation/pages/server_status_page.dart b/lib/features/status/presentation/pages/server_status_page.dart index f6506af26..cd406f328 100644 --- a/lib/features/status/presentation/pages/server_status_page.dart +++ b/lib/features/status/presentation/pages/server_status_page.dart @@ -19,7 +19,7 @@ import 'package:dpip/features/status/domain/cloudflare_status_repository.dart'; import 'package:dpip/features/status/domain/server_status.dart'; import 'package:dpip/features/status/domain/server_status_repository.dart'; import 'package:dpip/shared/widgets/async_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/features/weather/presentation/pages/weather_ranking_page.dart b/lib/features/weather/presentation/pages/weather_ranking_page.dart index 88187fdd5..9fd7d1ab2 100644 --- a/lib/features/weather/presentation/pages/weather_ranking_page.dart +++ b/lib/features/weather/presentation/pages/weather_ranking_page.dart @@ -22,7 +22,7 @@ import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/features/weather/presentation/widgets/ranking_time_sheet.dart b/lib/features/weather/presentation/widgets/ranking_time_sheet.dart index d82a59367..60d157284 100644 --- a/lib/features/weather/presentation/widgets/ranking_time_sheet.dart +++ b/lib/features/weather/presentation/widgets/ranking_time_sheet.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/realtime/app_time.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// One choice from [showRankingTimeSheet]. diff --git a/lib/features/weather/presentation/widgets/weather_ranking_row.dart b/lib/features/weather/presentation/widgets/weather_ranking_row.dart index 35409f327..2451bc147 100644 --- a/lib/features/weather/presentation/widgets/weather_ranking_row.dart +++ b/lib/features/weather/presentation/widgets/weather_ranking_row.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/weather/domain/weather_ranking.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One row in a weather ranking list — top-3 medals, relative fill bar, value. class WeatherRankingRow extends StatelessWidget { diff --git a/lib/shared/color_hex.dart b/lib/shared/color_hex.dart index bf4252c5f..0d93ebb3d 100644 --- a/lib/shared/color_hex.dart +++ b/lib/shared/color_hex.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Hex conversion for feeding theme colours into MapLibre style JSON. extension ColorHex on Color { diff --git a/lib/shared/diagnostics/dump_action.dart b/lib/shared/diagnostics/dump_action.dart index c876f813c..6297d368b 100644 --- a/lib/shared/diagnostics/dump_action.dart +++ b/lib/shared/diagnostics/dump_action.dart @@ -13,7 +13,7 @@ import 'package:dpip/core/storage/app_database.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/dump_link_dialog.dart'; import 'package:dpip/shared/widgets/dump_upload_dialog.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:talker_flutter/talker_flutter.dart'; diff --git a/lib/shared/map/base_map.dart b/lib/shared/map/base_map.dart index ce95d97ab..9332da12d 100644 --- a/lib/shared/map/base_map.dart +++ b/lib/shared/map/base_map.dart @@ -11,7 +11,7 @@ import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/map/map_trace.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show PlatformException; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/shared/map/basemap_overlay_sync.dart b/lib/shared/map/basemap_overlay_sync.dart index 3ccbd7490..2558d4a83 100644 --- a/lib/shared/map/basemap_overlay_sync.dart +++ b/lib/shared/map/basemap_overlay_sync.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/core/logging/log.dart'; import 'package:dpip/shared/map/map_gsi_overlay.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart' show Brightness; +import 'package:material_ui/material_ui.dart' show Brightness; import 'package:maplibre_gl/maplibre_gl.dart'; /// Runtime DEM source — identical to what the baked style declares (see diff --git a/lib/shared/map/default_map_layer_ui.dart b/lib/shared/map/default_map_layer_ui.dart index 8786062b8..61a2cc01c 100644 --- a/lib/shared/map/default_map_layer_ui.dart +++ b/lib/shared/map/default_map_layer_ui.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/core/settings/default_map_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Icons / labels shared by the bottom-nav Map tab and the settings picker. /// diff --git a/lib/shared/map/map_compass.dart b/lib/shared/map/map_compass.dart index f6f7be1eb..90eb81afe 100644 --- a/lib/shared/map/map_compass.dart +++ b/lib/shared/map/map_compass.dart @@ -11,7 +11,7 @@ import 'package:dpip/core/geo/geo_math.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A circular, frosted north button driven by the camera [bearing]. /// diff --git a/lib/shared/map/map_gsi_overlay.dart b/lib/shared/map/map_gsi_overlay.dart index b1d5df738..3d34ad7c0 100644 --- a/lib/shared/map/map_gsi_overlay.dart +++ b/lib/shared/map/map_gsi_overlay.dart @@ -19,7 +19,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; const String gsiSourceId = 'gsi'; diff --git a/lib/shared/map/map_immersive_chrome.dart b/lib/shared/map/map_immersive_chrome.dart index de1b75b2d..b1e321b27 100644 --- a/lib/shared/map/map_immersive_chrome.dart +++ b/lib/shared/map/map_immersive_chrome.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_immersive.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Fades and nudges a block of map chrome as immersive mode toggles. /// diff --git a/lib/shared/map/map_layer_switcher.dart b/lib/shared/map/map_layer_switcher.dart index 896629a6d..42bd4d94b 100644 --- a/lib/shared/map/map_layer_switcher.dart +++ b/lib/shared/map/map_layer_switcher.dart @@ -14,7 +14,7 @@ import 'package:dpip/shared/map/map_layer_order.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Frosted chip (active layer name) that opens a layer-picker drag sheet. diff --git a/lib/shared/map/map_scaffold.dart b/lib/shared/map/map_scaffold.dart index 20d5c9989..9af1bf299 100644 --- a/lib/shared/map/map_scaffold.dart +++ b/lib/shared/map/map_scaffold.dart @@ -34,7 +34,7 @@ import 'package:dpip/shared/navigation/refresh_on_appear.dart' import 'package:dpip/shared/widgets/collapsible_map_legend.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; diff --git a/lib/shared/map/map_terrain_toggle.dart b/lib/shared/map/map_terrain_toggle.dart index 2cbfb61cb..ea79d0eff 100644 --- a/lib/shared/map/map_terrain_toggle.dart +++ b/lib/shared/map/map_terrain_toggle.dart @@ -11,7 +11,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One checkbox row for the terrain-relief setting — drops into any overlay /// menu's children. diff --git a/lib/shared/map/map_timeline.dart b/lib/shared/map/map_timeline.dart index e40e983b8..d987391bb 100644 --- a/lib/shared/map/map_timeline.dart +++ b/lib/shared/map/map_timeline.dart @@ -10,7 +10,7 @@ import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_trace.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:flutter/foundation.dart' show ValueListenable, ValueNotifier; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart'; /// A horizontal, scrubbable timeline over a layer's [frames]. diff --git a/lib/shared/map/map_town_labels.dart b/lib/shared/map/map_town_labels.dart index 810e6afe9..cc4c6cdf0 100644 --- a/lib/shared/map/map_town_labels.dart +++ b/lib/shared/map/map_town_labels.dart @@ -14,7 +14,7 @@ import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:dpip/shared/widgets/section_header.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One checkbox row for the township-name setting — drops into any overlay /// menu's children. diff --git a/lib/shared/map/maps_launcher.dart b/lib/shared/map/maps_launcher.dart index 3bba1777f..68bb1befb 100644 --- a/lib/shared/map/maps_launcher.dart +++ b/lib/shared/map/maps_launcher.dart @@ -10,7 +10,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/shared/map/raster_timeline_layer.dart b/lib/shared/map/raster_timeline_layer.dart index 4150cda84..cf6baabf3 100644 --- a/lib/shared/map/raster_timeline_layer.dart +++ b/lib/shared/map/raster_timeline_layer.dart @@ -14,7 +14,7 @@ import 'package:dpip/shared/map/map_tile_cache.dart'; import 'package:dpip/shared/map/map_trace.dart'; import 'package:dpip/shared/map/raster_frame_source.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; enum _IdlePreloadOutcome { ready, timeout, cancelled } diff --git a/lib/shared/seismic/intensity_colors.dart b/lib/shared/seismic/intensity_colors.dart index fba49f775..2cee62ccb 100644 --- a/lib/shared/seismic/intensity_colors.dart +++ b/lib/shared/seismic/intensity_colors.dart @@ -22,7 +22,7 @@ library; import 'package:dpip/core/a11y/color_vision.dart'; import 'package:dpip/shared/color_hex.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The real-time monitor's station dots, coloured by the continuous /// instrumental intensity `i` — rts-image-go's station table, the colours diff --git a/lib/shared/seismic/report_colors.dart b/lib/shared/seismic/report_colors.dart index caafebf96..7d7fd7c61 100644 --- a/lib/shared/seismic/report_colors.dart +++ b/lib/shared/seismic/report_colors.dart @@ -14,7 +14,7 @@ library; import 'package:dpip/core/a11y/color_vision.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Report chrome that is not part of a colour *ramp*. abstract final class ReportColors { diff --git a/lib/shared/widgets/alert_cycle_chip.dart b/lib/shared/widgets/alert_cycle_chip.dart index ba0f6cf22..28bfe544e 100644 --- a/lib/shared/widgets/alert_cycle_chip.dart +++ b/lib/shared/widgets/alert_cycle_chip.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class AlertCycleChip extends StatelessWidget { const AlertCycleChip({ diff --git a/lib/shared/widgets/area_page_sync.dart b/lib/shared/widgets/area_page_sync.dart index ab915dbce..30bc42e88 100644 --- a/lib/shared/widgets/area_page_sync.dart +++ b/lib/shared/widgets/area_page_sync.dart @@ -1,6 +1,6 @@ import 'package:dpip/app/theme/app_motion.dart'; import 'package:dpip/core/settings/region_store.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Binds a driven [PageController] to [RegionStore] for a widget that only diff --git a/lib/shared/widgets/async_view.dart b/lib/shared/widgets/async_view.dart index bee28f9fb..a4a83adfb 100644 --- a/lib/shared/widgets/async_view.dart +++ b/lib/shared/widgets/async_view.dart @@ -5,7 +5,7 @@ import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Renders a one-shot `Future>` to the async-state contract: /// waiting → loading, [Ok] → [builder] (or [empty] when [isEmpty]), [Err] → diff --git a/lib/shared/widgets/collapsible_map_legend.dart b/lib/shared/widgets/collapsible_map_legend.dart index 81a50035e..7065d0f5c 100644 --- a/lib/shared/widgets/collapsible_map_legend.dart +++ b/lib/shared/widgets/collapsible_map_legend.dart @@ -8,7 +8,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Wraps a layer's [legend] body. Remount with a new [Key] (e.g. layer id) to /// reset to the collapsed state when the active layer changes. diff --git a/lib/shared/widgets/dump_link_dialog.dart b/lib/shared/widgets/dump_link_dialog.dart index 200b8a594..41cf567d9 100644 --- a/lib/shared/widgets/dump_link_dialog.dart +++ b/lib/shared/widgets/dump_link_dialog.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; /// Shows [url], which is already on the clipboard. diff --git a/lib/shared/widgets/dump_upload_dialog.dart b/lib/shared/widgets/dump_upload_dialog.dart index fa7cf4bca..105f85d27 100644 --- a/lib/shared/widgets/dump_upload_dialog.dart +++ b/lib/shared/widgets/dump_upload_dialog.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Returns whether sensitive personal values may be included, or null when the /// user cancels. A fresh dialog always starts private-by-default. diff --git a/lib/shared/widgets/eew_cancelled_notice.dart b/lib/shared/widgets/eew_cancelled_notice.dart index 86bd071c0..782d24040 100644 --- a/lib/shared/widgets/eew_cancelled_notice.dart +++ b/lib/shared/widgets/eew_cancelled_notice.dart @@ -12,7 +12,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The "已取消" pill beside a cancelled card's title. class EewCancelledTag extends StatelessWidget { diff --git a/lib/shared/widgets/eew_estimate_tile.dart b/lib/shared/widgets/eew_estimate_tile.dart index 051b74b82..642170569 100644 --- a/lib/shared/widgets/eew_estimate_tile.dart +++ b/lib/shared/widgets/eew_estimate_tile.dart @@ -9,7 +9,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/app/theme/app_theme.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class EewEstimateTile extends StatelessWidget { const EewEstimateTile({ diff --git a/lib/shared/widgets/eew_feed_down_notice.dart b/lib/shared/widgets/eew_feed_down_notice.dart index 86d29eb6b..6c8eb9498 100644 --- a/lib/shared/widgets/eew_feed_down_notice.dart +++ b/lib/shared/widgets/eew_feed_down_notice.dart @@ -16,7 +16,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/realtime/realtime_state.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class EewFeedDownNotice extends StatelessWidget { /// A self-contained pill — Home's banner slot and its alert section. diff --git a/lib/shared/widgets/empty_view.dart b/lib/shared/widgets/empty_view.dart index 80039619f..36a4a9659 100644 --- a/lib/shared/widgets/empty_view.dart +++ b/lib/shared/widgets/empty_view.dart @@ -1,5 +1,5 @@ import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The empty state of the async-state contract: a calm icon + message for a /// request that succeeded but returned nothing. Distinct from [ErrorView] — an diff --git a/lib/shared/widgets/error_view.dart b/lib/shared/widgets/error_view.dart index 7eb123cce..9033365b4 100644 --- a/lib/shared/widgets/error_view.dart +++ b/lib/shared/widgets/error_view.dart @@ -1,6 +1,6 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The error state of the async-state contract: an icon, a headline, the /// underlying reason, and an optional retry — so a failed request is always diff --git a/lib/shared/widgets/event_icon.dart b/lib/shared/widgets/event_icon.dart index c43dba366..7568c0bea 100644 --- a/lib/shared/widgets/event_icon.dart +++ b/lib/shared/widgets/event_icon.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/core/weather/weather_icons.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The icon for an event kind, keyed off `EventType.iconKey` so the domain /// enum stays Material-free. Falls back to a generic notification mark for an diff --git a/lib/shared/widgets/freshness_banner.dart b/lib/shared/widgets/freshness_banner.dart index 77e73a1a6..7ea73d5d4 100644 --- a/lib/shared/widgets/freshness_banner.dart +++ b/lib/shared/widgets/freshness_banner.dart @@ -7,7 +7,7 @@ import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/realtime/app_time.dart'; import 'package:dpip/core/realtime/realtime_state.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A thin banner flagging that the data below it is not current. /// diff --git a/lib/shared/widgets/frosted_surface.dart b/lib/shared/widgets/frosted_surface.dart index 973bfc282..e07dda18b 100644 --- a/lib/shared/widgets/frosted_surface.dart +++ b/lib/shared/widgets/frosted_surface.dart @@ -8,7 +8,7 @@ import 'dart:ui' show ImageFilter; import 'package:dpip/app/theme/app_radius.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Default blur for compact map chrome (legend chip, layer button, timeline). const double kMapFrostBlurSigma = 48; diff --git a/lib/shared/widgets/intensity_badge.dart b/lib/shared/widgets/intensity_badge.dart index f0deb8088..66e23a01b 100644 --- a/lib/shared/widgets/intensity_badge.dart +++ b/lib/shared/widgets/intensity_badge.dart @@ -1,5 +1,5 @@ import 'package:dpip/app/theme/app_radius.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A filled square badge showing a felt-intensity label (e.g. `5⁻`) over its /// palette [color] — the report list row and report detail header share this diff --git a/lib/shared/widgets/intensity_legend.dart b/lib/shared/widgets/intensity_legend.dart index c0a689347..fc6779fc9 100644 --- a/lib/shared/widgets/intensity_legend.dart +++ b/lib/shared/widgets/intensity_legend.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Which intensity scale the legend shows. enum IntensityLegendMode { eew, rts } diff --git a/lib/shared/widgets/intensity_ranking_card.dart b/lib/shared/widgets/intensity_ranking_card.dart index ca0678756..7989a0f5e 100644 --- a/lib/shared/widgets/intensity_ranking_card.dart +++ b/lib/shared/widgets/intensity_ranking_card.dart @@ -15,7 +15,7 @@ import 'package:dpip/shared/seismic/intensity.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One row: a place's display [name] and its felt intensity [level] (0–9). typedef IntensityRankingEntry = ({String name, int level}); diff --git a/lib/shared/widgets/language_picker.dart b/lib/shared/widgets/language_picker.dart index 878a44c83..0c9640785 100644 --- a/lib/shared/widgets/language_picker.dart +++ b/lib/shared/widgets/language_picker.dart @@ -6,7 +6,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/settings/language_options.dart'; import 'package:dpip/core/settings/locale_controller.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; class LanguagePicker extends StatelessWidget { diff --git a/lib/shared/widgets/loading_view.dart b/lib/shared/widgets/loading_view.dart index fcc259ff6..0be3ce9ab 100644 --- a/lib/shared/widgets/loading_view.dart +++ b/lib/shared/widgets/loading_view.dart @@ -1,6 +1,6 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A small inline spinner for list rows / cards — no label, sized for context. /// Use instead of a hand-rolled `SizedBox` + `CircularProgressIndicator` so diff --git a/lib/shared/widgets/map_chip_button.dart b/lib/shared/widgets/map_chip_button.dart index 507679ffa..a456985be 100644 --- a/lib/shared/widgets/map_chip_button.dart +++ b/lib/shared/widgets/map_chip_button.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Round frosted chip for opening an overlay menu — the same chrome the layer /// switcher uses — with a marker dot when the layer's options deviate from diff --git a/lib/shared/widgets/map_color_legend.dart b/lib/shared/widgets/map_color_legend.dart index c5fead3e6..0251aab8c 100644 --- a/lib/shared/widgets/map_color_legend.dart +++ b/lib/shared/widgets/map_color_legend.dart @@ -23,7 +23,7 @@ import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/frosted_surface.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One stop on a continuous colour ramp: [at] is the labelled value, [hex] an /// opaque `#RRGGBB` (same wire form the map layers feed MapLibre). diff --git a/lib/shared/widgets/map_menu_toggle_row.dart b/lib/shared/widgets/map_menu_toggle_row.dart index a93913e57..2294efd10 100644 --- a/lib/shared/widgets/map_menu_toggle_row.dart +++ b/lib/shared/widgets/map_menu_toggle_row.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One on/off overlay inside a [MapChipButton] dropdown: icon, title, optional /// hint, and a trailing checkbox. diff --git a/lib/shared/widgets/permission_checklist.dart b/lib/shared/widgets/permission_checklist.dart index c953bbcf1..ee56614dc 100644 --- a/lib/shared/widgets/permission_checklist.dart +++ b/lib/shared/widgets/permission_checklist.dart @@ -30,7 +30,7 @@ import 'package:dpip/core/platform/battery_optimization.dart'; import 'package:dpip/core/platform/unused_app_restrictions.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_settings_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; enum _PermissionItem { diff --git a/lib/shared/widgets/permission_settings_sheet.dart b/lib/shared/widgets/permission_settings_sheet.dart index f4a95c0e7..6cb5e71c5 100644 --- a/lib/shared/widgets/permission_settings_sheet.dart +++ b/lib/shared/widgets/permission_settings_sheet.dart @@ -16,7 +16,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/core/logging/log.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// One concise instruction shown before Android hands control to Settings. class PermissionSettingsGuide { diff --git a/lib/shared/widgets/realtime_view.dart b/lib/shared/widgets/realtime_view.dart index b835d74e9..058f6f5fd 100644 --- a/lib/shared/widgets/realtime_view.dart +++ b/lib/shared/widgets/realtime_view.dart @@ -4,7 +4,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Renders a [RealtimeState] to the async-state contract, adding the freshness /// dimension the one-shot [AsyncView] lacks: diff --git a/lib/shared/widgets/region_bar.dart b/lib/shared/widgets/region_bar.dart index 031b96d20..9d962f289 100644 --- a/lib/shared/widgets/region_bar.dart +++ b/lib/shared/widgets/region_bar.dart @@ -6,7 +6,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/area_page_sync.dart'; import 'package:dpip/shared/widgets/region_label.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// The area (地區) indicator at the top of Home and Events — a centered carousel diff --git a/lib/shared/widgets/region_pager.dart b/lib/shared/widgets/region_pager.dart index 5b8970114..034c7b7cc 100644 --- a/lib/shared/widgets/region_pager.dart +++ b/lib/shared/widgets/region_pager.dart @@ -1,6 +1,6 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/shared/widgets/area_page_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Pages a screen's body by area, so switching areas slides the *whole page* diff --git a/lib/shared/widgets/region_swipe_area.dart b/lib/shared/widgets/region_swipe_area.dart index 0e1208552..f86a72d08 100644 --- a/lib/shared/widgets/region_swipe_area.dart +++ b/lib/shared/widgets/region_swipe_area.dart @@ -1,5 +1,5 @@ import 'package:dpip/core/settings/region_store.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; /// Switches the active area ([RegionStore]) on a horizontal fling anywhere diff --git a/lib/shared/widgets/section_header.dart b/lib/shared/widgets/section_header.dart index b71c5a4fb..6e7dcd303 100644 --- a/lib/shared/widgets/section_header.dart +++ b/lib/shared/widgets/section_header.dart @@ -1,5 +1,5 @@ import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A settings / menu section header — a small primary-tinted label above a /// group of rows. Shared so every list groups its sections identically. diff --git a/lib/shared/widgets/selectable_pill.dart b/lib/shared/widgets/selectable_pill.dart index 0de704f4f..6897587fe 100644 --- a/lib/shared/widgets/selectable_pill.dart +++ b/lib/shared/widgets/selectable_pill.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A labelled pill that reads as pressed when [selected]. /// diff --git a/lib/shared/widgets/sheet_extent.dart b/lib/shared/widgets/sheet_extent.dart index 13c3de2b1..f1aa18064 100644 --- a/lib/shared/widgets/sheet_extent.dart +++ b/lib/shared/widgets/sheet_extent.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/shared/widgets/sheet_surface.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; /// Whether a sheet [extent] (0…1) counts as flush with the top — the grip diff --git a/lib/shared/widgets/sheet_surface.dart b/lib/shared/widgets/sheet_surface.dart index c23d419b8..6483cd1cb 100644 --- a/lib/shared/widgets/sheet_surface.dart +++ b/lib/shared/widgets/sheet_surface.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/app/theme/app_radius.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SheetSurface extends StatelessWidget { const SheetSurface({super.key, required this.child, this.flushTop = false}); diff --git a/mise.toml b/mise.toml index 9f395915d..be0703fd8 100644 --- a/mise.toml +++ b/mise.toml @@ -2,4 +2,4 @@ # Pin the numeric stable release only — the platform URLs already append # `-stable`. A bare `"3.44.8-stable"` makes mise request # `…_3.44.8-stable-stable.{tar.xz,zip}` and 404s on install (breaks CI). -flutter = { version = "3.47.8", platforms = { linux-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_{{ version }}-stable.tar.xz" }, macos-arm64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_{{ version }}-stable.zip" }, macos-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_{{ version }}-stable.zip" }, windows-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_{{ version }}-stable.zip" } }, version_expr = 'fromJSON(body).releases | filter({ #.channel == "stable" }) | map({ replace(#.version, "-stable", "") }) | sortVersions()', version_list_url = "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json" } +flutter = { version = "3.50.1", platforms = { linux-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_{{ version }}-stable.tar.xz" }, macos-arm64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_{{ version }}-stable.zip" }, macos-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_{{ version }}-stable.zip" }, windows-x64 = { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_{{ version }}-stable.zip" } }, version_expr = 'fromJSON(body).releases | filter({ #.channel == "stable" }) | map({ replace(#.version, "-stable", "") }) | sortVersions()', version_list_url = "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json" } diff --git a/pubspec.lock b/pubspec.lock index 78326b6ca..4b7fd17b7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" code_assets: dependency: transitive description: @@ -217,6 +217,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.9" + cupertino_ui: + dependency: "direct main" + description: + name: cupertino_ui + sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" + url: "https://pub.dev" + source: hosted + version: "1.1.6" dart_style: dependency: transitive description: @@ -733,6 +741,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.0" + listen: + dependency: transitive + description: + name: listen + sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logging: dependency: "direct main" description: @@ -792,6 +808,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e" + url: "https://pub.dev" + source: hosted + version: "1.11.0" meshtastic_flutter: dependency: "direct main" description: @@ -803,10 +827,10 @@ packages: dependency: transitive description: name: meta - sha256: c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d + sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9" url: "https://pub.dev" source: hosted - version: "1.18.3" + version: "1.19.0" mime: dependency: transitive description: @@ -1152,10 +1176,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.12.2" stream_channel: dependency: transitive description: @@ -1216,10 +1240,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" typed_data: dependency: transitive description: @@ -1304,10 +1328,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "1d774bbdf6b72a0b12122fc1560c9c2d2a67db5a4a4cc2bd8a5c990ab20e3188" + sha256: fa49e1674cb84acb900141714e6c6e1f9ae099827c24d141430ff6819db4e1bc url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.4" vm_service: dependency: transitive description: @@ -1382,4 +1406,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.13.0 <4.0.0" - flutter: ">=3.44.0" + flutter: ">=3.47.0" diff --git a/pubspec.yaml b/pubspec.yaml index 388a4b3f3..be7d0b42a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: # pre-rewrite app shipped this package; the rewrite dropped it. awesome_notifications_fcm: ^0.12.0 cupertino_icons: ^1.0.8 + cupertino_ui: ^1.1.0 # SHA-256 pins the downloaded ML intensity model to the exact file the # golden tests were recorded against (lib/features/earthquake/data/ # ml_intensity_service.dart). Already in the lock through the SDK tooling. @@ -75,6 +76,7 @@ dependencies: # Direct dep: MeshtasticClientImpl bridges the vendored package's # `package:logging` records into the app Log. logging: ^1.3.0 + material_ui: ^1.11.0 # ExpTech fork — HTTPS intercept + Dart tile-cache bridge + Android gzip fix # + render lifecycle, batched layer updates, and compact tile-cache messages. # Requires MapLibre Native 6.28.0, which the fork's Package.swift pins exactly. diff --git a/test/app/app_test.dart b/test/app/app_test.dart index d4b1fceb9..c211584d8 100644 --- a/test/app/app_test.dart +++ b/test/app/app_test.dart @@ -56,7 +56,7 @@ import 'package:dpip/core/storage/app_database.dart'; import 'package:dpip/features/onboarding/presentation/pages/onboarding_page.dart'; import 'package:dpip/features/map/map_providers.dart'; import 'package:dpip/shared/map/map_camera_handoff.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; // ignore: depend_on_referenced_packages diff --git a/test/app/router/app_router_test.dart b/test/app/router/app_router_test.dart index 7f62c93c6..b02d2e59c 100644 --- a/test/app/router/app_router_test.dart +++ b/test/app/router/app_router_test.dart @@ -2,6 +2,7 @@ /// redirect and each page builder; they do not start Firebase or a database. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dio/dio.dart'; import 'package:dpip/app/router/app_router.dart'; import 'package:dpip/app/router/notification_routes.dart'; @@ -80,7 +81,7 @@ import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/map/raster_frame_source.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; @@ -185,7 +186,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: appRouter, ), @@ -235,7 +236,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: appRouter, ), @@ -418,7 +419,7 @@ Widget _widgetRouterApp(SharedDeps deps, _WidgetWeather weather) => ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: appRouter, ), @@ -456,10 +457,12 @@ void _walk( for (final route in routes) { switch (route) { case GoRoute(): - final builder = route.builder; - if (builder != null) { - built.add(builder(context, state ?? _state(route.path))); - } + final routeState = state ?? _state(route.path); + expect(route.builder, isNull, reason: route.name); + final page = route.pageBuilder!(context, routeState); + expect(page, isA>(), reason: route.name); + expect(page.key, routeState.pageKey, reason: route.name); + built.add((page as MaterialPage).child); _walk(route.routes, context, built, state: state); case StatefulShellRoute(): for (final branch in route.branches) { diff --git a/test/app/router/route_params_test.dart b/test/app/router/route_params_test.dart index 33bde391f..01b2879ed 100644 --- a/test/app/router/route_params_test.dart +++ b/test/app/router/route_params_test.dart @@ -10,7 +10,7 @@ library; import 'package:dpip/app/router/route_params.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/app/router/shell_route_observer_test.dart b/test/app/router/shell_route_observer_test.dart index 126535ab3..9aa210e44 100644 --- a/test/app/router/shell_route_observer_test.dart +++ b/test/app/router/shell_route_observer_test.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/app/shell/main_shell_test.dart b/test/app/shell/main_shell_test.dart index 60ae423f8..7e53bd208 100644 --- a/test/app/shell/main_shell_test.dart +++ b/test/app/shell/main_shell_test.dart @@ -3,6 +3,8 @@ /// exercises that chrome without building each feature page. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/app/shell/main_shell.dart'; @@ -28,7 +30,7 @@ import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/map/map_immersive.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -116,7 +118,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), diff --git a/test/app/shell/replay_leave_test.dart b/test/app/shell/replay_leave_test.dart index 6bd74cce6..e11daca19 100644 --- a/test/app/shell/replay_leave_test.dart +++ b/test/app/shell/replay_leave_test.dart @@ -10,7 +10,7 @@ // frame — is what `MainShell._onDestinationSelected` uses, so any change to // go_router's branch behaviour that breaks it shows up here. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; diff --git a/test/app/theme/app_glass_test.dart b/test/app/theme/app_glass_test.dart index deadeb098..99ff3c793 100644 --- a/test/app/theme/app_glass_test.dart +++ b/test/app/theme/app_glass_test.dart @@ -1,6 +1,6 @@ import 'package:dpip/app/theme/app_glass.dart'; import 'package:dpip/core/settings/weather_mode.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/app/theme/app_gold_test.dart b/test/app/theme/app_gold_test.dart index 1f137ab3e..145fe6498 100644 --- a/test/app/theme/app_gold_test.dart +++ b/test/app/theme/app_gold_test.dart @@ -10,7 +10,7 @@ library; import 'dart:math' as math; import 'package:dpip/app/theme/app_gold.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// WCAG relative luminance. diff --git a/test/app/theme/app_theme_test.dart b/test/app/theme/app_theme_test.dart index 056db6ba6..d50c0a913 100644 --- a/test/app/theme/app_theme_test.dart +++ b/test/app/theme/app_theme_test.dart @@ -7,7 +7,7 @@ import 'package:dpip/app/theme/app_radius.dart'; import 'package:dpip/app/theme/app_theme.dart'; import 'package:dpip/core/build/demo_flags.dart'; import 'package:dpip/core/settings/display_settings.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/core/di/provider_graph_test.dart b/test/core/di/provider_graph_test.dart index 7be3371bc..baa3a2350 100644 --- a/test/core/di/provider_graph_test.dart +++ b/test/core/di/provider_graph_test.dart @@ -93,7 +93,7 @@ import 'package:dpip/features/weather/domain/satellite_repository.dart'; import 'package:dpip/features/weather/domain/wind_forecast_model.dart'; import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/features/weather/weather_providers.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/core/di/providers_test.dart b/test/core/di/providers_test.dart index e2a131cb3..4dae80ef1 100644 --- a/test/core/di/providers_test.dart +++ b/test/core/di/providers_test.dart @@ -6,6 +6,7 @@ /// for tiles. Building the lists with fakes is enough to see each one. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dio/dio.dart'; import 'package:dpip/core/astro/tle_store.dart'; import 'package:dpip/core/di/core_providers.dart'; @@ -62,7 +63,7 @@ import 'package:dpip/features/weather/domain/wind_forecast_model.dart'; import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/features/weather/weather_providers.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -157,7 +158,7 @@ void main() { providers: coreProviders(deps), child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const _ReadCore(), ), diff --git a/test/core/platform/screen_wake_test.dart b/test/core/platform/screen_wake_test.dart index 47d18086b..40a14e084 100644 --- a/test/core/platform/screen_wake_test.dart +++ b/test/core/platform/screen_wake_test.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/core/platform/screen_wake.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/core/settings/appearance_controllers_test.dart b/test/core/settings/appearance_controllers_test.dart index 38482ecf4..12bc0f4ec 100644 --- a/test/core/settings/appearance_controllers_test.dart +++ b/test/core/settings/appearance_controllers_test.dart @@ -5,7 +5,7 @@ import 'package:dpip/core/settings/default_map_layer_controller.dart'; import 'package:dpip/core/settings/setting_keys.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/core/settings/theme_controller.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/core/settings/display_settings_test.dart b/test/core/settings/display_settings_test.dart index 7a001e009..42da1efc7 100644 --- a/test/core/settings/display_settings_test.dart +++ b/test/core/settings/display_settings_test.dart @@ -8,7 +8,7 @@ library; import 'package:dpip/core/settings/display_settings.dart'; import 'package:dpip/core/settings/setting_keys.dart'; import 'package:dpip/core/settings/settings_store.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/core/settings/locale_config_test.dart b/test/core/settings/locale_config_test.dart index 6b7a5821d..93a6c9254 100644 --- a/test/core/settings/locale_config_test.dart +++ b/test/core/settings/locale_config_test.dart @@ -1,6 +1,9 @@ import 'package:dpip/core/settings/locale_config.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; +// Verify the compatibility bridge for dependencies using the legacy library. +// ignore: deprecated_member_use +import 'package:flutter/material.dart' as legacy; void main() { const supported = [ @@ -98,6 +101,48 @@ void main() { }, ); + testWidgets('Material menus resolve localized strings in every app locale', ( + tester, + ) async { + for (final locale in supported) { + await tester.pumpWidget( + MaterialApp( + locale: locale, + localizationsDelegates: appLocalizationsDelegates, + supportedLocales: supported, + builder: (context, child) { + // ignore: deprecated_member_use + return MaterialUiCompatibilityBridge(child: child!); + }, + home: Builder( + builder: (context) { + expect( + MaterialLocalizations.of(context).menuDismissLabel, + isNotEmpty, + ); + expect( + legacy.MaterialLocalizations.of(context).menuDismissLabel, + isNotEmpty, + ); + return Scaffold( + body: PopupMenuButton( + itemBuilder: (_) => [ + const PopupMenuItem(value: 1, child: Text('Item')), + ], + ), + ); + }, + ), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.byType(PopupMenuButton)); + await tester.pumpAndSettle(); + expect(find.text('Item'), findsOneWidget); + await tester.pumpWidget(const SizedBox.shrink()); + } + }); + testWidgets('app delegates serve Cantonese without crashing', (tester) async { // flutter_localizations ships no yue; the fallback delegates must serve // zh_TW widgets strings so a yue MaterialApp builds instead of asserting diff --git a/test/core/weather/weather_condition_test.dart b/test/core/weather/weather_condition_test.dart index 8f161c322..a05ac0cf6 100644 --- a/test/core/weather/weather_condition_test.dart +++ b/test/core/weather/weather_condition_test.dart @@ -2,7 +2,7 @@ import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/core/weather/weather_code.dart'; import 'package:dpip/core/weather/weather_condition.dart'; import 'package:dpip/core/weather/weather_icons.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/core/weather/weather_icons_test.dart b/test/core/weather/weather_icons_test.dart index 74ec749ad..4a8e5334c 100644 --- a/test/core/weather/weather_icons_test.dart +++ b/test/core/weather/weather_icons_test.dart @@ -21,7 +21,7 @@ import 'dart:ui' as ui; import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/core/weather/weather_condition.dart'; import 'package:dpip/core/weather/weather_icons.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show FontLoader, rootBundle; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/bug_tracker/presentation/pages/bug_list_page_test.dart b/test/features/bug_tracker/presentation/pages/bug_list_page_test.dart index e7ccf2cf6..9919705d1 100644 --- a/test/features/bug_tracker/presentation/pages/bug_list_page_test.dart +++ b/test/features/bug_tracker/presentation/pages/bug_list_page_test.dart @@ -8,6 +8,8 @@ /// thread must carry both. The assertions below make both observable. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/core/error/failure.dart'; @@ -20,7 +22,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/error_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -94,7 +96,7 @@ Future _pump(WidgetTester tester, _BugRepository repository) async { child: MaterialApp.router( routerConfig: router, locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/bug_tracker/presentation/pages/bug_thread_page_test.dart b/test/features/bug_tracker/presentation/pages/bug_thread_page_test.dart index a07a75ab8..0fa2a2020 100644 --- a/test/features/bug_tracker/presentation/pages/bug_thread_page_test.dart +++ b/test/features/bug_tracker/presentation/pages/bug_thread_page_test.dart @@ -3,6 +3,8 @@ /// fails silently would hide who answered and where the conversation lives. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/core/error/failure.dart'; @@ -12,7 +14,7 @@ import 'package:dpip/features/bug_tracker/domain/bug_thread.dart'; import 'package:dpip/features/bug_tracker/presentation/pages/bug_thread_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/error_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -78,7 +80,7 @@ Future _pump(WidgetTester tester, _Repo repo) async { value: repo, child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: BugThreadPage(id: 7, repository: repo), ), diff --git a/test/features/bug_tracker/presentation/widgets/bug_tag_badge_test.dart b/test/features/bug_tracker/presentation/widgets/bug_tag_badge_test.dart index d514a32fe..7962818f7 100644 --- a/test/features/bug_tracker/presentation/widgets/bug_tag_badge_test.dart +++ b/test/features/bug_tracker/presentation/widgets/bug_tag_badge_test.dart @@ -13,7 +13,7 @@ library; import 'package:dpip/features/bug_tracker/presentation/widgets/bug_tag_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp(home: Scaffold(body: child)); diff --git a/test/features/changelog/changelog_page_test.dart b/test/features/changelog/changelog_page_test.dart index 8b0a36847..8304526d1 100644 --- a/test/features/changelog/changelog_page_test.dart +++ b/test/features/changelog/changelog_page_test.dart @@ -6,6 +6,8 @@ /// front-end compiler. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/core/error/failure.dart'; @@ -15,7 +17,7 @@ import 'package:dpip/features/changelog/domain/changelog_repository.dart'; import 'package:dpip/features/changelog/domain/release_note.dart'; import 'package:dpip/features/changelog/presentation/pages/changelog_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher_platform_interface/link.dart'; @@ -51,7 +53,7 @@ class _PagedRepository implements ChangelogRepository { Widget _wrap(ChangelogRepository repo) => Provider.value( value: repo, child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: const ChangelogPage(), diff --git a/test/features/changelog/release_note_markdown_test.dart b/test/features/changelog/release_note_markdown_test.dart index a61653939..43de1b58c 100644 --- a/test/features/changelog/release_note_markdown_test.dart +++ b/test/features/changelog/release_note_markdown_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; diff --git a/test/features/changelog/update_prompt_test.dart b/test/features/changelog/update_prompt_test.dart index 6c8f70af4..bf8febb31 100644 --- a/test/features/changelog/update_prompt_test.dart +++ b/test/features/changelog/update_prompt_test.dart @@ -6,6 +6,8 @@ /// into a nag that returns on every launch. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/core/error/failure.dart'; @@ -19,7 +21,7 @@ import 'package:dpip/features/changelog/domain/release_note.dart'; import 'package:dpip/features/changelog/presentation/widgets/update_prompt.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -89,7 +91,7 @@ Future _pump( ), ], child: MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: GoRouter( routes: [ diff --git a/test/features/changelog/version_notes_page_test.dart b/test/features/changelog/version_notes_page_test.dart index 9f8570cb6..c6bd41127 100644 --- a/test/features/changelog/version_notes_page_test.dart +++ b/test/features/changelog/version_notes_page_test.dart @@ -3,6 +3,8 @@ /// label, or the wrong note, is how a tester reports the wrong build. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/core/error/failure.dart'; @@ -13,7 +15,7 @@ import 'package:dpip/features/changelog/domain/release_note.dart'; import 'package:dpip/features/changelog/presentation/pages/version_notes_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -60,7 +62,7 @@ Future _pump(WidgetTester tester, ChangelogRepository repo) async { value: repo, child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/data/data_page_test.dart b/test/features/data/data_page_test.dart index 4d3d7872d..bda442f82 100644 --- a/test/features/data/data_page_test.dart +++ b/test/features/data/data_page_test.dart @@ -7,10 +7,11 @@ /// entry that fails to land fails here instead of on a phone. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/data/presentation/pages/data_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; @@ -76,7 +77,7 @@ Future _pump(WidgetTester tester, GoRouter router) async { addTearDown(tester.view.reset); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -109,7 +110,7 @@ void main() { addTearDown(tester.view.reset); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: _router([]), ), @@ -144,7 +145,7 @@ void main() { addTearDown(tester.view.reset); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: _router([]), ), diff --git a/test/features/data/moon_page_test.dart b/test/features/data/moon_page_test.dart index c0c7ca21b..3c49be72a 100644 --- a/test/features/data/moon_page_test.dart +++ b/test/features/data/moon_page_test.dart @@ -7,6 +7,7 @@ /// the one it actually computed for. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/moon_phase.dart'; import 'package:dpip/core/astro/moon_rise_set.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -18,7 +19,7 @@ import 'package:dpip/features/data/presentation/widgets/moon_calendar.dart'; import 'package:dpip/features/data/presentation/widgets/moon_glyph.dart'; import 'package:dpip/shared/map/map_timeline.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; @@ -60,8 +61,8 @@ Future _pumpPage(WidgetTester tester, RegionStore regions) async { Provider.value(value: _directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: MoonPage(), ), @@ -287,8 +288,8 @@ void main() { Provider.value(value: directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: MoonPage(), diff --git a/test/features/data/presentation/observer_place_test.dart b/test/features/data/presentation/observer_place_test.dart index 3b53567b8..1268aebcd 100644 --- a/test/features/data/presentation/observer_place_test.dart +++ b/test/features/data/presentation/observer_place_test.dart @@ -8,7 +8,7 @@ import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/observer_place.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/features/data/presentation/pages/almanac_page_test.dart b/test/features/data/presentation/pages/almanac_page_test.dart index eef0d7395..ffc7280c3 100644 --- a/test/features/data/presentation/pages/almanac_page_test.dart +++ b/test/features/data/presentation/pages/almanac_page_test.dart @@ -10,6 +10,7 @@ /// values that a future calendar would legitimately change. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/lunisolar_calendar.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -17,7 +18,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/almanac_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -61,8 +62,8 @@ Future _pump( Provider.value(value: directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: AlmanacPage(), ), diff --git a/test/features/data/presentation/pages/planets_page_test.dart b/test/features/data/presentation/pages/planets_page_test.dart index 2d52818ea..2d8ff87a4 100644 --- a/test/features/data/presentation/pages/planets_page_test.dart +++ b/test/features/data/presentation/pages/planets_page_test.dart @@ -10,6 +10,7 @@ /// reading rather than print one for a coordinate nobody named. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/planet_ephemeris.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -17,7 +18,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/planets_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -53,8 +54,8 @@ Future _pump( Provider.value(value: directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: PlanetsPage(), ), diff --git a/test/features/data/presentation/pages/sky_chart_page_test.dart b/test/features/data/presentation/pages/sky_chart_page_test.dart index 4afb71c96..6f04234e5 100644 --- a/test/features/data/presentation/pages/sky_chart_page_test.dart +++ b/test/features/data/presentation/pages/sky_chart_page_test.dart @@ -8,6 +8,7 @@ /// only drawn once it has a place to be drawn for. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/star_catalog.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -15,7 +16,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/sky_chart_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -51,8 +52,8 @@ Future _pump( Provider.value(value: directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: SkyChartPage(), ), diff --git a/test/features/data/presentation/pages/sun_page_test.dart b/test/features/data/presentation/pages/sun_page_test.dart index 9fc50991e..0d83fd965 100644 --- a/test/features/data/presentation/pages/sun_page_test.dart +++ b/test/features/data/presentation/pages/sun_page_test.dart @@ -9,6 +9,7 @@ /// would still render. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/solar_terms.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -16,7 +17,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/sun_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -60,8 +61,8 @@ Future _pump( Provider.value(value: directory), ChangeNotifierProvider.value(value: regions), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: SunPage(), ), diff --git a/test/features/data/presentation/pages/tide_page_test.dart b/test/features/data/presentation/pages/tide_page_test.dart index a0c955bd3..c5673ceff 100644 --- a/test/features/data/presentation/pages/tide_page_test.dart +++ b/test/features/data/presentation/pages/tide_page_test.dart @@ -3,13 +3,14 @@ /// place and both a high and a low turning point. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/tide_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -26,7 +27,7 @@ Future _pump(WidgetTester tester, TownDirectory directory) async { ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const TidePage(), ), diff --git a/test/features/data/presentation/pages/tonight_page_test.dart b/test/features/data/presentation/pages/tonight_page_test.dart index a40996071..4d58323af 100644 --- a/test/features/data/presentation/pages/tonight_page_test.dart +++ b/test/features/data/presentation/pages/tonight_page_test.dart @@ -10,6 +10,7 @@ /// statement about a location, and the page has to say which. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/astro/deep_sky.dart'; import 'package:dpip/core/astro/meteor_showers.dart'; import 'package:dpip/core/astro/tle_store.dart'; @@ -20,7 +21,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/data/presentation/pages/tonight_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -88,8 +89,8 @@ Future _pump( // element set is a complete answer on its own. Provider.value(value: const TleStore(null)), ], - child: const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: TonightPage(), ), diff --git a/test/features/data/presentation/widgets/astro_card_test.dart b/test/features/data/presentation/widgets/astro_card_test.dart index 4194b7588..9f6192cc6 100644 --- a/test/features/data/presentation/widgets/astro_card_test.dart +++ b/test/features/data/presentation/widgets/astro_card_test.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/features/data/presentation/widgets/astro_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp(home: Scaffold(body: child)); diff --git a/test/features/data/presentation/widgets/moon_calendar_test.dart b/test/features/data/presentation/widgets/moon_calendar_test.dart index 6aaf1f82f..32fad10a6 100644 --- a/test/features/data/presentation/widgets/moon_calendar_test.dart +++ b/test/features/data/presentation/widgets/moon_calendar_test.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/features/data/presentation/widgets/moon_calendar.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/data/presentation/widgets/moon_glyph_test.dart b/test/features/data/presentation/widgets/moon_glyph_test.dart index 7bea20aba..9f835d7b0 100644 --- a/test/features/data/presentation/widgets/moon_glyph_test.dart +++ b/test/features/data/presentation/widgets/moon_glyph_test.dart @@ -6,7 +6,7 @@ library; import 'dart:math' as math; import 'package:dpip/features/data/presentation/widgets/moon_glyph.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/earthquake/presentation/pages/earthquake_page_test.dart b/test/features/earthquake/presentation/pages/earthquake_page_test.dart index 0884b8475..e8ca8e409 100644 --- a/test/features/earthquake/presentation/pages/earthquake_page_test.dart +++ b/test/features/earthquake/presentation/pages/earthquake_page_test.dart @@ -3,6 +3,7 @@ /// on the empty state during an alert is the one screen that must not. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; @@ -22,7 +23,7 @@ import 'package:dpip/features/earthquake/presentation/eew_realtime_controller.da import 'package:dpip/features/earthquake/presentation/pages/earthquake_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:flutter/foundation.dart' show listEquals; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -140,7 +141,7 @@ Future _pump(WidgetTester tester, List alerts) async { ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const EarthquakePage(), ), diff --git a/test/features/earthquake/presentation/pages/report_detail_page_test.dart b/test/features/earthquake/presentation/pages/report_detail_page_test.dart index d7448210f..f38c55505 100644 --- a/test/features/earthquake/presentation/pages/report_detail_page_test.dart +++ b/test/features/earthquake/presentation/pages/report_detail_page_test.dart @@ -8,6 +8,8 @@ /// states a reader actually hits. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'dart:convert'; @@ -38,7 +40,7 @@ import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -378,7 +380,7 @@ void main() { child: MaterialApp.router( theme: theme, locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -392,7 +394,7 @@ void main() { GoRoute( path: '/earthquake', name: AppRoutes.earthquake, - builder: (_, _) => const Text('catalogue'), + builder: (_, _) => const Scaffold(body: Text('catalogue')), routes: [ GoRoute( path: ':id', @@ -577,7 +579,7 @@ void main() { GoRoute( path: '/earthquake', name: AppRoutes.earthquake, - builder: (_, _) => const Text('catalogue-root'), + builder: (_, _) => const Scaffold(body: Text('catalogue-root')), ), ], ); diff --git a/test/features/earthquake/presentation/pages/report_list_page_test.dart b/test/features/earthquake/presentation/pages/report_list_page_test.dart index 74d8da473..5f340cab8 100644 --- a/test/features/earthquake/presentation/pages/report_list_page_test.dart +++ b/test/features/earthquake/presentation/pages/report_list_page_test.dart @@ -9,6 +9,8 @@ /// `Asia/Taipei` and a report filed at 23:00 local belongs to that day. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -29,7 +31,7 @@ import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -141,7 +143,7 @@ Future _pump( providers: [Provider.value(value: repository)], child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), ), diff --git a/test/features/earthquake/presentation/pages/report_replay_page_test.dart b/test/features/earthquake/presentation/pages/report_replay_page_test.dart index c64d718bd..78e3d4b30 100644 --- a/test/features/earthquake/presentation/pages/report_replay_page_test.dart +++ b/test/features/earthquake/presentation/pages/report_replay_page_test.dart @@ -8,6 +8,8 @@ /// is decided here, not in the archive clients. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dio/dio.dart'; @@ -47,7 +49,7 @@ import 'package:dpip/shared/seismic/intensity_icon_renderer.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -516,7 +518,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -730,7 +732,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -830,7 +832,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -913,7 +915,7 @@ void main() { ], child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), diff --git a/test/features/earthquake/presentation/widgets/eew_card_test.dart b/test/features/earthquake/presentation/widgets/eew_card_test.dart index da5feaf3d..191e94959 100644 --- a/test/features/earthquake/presentation/widgets/eew_card_test.dart +++ b/test/features/earthquake/presentation/widgets/eew_card_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; import 'package:dpip/core/geo/town.dart'; @@ -14,7 +15,7 @@ import 'package:dpip/shared/widgets/eew_estimate_tile.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; import 'package:dpip/core/models/lat_lng.dart'; import 'package:dpip/features/earthquake/domain/eew_local_estimate.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -102,7 +103,7 @@ Future _store({int select = 2}) async { Widget _wrap(RegionStore store, {Eew? eew, DateTime Function()? clock}) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: MultiProvider( diff --git a/test/features/earthquake/presentation/widgets/intensity_legend_chip_test.dart b/test/features/earthquake/presentation/widgets/intensity_legend_chip_test.dart index 71856e7f1..061b47858 100644 --- a/test/features/earthquake/presentation/widgets/intensity_legend_chip_test.dart +++ b/test/features/earthquake/presentation/widgets/intensity_legend_chip_test.dart @@ -10,11 +10,12 @@ /// have the legend open. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/collapsible_map_legend.dart'; import 'package:dpip/shared/widgets/intensity_legend.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Mirrors the replay page's own subtree: a top-left overlay whose @@ -23,7 +24,7 @@ import 'package:flutter_test/flutter_test.dart'; Future _pumpLegend(WidgetTester tester, ValueNotifier hasEew) { return tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh'), home: Scaffold( diff --git a/test/features/earthquake/presentation/widgets/report_filter_sheet_test.dart b/test/features/earthquake/presentation/widgets/report_filter_sheet_test.dart index 199e9e900..700eee258 100644 --- a/test/features/earthquake/presentation/widgets/report_filter_sheet_test.dart +++ b/test/features/earthquake/presentation/widgets/report_filter_sheet_test.dart @@ -11,10 +11,11 @@ /// entry for an identical request. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/earthquake/domain/report_list_query.dart'; import 'package:dpip/features/earthquake/presentation/widgets/report_filter_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -51,7 +52,7 @@ Future _open( await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/earthquake/report_day_header_test.dart b/test/features/earthquake/report_day_header_test.dart index 85b763661..cdbce47db 100644 --- a/test/features/earthquake/report_day_header_test.dart +++ b/test/features/earthquake/report_day_header_test.dart @@ -11,10 +11,11 @@ /// assertions below. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/app/theme/app_spacing.dart'; import 'package:dpip/features/earthquake/presentation/pages/report_list_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:intl/date_symbol_data_local.dart'; @@ -29,7 +30,7 @@ Future _l10n(Locale locale) => /// reference the screen size cannot move. Widget _wrap(Widget child, {required Locale locale, required double width}) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: locale, home: Scaffold( diff --git a/test/features/events/events_page_test.dart b/test/features/events/events_page_test.dart index 00f4be143..e490d67f0 100644 --- a/test/features/events/events_page_test.dart +++ b/test/features/events/events_page_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -8,7 +9,7 @@ import 'package:dpip/features/events/domain/event_repository.dart'; import 'package:dpip/features/events/presentation/pages/events_page.dart'; import 'package:dpip/features/events/presentation/widgets/event_timeline.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -32,7 +33,7 @@ class _RecordingEventRepository implements EventRepository { Widget _wrap(RegionStore store, EventRepository events) { const directory = TownDirectory({}); return MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: MultiProvider( diff --git a/test/features/events/presentation/widgets/event_timeline_test.dart b/test/features/events/presentation/widgets/event_timeline_test.dart index a163fcb81..b39fb56e9 100644 --- a/test/features/events/presentation/widgets/event_timeline_test.dart +++ b/test/features/events/presentation/widgets/event_timeline_test.dart @@ -4,13 +4,14 @@ /// endless. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/events/domain/event.dart'; import 'package:dpip/features/events/domain/event_repository.dart'; import 'package:dpip/features/events/presentation/widgets/event_timeline.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -43,7 +44,7 @@ Future _pump(WidgetTester tester, EventRepository repo) async { Provider.value( value: repo, child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const Scaffold(body: EventTimeline(regionCode: '63000')), ), diff --git a/test/features/home/home_providers_test.dart b/test/features/home/home_providers_test.dart index 8a7d50c5c..f2f090346 100644 --- a/test/features/home/home_providers_test.dart +++ b/test/features/home/home_providers_test.dart @@ -29,7 +29,7 @@ import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/map/map_station_handoff.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/features/home/presentation/pages/home_page_test.dart b/test/features/home/presentation/pages/home_page_test.dart index 23ba63bed..1bc3fccf1 100644 --- a/test/features/home/presentation/pages/home_page_test.dart +++ b/test/features/home/presentation/pages/home_page_test.dart @@ -3,6 +3,7 @@ /// that never settles. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; @@ -45,7 +46,7 @@ import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/navigation/widget_location_link.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -304,7 +305,7 @@ void main() { ), child: MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), @@ -508,7 +509,7 @@ class _WidgetHomeHarness { providers: providers, child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: showHome ? HomePage(widgetLocationRequests: requests) diff --git a/test/features/home/presentation/widgets/home_active_events_section_test.dart b/test/features/home/presentation/widgets/home_active_events_section_test.dart index 65fac556c..8575f7430 100644 --- a/test/features/home/presentation/widgets/home_active_events_section_test.dart +++ b/test/features/home/presentation/widgets/home_active_events_section_test.dart @@ -3,6 +3,7 @@ /// again, would hide a live warning or leave the sheet stuck on the empty line. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/settings/region_store.dart'; @@ -13,7 +14,7 @@ import 'package:dpip/features/events/domain/event_repository.dart'; import 'package:dpip/features/home/presentation/home_active_events_controller.dart'; import 'package:dpip/features/home/presentation/widgets/home_active_events_section.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -61,7 +62,7 @@ Future _pump( ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: HomeActiveEventsSection( diff --git a/test/features/home/presentation/widgets/home_content_test.dart b/test/features/home/presentation/widgets/home_content_test.dart index bf279ed87..7fa956b86 100644 --- a/test/features/home/presentation/widgets/home_content_test.dart +++ b/test/features/home/presentation/widgets/home_content_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; @@ -33,7 +34,7 @@ import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:flutter/foundation.dart' show listEquals; import 'package:dpip/core/weather/weather_icons.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -164,7 +165,7 @@ Widget _wrap( }) { final events = _FakeEventRepository(); return MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: MultiProvider( diff --git a/test/features/home/presentation/widgets/home_eew_section_test.dart b/test/features/home/presentation/widgets/home_eew_section_test.dart index 0004cffa5..feafb4ebd 100644 --- a/test/features/home/presentation/widgets/home_eew_section_test.dart +++ b/test/features/home/presentation/widgets/home_eew_section_test.dart @@ -1,3 +1,5 @@ +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -24,7 +26,7 @@ import 'package:dpip/features/home/presentation/widgets/home_eew_section.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; import 'package:flutter/foundation.dart' show listEquals; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -112,7 +114,7 @@ _liveNotifier(List data) async { Widget _wrap(RealtimeNotifier> notifier, RegionStore store) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), theme: ThemeData(brightness: Brightness.light), @@ -248,7 +250,7 @@ void main() { final store = await _store(); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: _providers( @@ -303,7 +305,7 @@ void main() { await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), routerConfig: router, @@ -345,7 +347,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: _providers( @@ -410,7 +412,7 @@ void main() { }); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: _providers( @@ -483,7 +485,7 @@ void main() { final fix = Completer(); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: _providers( diff --git a/test/features/home/presentation/widgets/home_forecast_section_test.dart b/test/features/home/presentation/widgets/home_forecast_section_test.dart index f9f34c7d1..7d8ce98f8 100644 --- a/test/features/home/presentation/widgets/home_forecast_section_test.dart +++ b/test/features/home/presentation/widgets/home_forecast_section_test.dart @@ -4,6 +4,7 @@ /// shows it, or an expanded one that hides it, lies about the hour. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -20,7 +21,7 @@ import 'package:dpip/features/weather/domain/weather_snapshot.dart'; import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/features/weather/domain/weather_trend.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -109,7 +110,7 @@ Future _pump( ChangeNotifierProvider.value(value: controller), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: HomeForecastSection(expansion: expansion)), ), @@ -195,7 +196,7 @@ void main() { ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const Scaffold(body: HomeForecastSection(expansion: 1)), ), diff --git a/test/features/home/presentation/widgets/home_hero_preview_test.dart b/test/features/home/presentation/widgets/home_hero_preview_test.dart index df9775ab3..b39b7cd64 100644 --- a/test/features/home/presentation/widgets/home_hero_preview_test.dart +++ b/test/features/home/presentation/widgets/home_hero_preview_test.dart @@ -1,6 +1,8 @@ @Tags(['preview']) library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:io'; import 'dart:ui' as ui; @@ -20,7 +22,7 @@ import 'package:dpip/features/weather/domain/rain_hour_trend_repository.dart'; import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -134,7 +136,7 @@ void main() { final key = GlobalKey(); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), home: MultiProvider( diff --git a/test/features/home/presentation/widgets/home_map_backdrop_widget_test.dart b/test/features/home/presentation/widgets/home_map_backdrop_widget_test.dart index 9992e4827..a12dcd4df 100644 --- a/test/features/home/presentation/widgets/home_map_backdrop_widget_test.dart +++ b/test/features/home/presentation/widgets/home_map_backdrop_widget_test.dart @@ -21,7 +21,7 @@ import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:dpip/shared/map/raster_frame_source.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; diff --git a/test/features/home/presentation/widgets/home_monitor_banner_test.dart b/test/features/home/presentation/widgets/home_monitor_banner_test.dart index eeb6fcbda..e5b613db1 100644 --- a/test/features/home/presentation/widgets/home_monitor_banner_test.dart +++ b/test/features/home/presentation/widgets/home_monitor_banner_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/realtime/clock.dart'; import 'package:dpip/core/realtime/elapsed.dart'; @@ -15,7 +16,7 @@ import 'package:dpip/features/home/presentation/widgets/home_monitor_banner.dart import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_camera_handoff.dart'; import 'package:flutter/foundation.dart' show listEquals; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -115,7 +116,7 @@ Widget _wrap(RealtimeNotifier> notifier, MapCameraHandoff handoff) => Provider.value(value: const TownDirectory({})), ], child: MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), routerConfig: _router(const Scaffold(body: HomeMonitorBanner())), diff --git a/test/features/home/presentation/widgets/home_rain_trend_section_test.dart b/test/features/home/presentation/widgets/home_rain_trend_section_test.dart index ec4f16781..4193da9e8 100644 --- a/test/features/home/presentation/widgets/home_rain_trend_section_test.dart +++ b/test/features/home/presentation/widgets/home_rain_trend_section_test.dart @@ -3,6 +3,7 @@ /// retry, would either invent rain or leave the sheet stuck on a grey pane. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/town.dart'; @@ -18,7 +19,7 @@ import 'package:dpip/features/weather/domain/rain_hour_trend_repository.dart'; import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -93,7 +94,7 @@ Future _pump( ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: HomeRainTrendSection( diff --git a/test/features/home/presentation/widgets/home_sheet_header_silhouette_test.dart b/test/features/home/presentation/widgets/home_sheet_header_silhouette_test.dart index 25432892a..12569e566 100644 --- a/test/features/home/presentation/widgets/home_sheet_header_silhouette_test.dart +++ b/test/features/home/presentation/widgets/home_sheet_header_silhouette_test.dart @@ -19,6 +19,8 @@ @Tags(['preview']) library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:ui' as ui; import 'package:dpip/core/geo/town.dart'; @@ -36,7 +38,7 @@ import 'package:dpip/features/weather/domain/rain_hour_trend_repository.dart'; import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -104,7 +106,7 @@ void main() { final key = GlobalKey(); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), home: MultiProvider( diff --git a/test/features/home/presentation/widgets/home_sheet_header_test.dart b/test/features/home/presentation/widgets/home_sheet_header_test.dart index 7b197c682..bcfc99a83 100644 --- a/test/features/home/presentation/widgets/home_sheet_header_test.dart +++ b/test/features/home/presentation/widgets/home_sheet_header_test.dart @@ -4,6 +4,8 @@ /// the new fetch runs — this is what must never appear as the new area's. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/result.dart'; @@ -20,7 +22,7 @@ import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_station_handoff.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -163,7 +165,7 @@ Widget _wrap( ], ); return MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, diff --git a/test/features/home/presentation/widgets/home_sheet_test.dart b/test/features/home/presentation/widgets/home_sheet_test.dart index c60669aca..5cf787675 100644 --- a/test/features/home/presentation/widgets/home_sheet_test.dart +++ b/test/features/home/presentation/widgets/home_sheet_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -28,7 +29,7 @@ import 'package:dpip/features/weather/domain/weather_forecast.dart'; import 'package:dpip/features/weather/domain/weather_realtime.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:flutter/foundation.dart' show listEquals; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -105,7 +106,7 @@ Widget _wrap(RegionStore store, HomeSheetExtent extent) { const directory = TownDirectory({}); final events = _FakeEventRepository(); return MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: MultiProvider( diff --git a/test/features/home/presentation/widgets/weather_sky/card_water_worlds_test.dart b/test/features/home/presentation/widgets/weather_sky/card_water_worlds_test.dart index 5c2de5cb9..091087ca2 100644 --- a/test/features/home/presentation/widgets/weather_sky/card_water_worlds_test.dart +++ b/test/features/home/presentation/widgets/weather_sky/card_water_worlds_test.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/card_water_field.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/home/presentation/widgets/weather_sky/rain_on_card_test.dart b/test/features/home/presentation/widgets/weather_sky/rain_on_card_test.dart index 474cd8900..b27902ebb 100644 --- a/test/features/home/presentation/widgets/weather_sky/rain_on_card_test.dart +++ b/test/features/home/presentation/widgets/weather_sky/rain_on_card_test.dart @@ -12,7 +12,7 @@ import 'package:dpip/core/realtime/server_clock.dart'; import 'package:dpip/core/realtime/server_time_source.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_card.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_raster.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/home/presentation/widgets/weather_sky/sky_deck_test.dart b/test/features/home/presentation/widgets/weather_sky/sky_deck_test.dart index 3d188e57b..1900af70d 100644 --- a/test/features/home/presentation/widgets/weather_sky/sky_deck_test.dart +++ b/test/features/home/presentation/widgets/weather_sky/sky_deck_test.dart @@ -12,7 +12,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe_data.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/home/presentation/widgets/weather_sky/weather_sky_painter_test.dart b/test/features/home/presentation/widgets/weather_sky/weather_sky_painter_test.dart index 73f943f74..c643ed422 100644 --- a/test/features/home/presentation/widgets/weather_sky/weather_sky_painter_test.dart +++ b/test/features/home/presentation/widgets/weather_sky/weather_sky_painter_test.dart @@ -10,7 +10,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_clouds.d import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/home/weather_sky/card_water_pipeline_test.dart b/test/features/home/weather_sky/card_water_pipeline_test.dart index a2c695bab..4457566fb 100644 --- a/test/features/home/weather_sky/card_water_pipeline_test.dart +++ b/test/features/home/weather_sky/card_water_pipeline_test.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/card_water_field.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/home/weather_sky/precipitation_field_test.dart b/test/features/home/weather_sky/precipitation_field_test.dart index 32b732fdb..e0a901c9e 100644 --- a/test/features/home/weather_sky/precipitation_field_test.dart +++ b/test/features/home/weather_sky/precipitation_field_test.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/precipitation_field.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// The particle field reproduces the reference's emitter and compute shader, so the diff --git a/test/features/home/weather_sky/rain_on_card_pace_test.dart b/test/features/home/weather_sky/rain_on_card_pace_test.dart index 1e8e073f6..1b6a535a6 100644 --- a/test/features/home/weather_sky/rain_on_card_pace_test.dart +++ b/test/features/home/weather_sky/rain_on_card_pace_test.dart @@ -11,7 +11,7 @@ import 'package:dpip/core/realtime/server_clock.dart'; import 'package:dpip/core/realtime/server_time_source.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_card.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_frame_pace.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/home/weather_sky/rain_on_glass_field_test.dart b/test/features/home/weather_sky/rain_on_glass_field_test.dart index 1645f1bef..75e8288fc 100644 --- a/test/features/home/weather_sky/rain_on_glass_field_test.dart +++ b/test/features/home/weather_sky/rain_on_glass_field_test.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_glass.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/home/weather_sky/rain_on_glass_test.dart b/test/features/home/weather_sky/rain_on_glass_test.dart index f6906a10d..b6e0e9772 100644 --- a/test/features/home/weather_sky/rain_on_glass_test.dart +++ b/test/features/home/weather_sky/rain_on_glass_test.dart @@ -2,10 +2,10 @@ import 'dart:ui' show ImageFilter; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_glass.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_frame_pace.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; /// `RainOnGlass` wraps the home sheet's own content, which is the surface the /// user drags to collapse the sheet. A decorative filter must never eat that diff --git a/test/features/home/weather_sky/sky_frame_pace_test.dart b/test/features/home/weather_sky/sky_frame_pace_test.dart index 0297d9d84..f35f46de5 100644 --- a/test/features/home/weather_sky/sky_frame_pace_test.dart +++ b/test/features/home/weather_sky/sky_frame_pace_test.dart @@ -2,7 +2,7 @@ import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_frame_pace.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_background.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_painter.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/home/weather_sky/weather_sky_background_test.dart b/test/features/home/weather_sky/weather_sky_background_test.dart index c31d3ea55..8eed7b984 100644 --- a/test/features/home/weather_sky/weather_sky_background_test.dart +++ b/test/features/home/weather_sky/weather_sky_background_test.dart @@ -2,9 +2,9 @@ import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_deck.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_frame_pace.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/weather_sky_background.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; /// The animated sky must not repaint when it is stopped: the scroll-blur /// subtree above it rebuilds on every scroll tick while the sky is frozen diff --git a/test/features/location/presentation/pages/region_city_page_test.dart b/test/features/location/presentation/pages/region_city_page_test.dart index c6bb837d1..82ea1a082 100644 --- a/test/features/location/presentation/pages/region_city_page_test.dart +++ b/test/features/location/presentation/pages/region_city_page_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/settings_store.dart'; @@ -5,7 +6,7 @@ import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/features/location/presentation/pages/region_city_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -43,7 +44,7 @@ Widget _wrap(RegionStore store) { ], ); return MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, @@ -160,7 +161,7 @@ void main() { addTearDown(router.dispose); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, @@ -201,7 +202,7 @@ void main() { addTearDown(router.dispose); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, @@ -241,7 +242,7 @@ void main() { addTearDown(router.dispose); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, diff --git a/test/features/location/presentation/pages/region_manage_page_test.dart b/test/features/location/presentation/pages/region_manage_page_test.dart index 8d7392818..3889e66a3 100644 --- a/test/features/location/presentation/pages/region_manage_page_test.dart +++ b/test/features/location/presentation/pages/region_manage_page_test.dart @@ -3,6 +3,7 @@ /// saved list or make a removal look like it failed. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/region_store.dart'; @@ -10,7 +11,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/location/presentation/pages/region_manage_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -60,7 +61,7 @@ Future _pump( ], child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/location/presentation/pages/region_select_page_test.dart b/test/features/location/presentation/pages/region_select_page_test.dart index 8bd3978f4..7007d0be1 100644 --- a/test/features/location/presentation/pages/region_select_page_test.dart +++ b/test/features/location/presentation/pages/region_select_page_test.dart @@ -12,6 +12,7 @@ /// and both paths must forward identically onto the next push. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/region_store.dart'; @@ -19,7 +20,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/location/presentation/pages/region_select_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -83,7 +84,7 @@ Widget _wrap( ], ); return MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, @@ -267,7 +268,7 @@ void main() { ); await tester.pumpWidget( MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), routerConfig: router, diff --git a/test/features/log/log_page_test.dart b/test/features/log/log_page_test.dart index ceea9cb31..295d75ac7 100644 --- a/test/features/log/log_page_test.dart +++ b/test/features/log/log_page_test.dart @@ -1,7 +1,8 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/logging/log.dart'; import 'package:dpip/features/log/presentation/pages/log_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:talker_flutter/talker_flutter.dart'; @@ -27,7 +28,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const LogPage(), ), diff --git a/test/features/map/basemap_overlay_sync_test.dart b/test/features/map/basemap_overlay_sync_test.dart index c4e1cd117..5e74b1d71 100644 --- a/test/features/map/basemap_overlay_sync_test.dart +++ b/test/features/map/basemap_overlay_sync_test.dart @@ -2,7 +2,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/shared/map/basemap_overlay_sync.dart'; import 'package:dpip/shared/map/map_gsi_overlay.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart' show Brightness; +import 'package:material_ui/material_ui.dart' show Brightness; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; diff --git a/test/features/map/presentation/layers/disaster_map_layer_render_test.dart b/test/features/map/presentation/layers/disaster_map_layer_render_test.dart index 6bafc831d..9ff856925 100644 --- a/test/features/map/presentation/layers/disaster_map_layer_render_test.dart +++ b/test/features/map/presentation/layers/disaster_map_layer_render_test.dart @@ -3,6 +3,8 @@ /// not offer the restroom kinds, leaves the toggles unlabeled. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:math' show Point; import 'package:dpip/core/error/result.dart'; @@ -13,7 +15,7 @@ import 'package:dpip/features/disaster_map/domain/shelter_detail.dart'; import 'package:dpip/features/map/presentation/layers/disaster_map_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart' show dpmAedPointsLayerId; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -67,7 +69,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder( diff --git a/test/features/map/presentation/layers/humidity_layer_test.dart b/test/features/map/presentation/layers/humidity_layer_test.dart index 17244cc47..e39720202 100644 --- a/test/features/map/presentation/layers/humidity_layer_test.dart +++ b/test/features/map/presentation/layers/humidity_layer_test.dart @@ -10,11 +10,12 @@ /// all, so there is nothing of its own to pin there. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/humidity_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -36,8 +37,8 @@ void main() { testWidgets('label reads the localized humidity string', (tester) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -172,7 +173,7 @@ void main() { // so it needs a real delegate even though this card shows no localized text. await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/lightning_layer_test.dart b/test/features/map/presentation/layers/lightning_layer_test.dart index 0c18810cc..1f2fa6faf 100644 --- a/test/features/map/presentation/layers/lightning_layer_test.dart +++ b/test/features/map/presentation/layers/lightning_layer_test.dart @@ -14,6 +14,7 @@ /// one real strike per age bucket instead. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/lightning_layer.dart'; @@ -22,7 +23,7 @@ import 'package:dpip/features/weather/domain/meteor_lightning_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -111,8 +112,8 @@ void main() { testWidgets('label reads the localized lightning string', (tester) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -342,7 +343,7 @@ void main() { // passes no unit at all. await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/lightning_strike_marks_test.dart b/test/features/map/presentation/layers/lightning_strike_marks_test.dart index 7e2c7986a..8ae79c627 100644 --- a/test/features/map/presentation/layers/lightning_strike_marks_test.dart +++ b/test/features/map/presentation/layers/lightning_strike_marks_test.dart @@ -3,13 +3,14 @@ /// again. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/lightning_strike_overlay.dart'; import 'package:dpip/features/weather/domain/lightning_snapshot.dart'; import 'package:dpip/features/weather/domain/meteor_lightning_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -131,7 +132,7 @@ void main() { final l10n = await AppLocalizations.delegate.load(const Locale('en')); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/mesh_node_layer_render_test.dart b/test/features/map/presentation/layers/mesh_node_layer_render_test.dart index 826bffae1..df8b11529 100644 --- a/test/features/map/presentation/layers/mesh_node_layer_render_test.dart +++ b/test/features/map/presentation/layers/mesh_node_layer_render_test.dart @@ -3,6 +3,8 @@ /// name from looking like a neighbour you can reach. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:math' show Point; import 'package:dpip/core/meshtastic/domain/meshtastic_service.dart'; @@ -12,7 +14,7 @@ import 'package:dpip/features/map/presentation/layers/mesh_node_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -252,7 +254,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: Builder(builder: layer.buildSheet)), ), @@ -363,7 +365,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder( diff --git a/test/features/map/presentation/layers/pressure_layer_test.dart b/test/features/map/presentation/layers/pressure_layer_test.dart index 6c67ecf77..049ee639d 100644 --- a/test/features/map/presentation/layers/pressure_layer_test.dart +++ b/test/features/map/presentation/layers/pressure_layer_test.dart @@ -9,11 +9,12 @@ /// all, so there is nothing of its own to pin there. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/pressure_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -34,8 +35,8 @@ void main() { testWidgets('label reads the localized pressure string', (tester) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -166,7 +167,7 @@ void main() { // so it needs a real delegate even though this card shows no localized text. await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/qpesums_chrome_test.dart b/test/features/map/presentation/layers/qpesums_chrome_test.dart index cff3bd081..9cf0db0a5 100644 --- a/test/features/map/presentation/layers/qpesums_chrome_test.dart +++ b/test/features/map/presentation/layers/qpesums_chrome_test.dart @@ -3,12 +3,13 @@ /// rather than the radar circles. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/qpesums_layer.dart'; import 'package:dpip/features/map/presentation/layers/qpesums_scan_range.dart'; import 'package:dpip/features/weather/domain/qpesums_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -40,7 +41,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/radar_legend_and_errors_test.dart b/test/features/map/presentation/layers/radar_legend_and_errors_test.dart index 6afb6f591..6d3357bea 100644 --- a/test/features/map/presentation/layers/radar_legend_and_errors_test.dart +++ b/test/features/map/presentation/layers/radar_legend_and_errors_test.dart @@ -2,6 +2,7 @@ /// history leaves the overlay on so the next frame can try again. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/lightning_strike_overlay.dart'; @@ -12,7 +13,7 @@ import 'package:dpip/features/weather/domain/radar_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -81,7 +82,7 @@ void main() { final layer = testRadarLayer(_Radar()); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/rain_layer_decisions_test.dart b/test/features/map/presentation/layers/rain_layer_decisions_test.dart index bbd7cc490..a7750c7bd 100644 --- a/test/features/map/presentation/layers/rain_layer_decisions_test.dart +++ b/test/features/map/presentation/layers/rain_layer_decisions_test.dart @@ -3,6 +3,7 @@ /// interval menu. A repeat of the current choice does not change state. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/rain_color_scale.dart'; @@ -14,7 +15,7 @@ import 'package:dpip/features/weather/domain/rain_snapshot.dart'; import 'package:dpip/features/weather/domain/rain_trend.dart'; import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -40,7 +41,7 @@ class _RainRepo implements MeteorRainRepository { } Widget _app(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/features/map/presentation/layers/raster_timeline_edges_test.dart b/test/features/map/presentation/layers/raster_timeline_edges_test.dart index a82a2ebc3..c2aebacba 100644 --- a/test/features/map/presentation/layers/raster_timeline_edges_test.dart +++ b/test/features/map/presentation/layers/raster_timeline_edges_test.dart @@ -2,11 +2,12 @@ /// lines a real show emits when tile tracing is on. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/weather/domain/radar_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_tile_cache.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -46,7 +47,7 @@ void main() { layer.onSurfaceVisibility(false); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/satellite_channel_label_test.dart b/test/features/map/presentation/layers/satellite_channel_label_test.dart index 24e5ec870..ce3339d19 100644 --- a/test/features/map/presentation/layers/satellite_channel_label_test.dart +++ b/test/features/map/presentation/layers/satellite_channel_label_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/features/map/presentation/layers/satellite_layer.dart'; import 'package:dpip/features/weather/domain/satellite_channel.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/map/presentation/layers/satellite_style_path_test.dart b/test/features/map/presentation/layers/satellite_style_path_test.dart index 4df21ae0a..382bc38dc 100644 --- a/test/features/map/presentation/layers/satellite_style_path_test.dart +++ b/test/features/map/presentation/layers/satellite_style_path_test.dart @@ -3,13 +3,14 @@ /// country outline is added on attach and removed when the toggle goes off. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/satellite_layer.dart'; import 'package:dpip/features/map/presentation/widgets/satellite_legend.dart'; import 'package:dpip/features/weather/domain/satellite_channel.dart'; import 'package:dpip/features/weather/domain/satellite_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; @@ -125,7 +126,7 @@ void main() { ); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/temperature_layer_test.dart b/test/features/map/presentation/layers/temperature_layer_test.dart index 7cf674da3..91d36818d 100644 --- a/test/features/map/presentation/layers/temperature_layer_test.dart +++ b/test/features/map/presentation/layers/temperature_layer_test.dart @@ -9,13 +9,14 @@ /// all, so there is nothing of its own to pin there. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/temperature_layer.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:dpip/features/map/presentation/widgets/station_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -38,8 +39,8 @@ void main() { testWidgets('label reads the localized temperature string', (tester) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -175,7 +176,7 @@ void main() { // so it needs a real delegate even though this card shows no localized text. await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( @@ -232,7 +233,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh', 'TW'), home: Scaffold( diff --git a/test/features/map/presentation/layers/wind_forecast_chrome_test.dart b/test/features/map/presentation/layers/wind_forecast_chrome_test.dart index e143f834f..47cbc1299 100644 --- a/test/features/map/presentation/layers/wind_forecast_chrome_test.dart +++ b/test/features/map/presentation/layers/wind_forecast_chrome_test.dart @@ -2,6 +2,7 @@ /// grid, and draws the shared speed legend. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/wind_forecast_layer.dart'; @@ -10,7 +11,7 @@ import 'package:dpip/features/weather/domain/wind_forecast_model.dart'; import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -48,7 +49,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/layers/wind_layer_test.dart b/test/features/map/presentation/layers/wind_layer_test.dart index 60a67198d..30f4f9621 100644 --- a/test/features/map/presentation/layers/wind_layer_test.dart +++ b/test/features/map/presentation/layers/wind_layer_test.dart @@ -9,10 +9,11 @@ /// this layer's own [WindMapLayer.extraProperties] flowing through. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/wind_layer.dart'; import 'package:dpip/features/map/presentation/wind_speed.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -35,8 +36,8 @@ void main() { testWidgets('label reads the localized wind string', (tester) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -190,7 +191,7 @@ void main() { // so it needs a real delegate even though this card has no other l10n text. await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/map_scaffold_test.dart b/test/features/map/presentation/map_scaffold_test.dart index 9aee4b68e..363821d53 100644 --- a/test/features/map/presentation/map_scaffold_test.dart +++ b/test/features/map/presentation/map_scaffold_test.dart @@ -3,6 +3,8 @@ /// until someone retries — a blank map would look like "nothing happening". library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'dart:math' show Point; @@ -23,7 +25,7 @@ import 'package:dpip/shared/map/map_tile_cache.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; @@ -370,7 +372,7 @@ void main() { ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: homeWithInset( visibleTab == null diff --git a/test/features/map/presentation/pages/map_page_test.dart b/test/features/map/presentation/pages/map_page_test.dart index f8bcd2ab0..07cc053aa 100644 --- a/test/features/map/presentation/pages/map_page_test.dart +++ b/test/features/map/presentation/pages/map_page_test.dart @@ -3,6 +3,7 @@ /// put them back in the menu they were trying to leave. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -51,7 +52,7 @@ import 'package:dpip/shared/map/map_station_handoff.dart'; import 'package:dpip/shared/map/map_tile_cache.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:provider/provider.dart'; @@ -290,7 +291,7 @@ void main() { ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const MapPage(), ), diff --git a/test/features/map/presentation/widgets/disaster_map_overlay_menu_test.dart b/test/features/map/presentation/widgets/disaster_map_overlay_menu_test.dart index 3cfacf80e..518ecc80d 100644 --- a/test/features/map/presentation/widgets/disaster_map_overlay_menu_test.dart +++ b/test/features/map/presentation/widgets/disaster_map_overlay_menu_test.dart @@ -18,6 +18,7 @@ /// every single toggle, the kind of regression no analyzer catches. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/disaster_map/domain/aed_detail.dart'; import 'package:dpip/features/disaster_map/domain/disaster_map_repository.dart'; @@ -27,7 +28,7 @@ import 'package:dpip/features/map/presentation/layers/disaster_map_layer.dart'; import 'package:dpip/features/map/presentation/widgets/disaster_map_overlay_menu.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// The menu only reads [DisasterMapLayer.subLayers] and flips a sub-layer's @@ -66,7 +67,7 @@ class _FakeDisasterMapRepository implements DisasterMapRepository { } Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/widgets/dpm_sheet_bodies_test.dart b/test/features/map/presentation/widgets/dpm_sheet_bodies_test.dart index a2205211a..6add2421a 100644 --- a/test/features/map/presentation/widgets/dpm_sheet_bodies_test.dart +++ b/test/features/map/presentation/widgets/dpm_sheet_bodies_test.dart @@ -4,6 +4,7 @@ /// missing category collapse to nothing. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/disaster_map/domain/aed_detail.dart'; import 'package:dpip/features/disaster_map/domain/disaster_map_repository.dart'; import 'package:dpip/features/disaster_map/domain/restroom_detail.dart'; @@ -11,7 +12,7 @@ import 'package:dpip/features/disaster_map/domain/shelter_detail.dart'; import 'package:dpip/features/map/presentation/layers/disaster_map_layer.dart'; import 'package:dpip/features/map/presentation/widgets/dpm_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class _UnusedRepo implements DisasterMapRepository { @@ -44,7 +45,7 @@ class _UnusedRepo implements DisasterMapRepository { } Widget _app(Widget home) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: home), diff --git a/test/features/map/presentation/widgets/forecast_overlay_menu_test.dart b/test/features/map/presentation/widgets/forecast_overlay_menu_test.dart index ea1e87656..31028ac46 100644 --- a/test/features/map/presentation/widgets/forecast_overlay_menu_test.dart +++ b/test/features/map/presentation/widgets/forecast_overlay_menu_test.dart @@ -2,6 +2,7 @@ /// row stays open and flips the shared outline controller. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/wind_forecast_layer.dart'; @@ -10,7 +11,7 @@ import 'package:dpip/features/weather/domain/wind_forecast_model.dart'; import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -41,7 +42,7 @@ void main() { final terrain = ValueNotifier(true); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/presentation/widgets/location_track_sheet_test.dart b/test/features/map/presentation/widgets/location_track_sheet_test.dart index d3a4efbbf..2b59339ac 100644 --- a/test/features/map/presentation/widgets/location_track_sheet_test.dart +++ b/test/features/map/presentation/widgets/location_track_sheet_test.dart @@ -3,6 +3,8 @@ /// clear that cannot happen by accident. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:io'; import 'package:dpip/core/geo/location_track.dart'; @@ -12,7 +14,7 @@ import 'package:dpip/features/map/presentation/layers/location_track_layer.dart' import 'package:dpip/features/map/presentation/widgets/location_track_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; @@ -137,7 +139,7 @@ void main() { await tester.pumpWidget( MaterialApp.router( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), diff --git a/test/features/map/presentation/widgets/mesh_node_sheet_test.dart b/test/features/map/presentation/widgets/mesh_node_sheet_test.dart index 5d820118f..0f568931c 100644 --- a/test/features/map/presentation/widgets/mesh_node_sheet_test.dart +++ b/test/features/map/presentation/widgets/mesh_node_sheet_test.dart @@ -1,10 +1,11 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/meshtastic/domain/meshtastic_service.dart'; import 'package:dpip/core/meshtastic/mesh_node_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/map/presentation/layers/mesh_node_layer.dart'; import 'package:dpip/features/map/presentation/widgets/mesh_node_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../../core/meshtastic/fake_mesh_service.dart'; @@ -54,7 +55,7 @@ void main() { ValueNotifier? route, }) => MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: MeshNodeSheet( diff --git a/test/features/map/presentation/widgets/monitor_eew_card_test.dart b/test/features/map/presentation/widgets/monitor_eew_card_test.dart index 4d54b568d..0e646d846 100644 --- a/test/features/map/presentation/widgets/monitor_eew_card_test.dart +++ b/test/features/map/presentation/widgets/monitor_eew_card_test.dart @@ -4,6 +4,8 @@ /// through zero. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/geo/location_service.dart'; @@ -17,7 +19,7 @@ import 'package:dpip/features/map/presentation/widgets/monitor_eew_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -73,7 +75,7 @@ Widget _card({ ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: tab == null diff --git a/test/features/map/presentation/widgets/overlay_menu_chrome_test.dart b/test/features/map/presentation/widgets/overlay_menu_chrome_test.dart index 6ffac6b17..a42ff1c63 100644 --- a/test/features/map/presentation/widgets/overlay_menu_chrome_test.dart +++ b/test/features/map/presentation/widgets/overlay_menu_chrome_test.dart @@ -3,6 +3,7 @@ /// a second tap. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/wind_forecast_layer.dart'; @@ -15,7 +16,7 @@ import 'package:dpip/features/weather/domain/wind_forecast_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../raster_timeline_harness.dart'; @@ -57,7 +58,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Align( @@ -104,7 +105,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Align( diff --git a/test/features/map/presentation/widgets/rts_monitor_panel_eew_test.dart b/test/features/map/presentation/widgets/rts_monitor_panel_eew_test.dart index b38934d75..048ef4807 100644 --- a/test/features/map/presentation/widgets/rts_monitor_panel_eew_test.dart +++ b/test/features/map/presentation/widgets/rts_monitor_panel_eew_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; @@ -24,7 +25,7 @@ import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/seismic/spoken_intensity.dart'; import 'package:flutter/foundation.dart' show listEquals; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -163,7 +164,7 @@ Widget _wrap( ); final body = Scaffold(body: panel); return MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: MultiProvider( diff --git a/test/features/map/presentation/widgets/station_sheet_states_test.dart b/test/features/map/presentation/widgets/station_sheet_states_test.dart index 78e3ed09a..c2da49cad 100644 --- a/test/features/map/presentation/widgets/station_sheet_states_test.dart +++ b/test/features/map/presentation/widgets/station_sheet_states_test.dart @@ -3,6 +3,8 @@ /// look like a flat line of real observations. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -10,7 +12,7 @@ import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/widgets/station_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class _Source implements StationSheetSource { @@ -97,7 +99,7 @@ class _Source implements StationSheetSource { Widget _app(Widget home) => MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: home), ); diff --git a/test/features/map/presentation/widgets/station_sheet_wind_touch_test.dart b/test/features/map/presentation/widgets/station_sheet_wind_touch_test.dart index 84648a72c..335fda847 100644 --- a/test/features/map/presentation/widgets/station_sheet_wind_touch_test.dart +++ b/test/features/map/presentation/widgets/station_sheet_wind_touch_test.dart @@ -1,6 +1,6 @@ import 'package:dpip/features/map/presentation/widgets/station_sheet.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Regression guard for the wind-chart crash diff --git a/test/features/map/presentation/widgets/typhoon_forecast_callout_data_test.dart b/test/features/map/presentation/widgets/typhoon_forecast_callout_data_test.dart index 7804ba632..433ab77df 100644 --- a/test/features/map/presentation/widgets/typhoon_forecast_callout_data_test.dart +++ b/test/features/map/presentation/widgets/typhoon_forecast_callout_data_test.dart @@ -7,7 +7,7 @@ import 'dart:math' as math; import 'package:dpip/features/map/presentation/widgets/typhoon_forecast_callouts.dart'; import 'package:dpip/features/typhoon/domain/typhoon_track.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; TrackForecast _fix({ diff --git a/test/features/map/presentation/widgets/typhoon_forecast_callout_overlay_test.dart b/test/features/map/presentation/widgets/typhoon_forecast_callout_overlay_test.dart index af94f75e7..03d04a181 100644 --- a/test/features/map/presentation/widgets/typhoon_forecast_callout_overlay_test.dart +++ b/test/features/map/presentation/widgets/typhoon_forecast_callout_overlay_test.dart @@ -17,7 +17,7 @@ import 'package:dpip/features/typhoon/domain/typhoon_track.dart'; import 'package:dpip/features/typhoon/domain/typhoon_warning.dart'; import 'package:dpip/features/weather/domain/radar_repository.dart'; import 'package:dpip/features/weather/domain/satellite_repository.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/test/features/map/presentation/widgets/typhoon_panel_test.dart b/test/features/map/presentation/widgets/typhoon_panel_test.dart index 11d8120c4..6c064e19e 100644 --- a/test/features/map/presentation/widgets/typhoon_panel_test.dart +++ b/test/features/map/presentation/widgets/typhoon_panel_test.dart @@ -3,6 +3,7 @@ /// and a second storm has to be selectable without mixing the two bulletins. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/typhoon_layer.dart'; import 'package:dpip/features/map/presentation/layers/typhoon_storm_band.dart'; @@ -19,7 +20,7 @@ import 'package:dpip/features/typhoon/domain/typhoon_warning.dart'; import 'package:dpip/features/weather/domain/radar_repository.dart'; import 'package:dpip/features/weather/domain/satellite_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -234,7 +235,7 @@ class _Sat extends FakeRasterFrameSource implements SatelliteRepository { Widget _app(Widget home) => MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: home), ); diff --git a/test/features/map/qpesums_layer_test.dart b/test/features/map/qpesums_layer_test.dart index 9baa71203..62d6edc26 100644 --- a/test/features/map/qpesums_layer_test.dart +++ b/test/features/map/qpesums_layer_test.dart @@ -1,7 +1,8 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/qpesums_layer.dart'; import 'package:dpip/features/weather/domain/qpesums_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; @@ -91,7 +92,7 @@ void main() { String? caption; await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Builder( builder: (context) { @@ -111,7 +112,7 @@ void main() { ); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder(builder: (context) => layer.buildLegend(context)), diff --git a/test/features/map/radar_overlay_menu_test.dart b/test/features/map/radar_overlay_menu_test.dart index 0ad66e862..c0dbecb29 100644 --- a/test/features/map/radar_overlay_menu_test.dart +++ b/test/features/map/radar_overlay_menu_test.dart @@ -1,10 +1,11 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/radar_layer.dart'; import 'package:dpip/features/map/presentation/widgets/radar_overlay_menu.dart'; import 'package:dpip/features/weather/domain/radar_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; @@ -24,7 +25,7 @@ Widget _wrap( ValueListenable? showTerrain, ValueChanged? onShowTerrainChanged, }) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), // Top-right of the map, where the scaffold mounts it beside the switcher. diff --git a/test/features/map/rain_color_scale_test.dart b/test/features/map/rain_color_scale_test.dart index fb09c43d8..6b35adfea 100644 --- a/test/features/map/rain_color_scale_test.dart +++ b/test/features/map/rain_color_scale_test.dart @@ -7,7 +7,7 @@ import 'package:dpip/features/weather/domain/rain_snapshot.dart'; import 'package:dpip/features/weather/domain/rain_trend.dart'; import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/shared/color_hex.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; diff --git a/test/features/map/rain_legend_test.dart b/test/features/map/rain_legend_test.dart index 901887728..b73abff1d 100644 --- a/test/features/map/rain_legend_test.dart +++ b/test/features/map/rain_legend_test.dart @@ -21,6 +21,7 @@ /// beside them. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/features/map/presentation/layers/rain_layer.dart'; import 'package:dpip/features/weather/domain/meteor_rain_repository.dart'; @@ -31,7 +32,7 @@ import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/collapsible_map_legend.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class _StubRainRepository implements MeteorRainRepository { @@ -62,7 +63,7 @@ Future _pumpExpanded( ) async { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('zh'), home: Scaffold( diff --git a/test/features/map/satellite_legend_test.dart b/test/features/map/satellite_legend_test.dart index 384201fe8..2e00d4971 100644 --- a/test/features/map/satellite_legend_test.dart +++ b/test/features/map/satellite_legend_test.dart @@ -1,11 +1,12 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/widgets/satellite_legend.dart'; import 'package:dpip/features/weather/domain/satellite_channel.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: Center(child: child)), diff --git a/test/features/map/satellite_style_menu_test.dart b/test/features/map/satellite_style_menu_test.dart index f4ca254dd..1f515812f 100644 --- a/test/features/map/satellite_style_menu_test.dart +++ b/test/features/map/satellite_style_menu_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/map/presentation/layers/satellite_layer.dart'; import 'package:dpip/features/map/presentation/widgets/satellite_style_menu.dart'; import 'package:dpip/features/weather/domain/satellite_channel.dart'; @@ -5,7 +6,7 @@ import 'package:dpip/features/weather/domain/satellite_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; @@ -39,7 +40,7 @@ void main() { AppLocalizations.delegate.load(const Locale('en')); Widget wrap(SatelliteStyleMenu menu) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( @@ -195,7 +196,7 @@ void main() { final terrain = ValueNotifier(true); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/typhoon_overlay_menu_test.dart b/test/features/map/typhoon_overlay_menu_test.dart index f5fe660b1..1a82ecf26 100644 --- a/test/features/map/typhoon_overlay_menu_test.dart +++ b/test/features/map/typhoon_overlay_menu_test.dart @@ -1,3 +1,4 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/shared/map/admin_outline.dart'; import 'package:dpip/features/map/presentation/layers/typhoon_layer.dart'; import 'package:dpip/features/map/presentation/layers/typhoon_weather_overlay.dart'; @@ -8,7 +9,7 @@ import 'package:dpip/features/weather/domain/satellite_repository.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_style.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; @@ -45,7 +46,7 @@ TyphoonMapLayer _layer() => TyphoonMapLayer( ); Widget _wrap(TyphoonMapLayer layer) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( @@ -218,7 +219,7 @@ void main() { layer.setWeatherOverlay(TyphoonWeatherOverlay.satellite); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/map/wind_forecast_layer_test.dart b/test/features/map/wind_forecast_layer_test.dart index fe11e4f61..6c2616046 100644 --- a/test/features/map/wind_forecast_layer_test.dart +++ b/test/features/map/wind_forecast_layer_test.dart @@ -1,3 +1,5 @@ +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/result.dart'; @@ -9,7 +11,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer_category.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'raster_timeline_harness.dart'; @@ -325,8 +327,8 @@ void main() { referenceOutline: testReferenceOutline(), ); await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: Locale('en'), home: Scaffold(), @@ -342,7 +344,7 @@ void main() { ); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/features/meshtastic/byte_limit_formatter_test.dart b/test/features/meshtastic/byte_limit_formatter_test.dart index 52a85be0d..762a4cd67 100644 --- a/test/features/meshtastic/byte_limit_formatter_test.dart +++ b/test/features/meshtastic/byte_limit_formatter_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:dpip/core/meshtastic/domain/meshtastic_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:dpip/features/meshtastic/presentation/pages/meshtastic_page.dart'; diff --git a/test/features/meshtastic/mesh_battery_chart_test.dart b/test/features/meshtastic/mesh_battery_chart_test.dart index 2d15c9008..c8c121b83 100644 --- a/test/features/meshtastic/mesh_battery_chart_test.dart +++ b/test/features/meshtastic/mesh_battery_chart_test.dart @@ -1,15 +1,16 @@ /// The radio's battery chart: what it plots, and what it refuses to imply. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/features/meshtastic/presentation/widgets/mesh_charts.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/features/meshtastic/mesh_ratio_chart_test.dart b/test/features/meshtastic/mesh_ratio_chart_test.dart index 15ca49e83..4880df53d 100644 --- a/test/features/meshtastic/mesh_ratio_chart_test.dart +++ b/test/features/meshtastic/mesh_ratio_chart_test.dart @@ -1,16 +1,17 @@ /// The radio's free counters, one full-width chart each. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/features/meshtastic/presentation/widgets/mesh_chart_section.dart'; import 'package:dpip/features/meshtastic/presentation/widgets/mesh_ratio_chart.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: SingleChildScrollView(child: child)), ); diff --git a/test/features/meshtastic/meshtastic_page_channel_test.dart b/test/features/meshtastic/meshtastic_page_channel_test.dart index 8b8b68a87..b9b4b3f61 100644 --- a/test/features/meshtastic/meshtastic_page_channel_test.dart +++ b/test/features/meshtastic/meshtastic_page_channel_test.dart @@ -6,6 +6,7 @@ /// little else is known about the radio. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/meshtastic/data/mesh_store.dart'; import 'package:dpip/core/meshtastic/domain/meshtastic_service.dart'; import 'package:dpip/core/meshtastic/mesh_alerts.dart'; @@ -15,8 +16,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/meshtastic/presentation/mesh_chat_controller.dart'; import 'package:dpip/features/meshtastic/presentation/pages/meshtastic_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -87,13 +87,9 @@ void main() { // The page badges node counts straight off the store now. ChangeNotifierProvider.value(value: nodes), ], - child: const MaterialApp( + child: MaterialApp( locale: Locale('zh', 'TW'), - localizationsDelegates: [ - ...AppLocalizations.localizationsDelegates, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: MeshtasticPage(), ), diff --git a/test/features/meshtastic/meshtastic_page_test.dart b/test/features/meshtastic/meshtastic_page_test.dart index 03cf29107..90a353c62 100644 --- a/test/features/meshtastic/meshtastic_page_test.dart +++ b/test/features/meshtastic/meshtastic_page_test.dart @@ -5,6 +5,8 @@ /// whatever [MeshLink] and the chat controller already decided. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:convert'; import 'package:dpip/core/error/failure.dart'; @@ -21,7 +23,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/meshtastic/presentation/mesh_chat_controller.dart'; import 'package:dpip/features/meshtastic/presentation/pages/meshtastic_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -530,7 +532,7 @@ Future<_Page> _open(WidgetTester tester, {int? dpipChannel}) async { ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const MeshtasticPage(), ), diff --git a/test/features/more/more_page_test.dart b/test/features/more/more_page_test.dart index 0c8c8f834..7bee45c0a 100644 --- a/test/features/more/more_page_test.dart +++ b/test/features/more/more_page_test.dart @@ -7,6 +7,8 @@ /// is a failure that only shows up on the day it matters. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:typed_data'; import 'package:dpip/app/theme/app_gold.dart'; @@ -36,7 +38,7 @@ import 'package:dpip/features/more/domain/developer_note.dart'; import 'package:dpip/features/more/presentation/pages/more_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -225,7 +227,7 @@ Future _pump( ), ], child: MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), diff --git a/test/features/notification/presentation/notify_labels_test.dart b/test/features/notification/presentation/notify_labels_test.dart index 1254cb78e..6ea1f7cf4 100644 --- a/test/features/notification/presentation/notify_labels_test.dart +++ b/test/features/notification/presentation/notify_labels_test.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/notification/domain/notify_settings.dart'; import 'package:dpip/features/notification/domain/notify_preset.dart'; import 'package:dpip/features/notification/presentation/notify_labels.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/notification/presentation/pages/notification_test_page_test.dart b/test/features/notification/presentation/pages/notification_test_page_test.dart index eedde1275..b43108b4a 100644 --- a/test/features/notification/presentation/pages/notification_test_page_test.dart +++ b/test/features/notification/presentation/pages/notification_test_page_test.dart @@ -3,12 +3,13 @@ /// would tell the user the phone will wake them when it will not. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:awesome_notifications/awesome_notifications_platform_interface.dart'; import 'package:dpip/core/notifications/notification_service.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/notification/presentation/pages/notification_test_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -58,7 +59,7 @@ void main() { ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: KeyedSubtree( key: ValueKey(allowed), diff --git a/test/features/notification/presentation/pages/notify_page_test.dart b/test/features/notification/presentation/pages/notify_page_test.dart index c62d5e49c..7d3c6f0ab 100644 --- a/test/features/notification/presentation/pages/notify_page_test.dart +++ b/test/features/notification/presentation/pages/notify_page_test.dart @@ -3,6 +3,7 @@ /// the check, would leave the phone subscribed to the wrong alerts. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/notifications/notification_service.dart'; @@ -15,7 +16,7 @@ import 'package:dpip/features/notification/presentation/notify_labels.dart'; import 'package:dpip/features/notification/presentation/pages/notify_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -80,7 +81,7 @@ Future _pump( ], child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/onboarding/presentation/pages/onboarding_page_test.dart b/test/features/onboarding/presentation/pages/onboarding_page_test.dart index ea80f6434..7015816b8 100644 --- a/test/features/onboarding/presentation/pages/onboarding_page_test.dart +++ b/test/features/onboarding/presentation/pages/onboarding_page_test.dart @@ -6,6 +6,7 @@ /// server holds afterwards: finishing must mean the choice was saved. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:awesome_notifications/awesome_notifications_platform_interface.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/geo/location_service.dart'; @@ -22,7 +23,7 @@ import 'package:dpip/features/notification/domain/notify_settings.dart'; import 'package:dpip/features/onboarding/presentation/pages/onboarding_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; @@ -121,7 +122,7 @@ void main() { ], child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/onboarding/presentation/widgets/onboarding_intro_test.dart b/test/features/onboarding/presentation/widgets/onboarding_intro_test.dart index 3411a0601..ae9d1c765 100644 --- a/test/features/onboarding/presentation/widgets/onboarding_intro_test.dart +++ b/test/features/onboarding/presentation/widgets/onboarding_intro_test.dart @@ -11,13 +11,14 @@ /// unlocks before the content it gates was ever shown. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_intro.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: child), ); diff --git a/test/features/onboarding/presentation/widgets/onboarding_notify_presets_test.dart b/test/features/onboarding/presentation/widgets/onboarding_notify_presets_test.dart index 696e3d6c3..d5a941aca 100644 --- a/test/features/onboarding/presentation/widgets/onboarding_notify_presets_test.dart +++ b/test/features/onboarding/presentation/widgets/onboarding_notify_presets_test.dart @@ -8,6 +8,7 @@ /// server actually ended up holding, and every failure must leave a way out. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/notifications/notification_service.dart'; @@ -18,7 +19,7 @@ import 'package:dpip/features/notification/domain/notify_repository.dart'; import 'package:dpip/features/notification/domain/notify_settings.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_notify_presets.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -73,7 +74,7 @@ Future _pump( Provider.value(value: NotificationService(settings)), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, builder: (context, child) => MediaQuery( data: MediaQuery.of(context) diff --git a/test/features/onboarding/presentation/widgets/onboarding_permissions_test.dart b/test/features/onboarding/presentation/widgets/onboarding_permissions_test.dart index f5f4341f7..9a4c27cc7 100644 --- a/test/features/onboarding/presentation/widgets/onboarding_permissions_test.dart +++ b/test/features/onboarding/presentation/widgets/onboarding_permissions_test.dart @@ -25,6 +25,7 @@ /// than only the ones that deserve it. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/location_status.dart'; import 'package:dpip/core/geo/town.dart'; @@ -36,7 +37,7 @@ import 'package:dpip/core/permissions/permission_outcome.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_permissions.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_checklist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -160,7 +161,7 @@ Widget _wrap( ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: child), ), diff --git a/test/features/onboarding/presentation/widgets/onboarding_scaffold_test.dart b/test/features/onboarding/presentation/widgets/onboarding_scaffold_test.dart index 1fb80cdc9..2410ef4aa 100644 --- a/test/features/onboarding/presentation/widgets/onboarding_scaffold_test.dart +++ b/test/features/onboarding/presentation/widgets/onboarding_scaffold_test.dart @@ -1,5 +1,5 @@ import 'package:dpip/features/onboarding/presentation/widgets/onboarding_scaffold.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp(home: Scaffold(body: child)); diff --git a/test/features/onboarding/presentation/widgets/onboarding_terms_test.dart b/test/features/onboarding/presentation/widgets/onboarding_terms_test.dart index 7709477b4..3be40bf32 100644 --- a/test/features/onboarding/presentation/widgets/onboarding_terms_test.dart +++ b/test/features/onboarding/presentation/widgets/onboarding_terms_test.dart @@ -10,13 +10,14 @@ /// and accept unread", which is the one guarantee this screen exists to make. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/features/onboarding/presentation/widgets/onboarding_terms.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: child), ); diff --git a/test/features/release_highlights/presentation/widgets/highlight_card_test.dart b/test/features/release_highlights/presentation/widgets/highlight_card_test.dart index 3928a4001..b3c049590 100644 --- a/test/features/release_highlights/presentation/widgets/highlight_card_test.dart +++ b/test/features/release_highlights/presentation/widgets/highlight_card_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/features/release_highlights/domain/release_highlight.dart'; import 'package:dpip/features/release_highlights/presentation/widgets/highlight_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/release_highlights/release_highlights_page_test.dart b/test/features/release_highlights/release_highlights_page_test.dart index d3a22f808..8d3cbb1f9 100644 --- a/test/features/release_highlights/release_highlights_page_test.dart +++ b/test/features/release_highlights/release_highlights_page_test.dart @@ -2,6 +2,7 @@ /// narrow phone and both audience tabs expose their content. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/version/app_build.dart'; import 'package:dpip/features/release_highlights/data/release_highlight_repository.dart'; import 'package:dpip/features/release_highlights/domain/release_highlight.dart'; @@ -9,7 +10,7 @@ import 'package:dpip/features/release_highlights/presentation/pages/release_high import 'package:dpip/features/release_highlights/presentation/widgets/highlight_card.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -37,7 +38,7 @@ Future _pumpPage(WidgetTester tester) async { Provider.value( value: const ReleaseHighlightRepositoryImpl(), child: MaterialApp.router( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, routerConfig: router, ), diff --git a/test/features/seismometer/seismometer_page_test.dart b/test/features/seismometer/seismometer_page_test.dart index 25f3fd0c9..b7ebe575b 100644 --- a/test/features/seismometer/seismometer_page_test.dart +++ b/test/features/seismometer/seismometer_page_test.dart @@ -11,7 +11,7 @@ import 'package:dpip/features/seismometer/presentation/seismometer_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/seismic/intensity.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/features/settings/default_map_layer_page_test.dart b/test/features/settings/default_map_layer_page_test.dart index 2856f17b0..1274036f1 100644 --- a/test/features/settings/default_map_layer_page_test.dart +++ b/test/features/settings/default_map_layer_page_test.dart @@ -3,13 +3,14 @@ /// layer, would open the map on the wrong product. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/default_map_layer.dart'; import 'package:dpip/core/settings/default_map_layer_controller.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/settings/presentation/pages/default_map_layer_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/default_map_layer_ui.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -25,7 +26,7 @@ Future _pump(WidgetTester tester) async { ChangeNotifierProvider.value( value: controller, child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const DefaultMapLayerPage(), ), diff --git a/test/features/settings/display_page_test.dart b/test/features/settings/display_page_test.dart index cc6698f81..92c4b08c2 100644 --- a/test/features/settings/display_page_test.dart +++ b/test/features/settings/display_page_test.dart @@ -6,6 +6,7 @@ /// that overflows at 1.45 discredits the setting it is demonstrating. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/a11y/color_vision.dart'; import 'package:dpip/core/settings/color_vision_controller.dart'; import 'package:dpip/core/settings/display_settings.dart'; @@ -16,7 +17,7 @@ import 'package:dpip/features/settings/presentation/pages/display_page.dart'; import 'package:dpip/features/settings/presentation/widgets/display_preview.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -48,7 +49,7 @@ Future _pump( ChangeNotifierProvider(create: (_) => ColorVisionController(settings)), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, // Stands in for the ComposedTextScaler the real app installs at its // root, so the page is exercised at the sizes it offers. diff --git a/test/features/settings/eew_source_page_test.dart b/test/features/settings/eew_source_page_test.dart index a24566a61..1eb91be8f 100644 --- a/test/features/settings/eew_source_page_test.dart +++ b/test/features/settings/eew_source_page_test.dart @@ -1,8 +1,9 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/eew_cwa_only_settings.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/settings/presentation/pages/eew_source_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -16,7 +17,7 @@ void main() { value: settings, child: MaterialApp( locale: const Locale('zh', 'TW'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const EewSourcePage(), ), diff --git a/test/features/settings/experimental_page_test.dart b/test/features/settings/experimental_page_test.dart index 054eb2be9..cdef3b5a0 100644 --- a/test/features/settings/experimental_page_test.dart +++ b/test/features/settings/experimental_page_test.dart @@ -3,13 +3,14 @@ /// home backdrop lie about which override is in force. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/experimental_settings.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/core/settings/sky_time_mode.dart'; import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/features/settings/presentation/pages/experimental_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -28,7 +29,7 @@ Future _pump( ChangeNotifierProvider.value( value: settings, child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: ExperimentalPage(watchWeatherCode: (_) => weatherCode), ), diff --git a/test/features/settings/language_page_test.dart b/test/features/settings/language_page_test.dart index d9cee0bad..2254413f3 100644 --- a/test/features/settings/language_page_test.dart +++ b/test/features/settings/language_page_test.dart @@ -3,11 +3,12 @@ /// app speaking a language the user just rejected. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/locale_controller.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/settings/presentation/pages/language_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -24,7 +25,7 @@ Future _pump(WidgetTester tester) async { value: controller, child: MaterialApp( locale: controller.locale, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const LanguagePage(), ), diff --git a/test/features/settings/presentation/pages/developer_page_test.dart b/test/features/settings/presentation/pages/developer_page_test.dart index 52e59e265..0144d7886 100644 --- a/test/features/settings/presentation/pages/developer_page_test.dart +++ b/test/features/settings/presentation/pages/developer_page_test.dart @@ -3,6 +3,8 @@ /// hide the experimental menu or wipe the cache by accident. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:io'; import 'package:dpip/core/network/etag_cache_store.dart'; @@ -18,7 +20,7 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import '../../../../core/storage/memory_db.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:package_info_plus/package_info_plus.dart'; // ignore: depend_on_referenced_packages import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; @@ -136,7 +138,7 @@ void main() { ChangeNotifierProvider.value(value: experimental), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const DeveloperPage(), ), @@ -220,7 +222,7 @@ void main() { ChangeNotifierProvider.value(value: ExperimentalSettings(store)), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const DeveloperPage(), ), @@ -291,7 +293,7 @@ void main() { ChangeNotifierProvider.value(value: ExperimentalSettings(store)), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const DeveloperPage(), ), @@ -345,7 +347,7 @@ void main() { ChangeNotifierProvider.value(value: ExperimentalSettings(store)), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const DeveloperPage(), ), diff --git a/test/features/settings/presentation/pages/experimental_page_test.dart b/test/features/settings/presentation/pages/experimental_page_test.dart index f59b95c98..3d75f8bfc 100644 --- a/test/features/settings/presentation/pages/experimental_page_test.dart +++ b/test/features/settings/presentation/pages/experimental_page_test.dart @@ -2,13 +2,14 @@ /// on the previous mode would paint the home backdrop the user just rejected. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/experimental_settings.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/core/settings/sky_time_mode.dart'; import 'package:dpip/core/settings/weather_mode.dart'; import 'package:dpip/features/settings/presentation/pages/experimental_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -24,7 +25,7 @@ Future _pump(WidgetTester tester) async { MultiProvider( providers: [ChangeNotifierProvider.value(value: settings)], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: ExperimentalPage(watchWeatherCode: (_) => null), ), diff --git a/test/features/settings/presentation/pages/permissions_page_test.dart b/test/features/settings/presentation/pages/permissions_page_test.dart index d1c6fb874..9d2a3dbdb 100644 --- a/test/features/settings/presentation/pages/permissions_page_test.dart +++ b/test/features/settings/presentation/pages/permissions_page_test.dart @@ -3,6 +3,7 @@ /// leaves the grant the user just changed invisible. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:awesome_notifications/awesome_notifications_platform_interface.dart'; import 'package:dpip/core/geo/location_service.dart'; import 'package:dpip/core/geo/town_directory.dart'; @@ -11,7 +12,7 @@ import 'package:dpip/core/permissions/permission_health.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/settings/presentation/pages/permissions_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -68,7 +69,7 @@ void main() { ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const PermissionsPage(), ), diff --git a/test/features/settings/presentation/widgets/network_usage_chart_test.dart b/test/features/settings/presentation/widgets/network_usage_chart_test.dart index 797af50ce..574eaab16 100644 --- a/test/features/settings/presentation/widgets/network_usage_chart_test.dart +++ b/test/features/settings/presentation/widgets/network_usage_chart_test.dart @@ -1,7 +1,7 @@ import 'package:dpip/core/network/network_usage_store.dart'; import 'package:dpip/features/settings/presentation/widgets/network_usage_chart.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/features/settings/presentation/widgets/storage_breakdown_test.dart b/test/features/settings/presentation/widgets/storage_breakdown_test.dart index e57de905e..70c06a2e0 100644 --- a/test/features/settings/presentation/widgets/storage_breakdown_test.dart +++ b/test/features/settings/presentation/widgets/storage_breakdown_test.dart @@ -16,7 +16,7 @@ library; import 'package:dpip/core/storage/app_storage_scan.dart'; import 'package:dpip/features/settings/presentation/widgets/storage_breakdown.dart'; import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp(home: Scaffold(body: child)); diff --git a/test/features/settings/spoken_intensity_page_test.dart b/test/features/settings/spoken_intensity_page_test.dart index 14bebfaa4..23b10caea 100644 --- a/test/features/settings/spoken_intensity_page_test.dart +++ b/test/features/settings/spoken_intensity_page_test.dart @@ -6,11 +6,12 @@ /// into a blind one. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/eew_spoken_announcement_settings.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/features/settings/presentation/pages/spoken_intensity_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -22,7 +23,7 @@ Future _pump( value: settings, child: MaterialApp( locale: const Locale('zh', 'TW'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: const SpokenIntensityPage(), ), diff --git a/test/features/sponsor/presentation/pages/sponsor_page_test.dart b/test/features/sponsor/presentation/pages/sponsor_page_test.dart index 283d9e64b..3bb36427d 100644 --- a/test/features/sponsor/presentation/pages/sponsor_page_test.dart +++ b/test/features/sponsor/presentation/pages/sponsor_page_test.dart @@ -7,6 +7,8 @@ /// store does, rather than only checking that a price rendered. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -18,7 +20,7 @@ import 'package:dpip/features/sponsor/presentation/pages/sponsor_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/error_view.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -87,9 +89,9 @@ Future _pump(WidgetTester tester, _SponsorRepository repository) async { await tester.pumpWidget( Provider.value( value: repository, - child: const MaterialApp( - locale: Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + child: MaterialApp( + locale: const Locale('en'), + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: SponsorPage(), ), diff --git a/test/features/status/server_status_page_test.dart b/test/features/status/server_status_page_test.dart index dcc7c88d7..1e6b432c6 100644 --- a/test/features/status/server_status_page_test.dart +++ b/test/features/status/server_status_page_test.dart @@ -2,6 +2,7 @@ /// reading of the multi-active endpoints ("本機狀態") below. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/error/failure.dart'; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/network/api_region.dart'; @@ -12,7 +13,7 @@ import 'package:dpip/features/status/domain/server_status.dart'; import 'package:dpip/features/status/domain/server_status_repository.dart'; import 'package:dpip/features/status/presentation/pages/server_status_page.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher_platform_interface/link.dart'; @@ -34,7 +35,7 @@ void main() { ChangeNotifierProvider.value(value: health ?? EndpointHealthMonitor()), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: ServerStatusPage(key: pageKey), ), diff --git a/test/features/weather/presentation/pages/weather_ranking_page_test.dart b/test/features/weather/presentation/pages/weather_ranking_page_test.dart index 2eba945b8..e99e220a8 100644 --- a/test/features/weather/presentation/pages/weather_ranking_page_test.dart +++ b/test/features/weather/presentation/pages/weather_ranking_page_test.dart @@ -3,6 +3,8 @@ /// the user cannot open. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -22,7 +24,7 @@ import 'package:dpip/features/weather/presentation/widgets/ranking_time_sheet.da import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_station_handoff.dart'; import 'package:dpip/shared/navigation/app_routes.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; @@ -254,7 +256,7 @@ Future _pump( ], child: MaterialApp.router( routerConfig: router, - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, ), ), diff --git a/test/features/weather/presentation/widgets/ranking_time_sheet_test.dart b/test/features/weather/presentation/widgets/ranking_time_sheet_test.dart index 531a0daeb..424fb1f13 100644 --- a/test/features/weather/presentation/widgets/ranking_time_sheet_test.dart +++ b/test/features/weather/presentation/widgets/ranking_time_sheet_test.dart @@ -1,6 +1,6 @@ import 'package:dpip/features/weather/presentation/widgets/ranking_time_sheet.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; int _second(int year, int month, int day, int hour) => diff --git a/test/features/weather/presentation/widgets/weather_ranking_row_test.dart b/test/features/weather/presentation/widgets/weather_ranking_row_test.dart index afadcf5b8..e76c75c62 100644 --- a/test/features/weather/presentation/widgets/weather_ranking_row_test.dart +++ b/test/features/weather/presentation/widgets/weather_ranking_row_test.dart @@ -13,7 +13,7 @@ library; import 'package:dpip/features/weather/domain/weather_ranking.dart'; import 'package:dpip/features/weather/domain/weather_station.dart'; import 'package:dpip/features/weather/presentation/widgets/weather_ranking_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; const _station = WeatherStation( diff --git a/test/shaders/card_water_preview_test.dart b/test/shaders/card_water_preview_test.dart index 490194f14..24096bf65 100644 --- a/test/shaders/card_water_preview_test.dart +++ b/test/shaders/card_water_preview_test.dart @@ -5,7 +5,7 @@ import 'dart:io'; import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/card_water_field.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Renders the card-edge water over a synthetic card + sky so the pipeline can diff --git a/test/shaders/moon_shader_test.dart b/test/shaders/moon_shader_test.dart index 3b336fe75..c93313c13 100644 --- a/test/shaders/moon_shader_test.dart +++ b/test/shaders/moon_shader_test.dart @@ -11,7 +11,7 @@ library; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/shaders/preview_render_test.dart b/test/shaders/preview_render_test.dart index 5f7fc936b..ea6e4b328 100644 --- a/test/shaders/preview_render_test.dart +++ b/test/shaders/preview_render_test.dart @@ -12,7 +12,7 @@ import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_clouds.d import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe_data.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Renders reference-driven sky to PNGs for eyeballing. diff --git a/test/shaders/rain_on_glass_test.dart b/test/shaders/rain_on_glass_test.dart index 20da112fb..b93927919 100644 --- a/test/shaders/rain_on_glass_test.dart +++ b/test/shaders/rain_on_glass_test.dart @@ -5,7 +5,7 @@ import 'dart:io'; import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/rain_on_glass.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shaders/sky_gradient_parity_test.dart b/test/shaders/sky_gradient_parity_test.dart index ae55a1553..b64740121 100644 --- a/test/shaders/sky_gradient_parity_test.dart +++ b/test/shaders/sky_gradient_parity_test.dart @@ -3,7 +3,7 @@ import 'dart:ui' as ui; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_keyframe_data.dart'; import 'package:dpip/features/home/presentation/widgets/weather_sky/sky_lut_cache.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// The CPU-baked sky gradient (`SkyLutCache._bakeSkyGradient`) must reproduce diff --git a/test/shaders/weather_sky_shader_test.dart b/test/shaders/weather_sky_shader_test.dart index 9ce145da9..50a047887 100644 --- a/test/shaders/weather_sky_shader_test.dart +++ b/test/shaders/weather_sky_shader_test.dart @@ -1,6 +1,6 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Compile-and-paint check for every layer shader in `shaders/`. diff --git a/test/shared/color_hex_test.dart b/test/shared/color_hex_test.dart index 24b7c3bad..2feda859e 100644 --- a/test/shared/color_hex_test.dart +++ b/test/shared/color_hex_test.dart @@ -9,7 +9,7 @@ library; import 'package:dpip/shared/color_hex.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/diagnostics/dump_action_test.dart b/test/shared/diagnostics/dump_action_test.dart index e714e98d0..884c7d8f0 100644 --- a/test/shared/diagnostics/dump_action_test.dart +++ b/test/shared/diagnostics/dump_action_test.dart @@ -3,6 +3,8 @@ /// the clipboard before the dialog can be dismissed. library; +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:io'; import 'package:dpip/core/diagnostics/dump_uploader.dart'; @@ -14,7 +16,7 @@ import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/core/storage/app_database.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/diagnostics/dump_action.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -129,7 +131,7 @@ void main() { ], child: MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder( diff --git a/test/shared/map/base_map_tab_test.dart b/test/shared/map/base_map_tab_test.dart index 081bd394f..52f2697fb 100644 --- a/test/shared/map/base_map_tab_test.dart +++ b/test/shared/map/base_map_tab_test.dart @@ -3,7 +3,7 @@ import 'package:dpip/shared/map/base_map.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show PlatformException; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/test/shared/map/default_map_layer_ui_test.dart b/test/shared/map/default_map_layer_ui_test.dart index 07a6c1b1c..cc12d5db2 100644 --- a/test/shared/map/default_map_layer_ui_test.dart +++ b/test/shared/map/default_map_layer_ui_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/core/settings/default_map_layer.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/default_map_layer_ui.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/map/map_basemap_menu_test.dart b/test/shared/map/map_basemap_menu_test.dart index 7c5e58759..daa229069 100644 --- a/test/shared/map/map_basemap_menu_test.dart +++ b/test/shared/map/map_basemap_menu_test.dart @@ -3,11 +3,12 @@ /// map unchanged while the checkbox looks flipped. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_terrain_toggle.dart'; import 'package:dpip/shared/map/map_town_labels.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { @@ -20,7 +21,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: MenuAnchor( @@ -67,7 +68,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Align( @@ -110,7 +111,7 @@ void main() { await tester.pumpWidget( MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: MenuAnchor( diff --git a/test/shared/map/map_compass_test.dart b/test/shared/map/map_compass_test.dart index 1012c4cac..23d2af57c 100644 --- a/test/shared/map/map_compass_test.dart +++ b/test/shared/map/map_compass_test.dart @@ -1,14 +1,15 @@ +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:math' as math; -import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_compass.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { Widget harness(double bearing, VoidCallback onPressed) { return MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, home: Scaffold( body: MapCompass(bearing: ValueNotifier(bearing), onPressed: onPressed), ), diff --git a/test/shared/map/map_gsi_overlay_test.dart b/test/shared/map/map_gsi_overlay_test.dart index 4e7cdce9e..347dc8825 100644 --- a/test/shared/map/map_gsi_overlay_test.dart +++ b/test/shared/map/map_gsi_overlay_test.dart @@ -4,7 +4,7 @@ import 'package:dpip/core/settings/setting_keys.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/shared/map/map_gsi_overlay.dart'; import 'package:dpip/shared/map/map_style.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../features/map/raster_timeline_harness.dart'; diff --git a/test/shared/map/map_layer_defaults_test.dart b/test/shared/map/map_layer_defaults_test.dart index 23d1ace77..f83dc1a62 100644 --- a/test/shared/map/map_layer_defaults_test.dart +++ b/test/shared/map/map_layer_defaults_test.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/core/error/result.dart'; import 'package:dpip/core/realtime/app_time.dart'; import 'package:dpip/shared/map/map_layer.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:maplibre_gl/maplibre_gl.dart'; diff --git a/test/shared/map/map_layer_switcher_test.dart b/test/shared/map/map_layer_switcher_test.dart index fd56d4778..df5df3c95 100644 --- a/test/shared/map/map_layer_switcher_test.dart +++ b/test/shared/map/map_layer_switcher_test.dart @@ -1,10 +1,11 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/map_layer_order_controller.dart'; import 'package:dpip/core/settings/map_layer_visibility_controller.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_layer_switcher.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -67,7 +68,7 @@ void main() { ), ], child: MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Center( diff --git a/test/shared/map/map_timeline_test.dart b/test/shared/map/map_timeline_test.dart index 1718b9560..23e394795 100644 --- a/test/shared/map/map_timeline_test.dart +++ b/test/shared/map/map_timeline_test.dart @@ -1,8 +1,9 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_layer.dart'; import 'package:dpip/shared/map/map_timeline.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -23,7 +24,7 @@ Widget _wrap({ DateTime? dataTime, ValueListenable? readyFrameId, }) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( @@ -69,7 +70,7 @@ void main() { ); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/shared/map/map_town_labels_test.dart b/test/shared/map/map_town_labels_test.dart index 511fc3cd9..e818a1fdf 100644 --- a/test/shared/map/map_town_labels_test.dart +++ b/test/shared/map/map_town_labels_test.dart @@ -1,9 +1,10 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/map_gsi_overlay.dart'; import 'package:dpip/shared/map/map_town_labels.dart'; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Standalone base-map dropdown, as [MapScaffold] shows it for layers with no @@ -15,7 +16,7 @@ Widget _wrap( ValueChanged? onTerrainChanged, GsiOverlayController? gsi, }) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: GsiOverlayScope( diff --git a/test/shared/map/maps_launcher_copy_test.dart b/test/shared/map/maps_launcher_copy_test.dart index 9a0de19e7..afc6267ba 100644 --- a/test/shared/map/maps_launcher_copy_test.dart +++ b/test/shared/map/maps_launcher_copy_test.dart @@ -2,9 +2,10 @@ /// it with a snackbar, without launching a map app. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/maps_launcher.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -33,7 +34,7 @@ void main() { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold( diff --git a/test/shared/map/maps_launcher_test.dart b/test/shared/map/maps_launcher_test.dart index c595ff301..f8ef70e03 100644 --- a/test/shared/map/maps_launcher_test.dart +++ b/test/shared/map/maps_launcher_test.dart @@ -1,6 +1,7 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/map/maps_launcher.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:url_launcher_platform_interface/link.dart'; import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart'; @@ -122,7 +123,7 @@ void main() { const target = MapLaunchTarget(lat: 25.0330, lng: 121.5654); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder( @@ -162,7 +163,7 @@ void main() { const target = MapLaunchTarget(lat: 25.0330, lng: 121.5654); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: Builder( diff --git a/test/shared/navigation/active_while_visible_test.dart b/test/shared/navigation/active_while_visible_test.dart index cb86a7a2d..7b2dc030a 100644 --- a/test/shared/navigation/active_while_visible_test.dart +++ b/test/shared/navigation/active_while_visible_test.dart @@ -7,7 +7,7 @@ library; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Pumps the gate under [visibleTab] and returns every state it reported. diff --git a/test/shared/seismic/instrumental_intensity_colors_test.dart b/test/shared/seismic/instrumental_intensity_colors_test.dart index 12cff4cb4..32e847f75 100644 --- a/test/shared/seismic/instrumental_intensity_colors_test.dart +++ b/test/shared/seismic/instrumental_intensity_colors_test.dart @@ -11,7 +11,7 @@ library; import 'package:dpip/shared/color_hex.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Evaluates the expression's `step` for a table-scale value in tenths. diff --git a/test/shared/seismic/report_colors_test.dart b/test/shared/seismic/report_colors_test.dart index edbf0775a..776b25b54 100644 --- a/test/shared/seismic/report_colors_test.dart +++ b/test/shared/seismic/report_colors_test.dart @@ -1,5 +1,5 @@ import 'package:dpip/shared/seismic/report_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/semantics_overlay_portal_test.dart b/test/shared/semantics_overlay_portal_test.dart index 583ed8628..c12f381f2 100644 --- a/test/shared/semantics_overlay_portal_test.dart +++ b/test/shared/semantics_overlay_portal_test.dart @@ -14,7 +14,7 @@ // Shape credit: the reduction in the upstream issue. Each of the three oddities // below is load-bearing; drop any one and the assert does not fire. import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Two tooltips, one of which is rigged to reach the bug. diff --git a/test/shared/widgets/alert_cycle_chip_test.dart b/test/shared/widgets/alert_cycle_chip_test.dart index 88d5b84e3..5895cd5e9 100644 --- a/test/shared/widgets/alert_cycle_chip_test.dart +++ b/test/shared/widgets/alert_cycle_chip_test.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/shared/widgets/alert_cycle_chip.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/area_page_sync_test.dart b/test/shared/widgets/area_page_sync_test.dart index 4ab351b03..19d1e94bb 100644 --- a/test/shared/widgets/area_page_sync_test.dart +++ b/test/shared/widgets/area_page_sync_test.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/core/settings/region_store.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/shared/widgets/area_page_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/shared/widgets/async_view_test.dart b/test/shared/widgets/async_view_test.dart index d4abf0ec9..08e903ae5 100644 --- a/test/shared/widgets/async_view_test.dart +++ b/test/shared/widgets/async_view_test.dart @@ -1,3 +1,5 @@ +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:dpip/core/error/failure.dart'; @@ -7,11 +9,11 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/navigation/refresh_on_appear.dart'; import 'package:dpip/shared/widgets/async_view.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/shared/widgets/collapsible_map_legend_test.dart b/test/shared/widgets/collapsible_map_legend_test.dart index c83c65727..96be5d0de 100644 --- a/test/shared/widgets/collapsible_map_legend_test.dart +++ b/test/shared/widgets/collapsible_map_legend_test.dart @@ -3,9 +3,10 @@ /// the key the user asked for is either missing or stuck over the map. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/collapsible_map_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { @@ -13,8 +14,8 @@ void main() { tester, ) async { await tester.pumpWidget( - const MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + MaterialApp( + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold( body: CollapsibleMapLegend(legend: Text('rainfall key')), diff --git a/test/shared/widgets/dump_link_dialog_test.dart b/test/shared/widgets/dump_link_dialog_test.dart index 7f4f8154d..456c2a539 100644 --- a/test/shared/widgets/dump_link_dialog_test.dart +++ b/test/shared/widgets/dump_link_dialog_test.dart @@ -5,9 +5,10 @@ /// button that copies it. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/dump_link_dialog.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -35,7 +36,7 @@ Future> _open(WidgetTester tester, {String url = _url}) async { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Builder( builder: (context) => Scaffold( diff --git a/test/shared/widgets/dump_upload_dialog_test.dart b/test/shared/widgets/dump_upload_dialog_test.dart index 0d921a9c5..44acefa00 100644 --- a/test/shared/widgets/dump_upload_dialog_test.dart +++ b/test/shared/widgets/dump_upload_dialog_test.dart @@ -1,9 +1,10 @@ /// The upload boundary must require an explicit privacy choice every time. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/dump_upload_dialog.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { @@ -12,7 +13,7 @@ void main() { addTearDown(result.dispose); await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Builder( builder: (context) => Scaffold( diff --git a/test/shared/widgets/eew_estimate_tile_test.dart b/test/shared/widgets/eew_estimate_tile_test.dart index 3d85ee600..99f105207 100644 --- a/test/shared/widgets/eew_estimate_tile_test.dart +++ b/test/shared/widgets/eew_estimate_tile_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/shared/widgets/eew_estimate_tile.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/eew_feed_down_notice_test.dart b/test/shared/widgets/eew_feed_down_notice_test.dart index dc9ff4655..a2df4e2f1 100644 --- a/test/shared/widgets/eew_feed_down_notice_test.dart +++ b/test/shared/widgets/eew_feed_down_notice_test.dart @@ -1,14 +1,15 @@ /// Pins when the EEW feed counts as down and how each state reads. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/realtime/realtime_state.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/eew_feed_down_notice.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _host(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/shared/widgets/empty_view_test.dart b/test/shared/widgets/empty_view_test.dart index f3e5b560e..719b8ae4d 100644 --- a/test/shared/widgets/empty_view_test.dart +++ b/test/shared/widgets/empty_view_test.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/shared/widgets/empty_view.dart'; import 'package:dpip/shared/widgets/section_header.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/error_view_test.dart b/test/shared/widgets/error_view_test.dart index aba2cc971..107851d9b 100644 --- a/test/shared/widgets/error_view_test.dart +++ b/test/shared/widgets/error_view_test.dart @@ -3,15 +3,16 @@ /// caller-supplied one are different failures, so both have to render. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/error_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump(WidgetTester tester, ErrorView view) async { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: view), ), diff --git a/test/shared/widgets/event_icon_test.dart b/test/shared/widgets/event_icon_test.dart index d596dd100..42bac3797 100644 --- a/test/shared/widgets/event_icon_test.dart +++ b/test/shared/widgets/event_icon_test.dart @@ -13,7 +13,7 @@ library; import 'package:dpip/core/weather/weather_icons.dart'; import 'package:dpip/shared/widgets/event_icon.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/freshness_banner_test.dart b/test/shared/widgets/freshness_banner_test.dart index e0be18810..44af3a822 100644 --- a/test/shared/widgets/freshness_banner_test.dart +++ b/test/shared/widgets/freshness_banner_test.dart @@ -1,6 +1,6 @@ import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/freshness_banner.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/frosted_surface_test.dart b/test/shared/widgets/frosted_surface_test.dart index 2aa4161df..3f2511d6e 100644 --- a/test/shared/widgets/frosted_surface_test.dart +++ b/test/shared/widgets/frosted_surface_test.dart @@ -3,7 +3,7 @@ library; import 'package:dpip/shared/widgets/frosted_surface.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/intensity_badge_test.dart b/test/shared/widgets/intensity_badge_test.dart index 61493ea43..8c520e0d2 100644 --- a/test/shared/widgets/intensity_badge_test.dart +++ b/test/shared/widgets/intensity_badge_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/shared/widgets/intensity_badge.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump(WidgetTester tester, IntensityBadge badge) async { diff --git a/test/shared/widgets/intensity_legend_test.dart b/test/shared/widgets/intensity_legend_test.dart index 28929e556..8aa2772a0 100644 --- a/test/shared/widgets/intensity_legend_test.dart +++ b/test/shared/widgets/intensity_legend_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/shared/widgets/intensity_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump(WidgetTester tester, IntensityLegend legend) async { diff --git a/test/shared/widgets/intensity_ranking_card_test.dart b/test/shared/widgets/intensity_ranking_card_test.dart index 13bd813e6..2a151e560 100644 --- a/test/shared/widgets/intensity_ranking_card_test.dart +++ b/test/shared/widgets/intensity_ranking_card_test.dart @@ -6,16 +6,17 @@ /// colour — the badge is what is read first, before the place name. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/seismic/intensity_colors.dart'; import 'package:dpip/shared/widgets/intensity_badge.dart'; import 'package:dpip/shared/widgets/intensity_ranking_card.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _host(List entries) => MaterialApp( locale: const Locale('zh', 'TW'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: IntensityRankingCard(entries: entries)), ); diff --git a/test/shared/widgets/language_picker_test.dart b/test/shared/widgets/language_picker_test.dart index c08e5a836..5f9cc402f 100644 --- a/test/shared/widgets/language_picker_test.dart +++ b/test/shared/widgets/language_picker_test.dart @@ -5,11 +5,11 @@ /// override (the reported "switching back to default fails" bug). library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/settings/locale_controller.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/language_picker.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:dpip/core/settings/settings_store.dart'; @@ -31,13 +31,9 @@ void main() { await tester.pumpWidget( ChangeNotifierProvider.value( value: controller, - child: const MaterialApp( + child: MaterialApp( locale: Locale('zh', 'TW'), - localizationsDelegates: [ - ...AppLocalizations.localizationsDelegates, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: Center(child: LanguagePicker())), ), diff --git a/test/shared/widgets/loading_view_test.dart b/test/shared/widgets/loading_view_test.dart index 474ef1bd6..790925790 100644 --- a/test/shared/widgets/loading_view_test.dart +++ b/test/shared/widgets/loading_view_test.dart @@ -3,15 +3,16 @@ /// sizes, and a caller colour, have to stay the shared widgets. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/loading_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump(WidgetTester tester, Widget child) async { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: child), ), diff --git a/test/shared/widgets/map_chip_button_test.dart b/test/shared/widgets/map_chip_button_test.dart index 42dc6f187..32e147b85 100644 --- a/test/shared/widgets/map_chip_button_test.dart +++ b/test/shared/widgets/map_chip_button_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/shared/widgets/map_chip_button.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/map_color_legend_test.dart b/test/shared/widgets/map_color_legend_test.dart index 7e3fbe8fc..4ac36cb17 100644 --- a/test/shared/widgets/map_color_legend_test.dart +++ b/test/shared/widgets/map_color_legend_test.dart @@ -4,15 +4,16 @@ /// layer it is keyed to. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/map_color_legend.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Future _pump(WidgetTester tester, Widget child) async { await tester.pumpWidget( MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: Scaffold(body: child), ), diff --git a/test/shared/widgets/map_menu_toggle_row_test.dart b/test/shared/widgets/map_menu_toggle_row_test.dart index 1f3c988a4..de9bc52dd 100644 --- a/test/shared/widgets/map_menu_toggle_row_test.dart +++ b/test/shared/widgets/map_menu_toggle_row_test.dart @@ -5,7 +5,7 @@ library; import 'package:dpip/shared/widgets/map_chip_button.dart'; import 'package:dpip/shared/widgets/map_menu_toggle_row.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/permission_checklist_test.dart b/test/shared/widgets/permission_checklist_test.dart index a22a8a722..fb7a0d4dc 100644 --- a/test/shared/widgets/permission_checklist_test.dart +++ b/test/shared/widgets/permission_checklist_test.dart @@ -1,3 +1,5 @@ +import 'package:dpip/core/settings/locale_config.dart'; + import 'dart:async'; import 'package:awesome_notifications/awesome_notifications_platform_interface.dart'; @@ -9,7 +11,7 @@ import 'package:dpip/core/permissions/permission_health.dart'; import 'package:dpip/core/settings/settings_store.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_checklist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:geolocator/geolocator.dart'; @@ -17,7 +19,7 @@ import 'package:permission_handler/permission_handler.dart' as ph; import 'package:provider/provider.dart'; Widget _wrap(Widget child, {TextScaler? textScaler}) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), builder: textScaler == null diff --git a/test/shared/widgets/permission_settings_sheet_test.dart b/test/shared/widgets/permission_settings_sheet_test.dart index f16d88168..dddb6d2ac 100644 --- a/test/shared/widgets/permission_settings_sheet_test.dart +++ b/test/shared/widgets/permission_settings_sheet_test.dart @@ -1,10 +1,11 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_settings_sheet.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/shared/widgets/realtime_view_test.dart b/test/shared/widgets/realtime_view_test.dart index 264d63a0d..53f7f9735 100644 --- a/test/shared/widgets/realtime_view_test.dart +++ b/test/shared/widgets/realtime_view_test.dart @@ -1,11 +1,12 @@ +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/realtime/realtime_state.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/realtime_view.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: child), diff --git a/test/shared/widgets/region_chrome_test.dart b/test/shared/widgets/region_chrome_test.dart index 2d482f43d..2ae820bb4 100644 --- a/test/shared/widgets/region_chrome_test.dart +++ b/test/shared/widgets/region_chrome_test.dart @@ -4,6 +4,7 @@ /// different places. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/geo/town.dart'; import 'package:dpip/core/geo/town_directory.dart'; import 'package:dpip/core/settings/home_area.dart'; @@ -14,7 +15,7 @@ import 'package:dpip/shared/widgets/region_bar.dart'; import 'package:dpip/shared/widgets/region_label.dart'; import 'package:dpip/shared/widgets/region_pager.dart'; import 'package:dpip/shared/widgets/region_swipe_area.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; @@ -32,7 +33,7 @@ const _directory = TownDirectory({ Widget _app(RegionStore store, Widget child) => MaterialApp( locale: const Locale('en'), - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, home: MultiProvider( providers: [ diff --git a/test/shared/widgets/second_ticker_test.dart b/test/shared/widgets/second_ticker_test.dart index 7f8952996..f75c13c69 100644 --- a/test/shared/widgets/second_ticker_test.dart +++ b/test/shared/widgets/second_ticker_test.dart @@ -4,7 +4,7 @@ library; import 'package:dpip/shared/widgets/second_ticker.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/sheet_chrome_test.dart b/test/shared/widgets/sheet_chrome_test.dart index 652b0e701..43b95756f 100644 --- a/test/shared/widgets/sheet_chrome_test.dart +++ b/test/shared/widgets/sheet_chrome_test.dart @@ -6,7 +6,7 @@ library; import 'package:dpip/shared/widgets/sheet_extent.dart'; import 'package:dpip/shared/widgets/sheet_surface.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/shared/widgets/urgent_notification_section_test.dart b/test/shared/widgets/urgent_notification_section_test.dart index f750be1e9..cda353107 100644 --- a/test/shared/widgets/urgent_notification_section_test.dart +++ b/test/shared/widgets/urgent_notification_section_test.dart @@ -6,14 +6,15 @@ /// channel look like it is being changed, or like it was left unchanged. library; +import 'package:dpip/core/settings/locale_config.dart'; import 'package:dpip/core/notifications/urgent_notification_settings.dart'; import 'package:dpip/l10n/gen/app_localizations.dart'; import 'package:dpip/shared/widgets/permission_checklist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; Widget _wrap(Widget child) => MaterialApp( - localizationsDelegates: AppLocalizations.localizationsDelegates, + localizationsDelegates: appLocalizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, locale: const Locale('en'), home: Scaffold(body: SingleChildScrollView(child: child)), From 862df3839414eb978ff815aad5bad1c09a05d165 Mon Sep 17 00:00:00 2001 From: lowrt Date: Fri, 13 Nov 2026 20:26:25 +0800 Subject: [PATCH 3/6] chore(map): clarify Android marker density --- .../earthquake/presentation/pages/report_detail_page.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/features/earthquake/presentation/pages/report_detail_page.dart b/lib/features/earthquake/presentation/pages/report_detail_page.dart index 5e5cc971d..25e2c5234 100644 --- a/lib/features/earthquake/presentation/pages/report_detail_page.dart +++ b/lib/features/earthquake/presentation/pages/report_detail_page.dart @@ -292,9 +292,10 @@ class _ReportMapDetailState extends State<_ReportMapDetail> { /// so on a modern 3x display that old scale is only ~20 logical px — this /// page needs the marker legible at a glance, so it's sized up accordingly. /// - /// [intensityIconSizeCurve] also folds in [mapIconDensityFactor], because - /// Android's `addImage` pins the bitmap to density 160: without it the same - /// markers come out three times larger there than on a 3x iPhone. + /// [intensityIconSizeCurve] also folds in [mapIconDensityFactor] to account + /// for the image density recorded by each platform. Android bitmap density + /// can follow the display density, so a fixed 1/3 factor can shrink markers + /// twice on dense screens. List get _iconSizeExpression => intensityIconSizeCurve( mapIconDensityFactor( devicePixelRatio: MediaQuery.devicePixelRatioOf(context), From 35ea51a16db9acfe10a90b9d422114d5c48a8c05 Mon Sep 17 00:00:00 2001 From: lowrt Date: Mon, 16 Nov 2026 08:59:05 +0800 Subject: [PATCH 4/6] chore: update dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Platform: all Optimization(zh-Hant): 核心元件底層優化,提升整體運作的穩定性。 Optimization(en-US): optimize core component internals to improve overall operational stability. --- pubspec.lock | 4 ++-- pubspec.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 4b7fd17b7..f35162dd6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -451,8 +451,8 @@ packages: dependency: "direct main" description: path: "." - ref: a9cd6eda7feacd78c3fc288272a27edfd614fc30 - resolved-ref: a9cd6eda7feacd78c3fc288272a27edfd614fc30 + ref: "8f6265f3b6ea5dd6809169fbad01288bc9974d5d" + resolved-ref: "8f6265f3b6ea5dd6809169fbad01288bc9974d5d" url: "https://github.com/ExpTechTW/flutter_tts.git" source: git version: "4.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index be7d0b42a..7824bbd52 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,14 +54,14 @@ dependencies: # project through the dependency, which is the half of that warning nobody # reads. # - # The fork carries dlutton/flutter_tts#651 (@shivanshu877) and nothing else. + # The fork carries dlutton/flutter_tts#651 and Android AGP 9 migration fixes. # Upstream has had three functionally identical SPM pull requests open since # May with none merged, so waiting on it is not a plan. Pinned to the commit # on the fork's master, like the maplibre fork below. flutter_tts: git: url: https://github.com/ExpTechTW/flutter_tts.git - ref: a9cd6eda7feacd78c3fc288272a27edfd614fc30 + ref: 8f6265f3b6ea5dd6809169fbad01288bc9974d5d # Direct because a MarkdownElementBuilder's signature takes an md.Element # and flutter_markdown_plus does not re-export the package that defines it. markdown: ^7.3.1 From a365e572277bcd572ff7841ac78ab3bb19bc725f Mon Sep 17 00:00:00 2001 From: lowrt Date: Mon, 16 Nov 2026 08:59:05 +0800 Subject: [PATCH 5/6] build(android): upgrade Gradle and Android Gradle Plugin --- android/gradle.properties | 6 +++--- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index e96108cfe..04f378a13 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -# This newDsl flag was added by the Flutter template -android.newDsl=false +# Keep this explicit: Flutter 3.50 otherwise adds its legacy DSL migration flag. +android.newDsl=true # This builtInKotlin flag was added by the Flutter template -android.builtInKotlin=false +android.builtInKotlin=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bdc0141f5..102ad3490 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-bin.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 582a792fa..1e2ba48e2 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "9.1.1" apply false - id("org.jetbrains.kotlin.android") version "2.4.10" apply false + id("com.android.application") version "9.4.1" apply false + id("org.jetbrains.kotlin.android") version "2.4.20" apply false id("com.google.gms.google-services") version "4.5.0" apply false } From 529ca92936ecab7697a524ee1529dc3015c680b9 Mon Sep 17 00:00:00 2001 From: lowrt Date: Tue, 17 Nov 2026 19:10:56 +0800 Subject: [PATCH 6/6] fix: preserve compressed assets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Platform: all Fix(zh-Hant): 修正無法載入部分地圖與地震資料 Fix(en-US): fix loading map and earthquake data --- .../{constellations.bin.gz => constellations.bin.Z} | Bin assets/astro/{stars.bin.gz => stars.bin.Z} | Bin assets/{box.json.gz => box.json.Z} | Bin assets/{location.json.gz => location.json.Z} | Bin ...town_boundaries.bin.gz => town_boundaries.bin.Z} | Bin assets/{travel_time.json.gz => travel_time.json.Z} | Bin lib/core/astro/star_catalog.dart | 4 ++-- lib/core/geo/town.dart | 2 +- lib/core/geo/town_boundaries.dart | 4 ++-- lib/core/geo/town_directory.dart | 4 ++-- .../earthquake/data/rts_box_grid_source.dart | 4 ++-- .../earthquake/data/seismic_travel_time_source.dart | 4 ++-- pubspec.yaml | 8 ++++---- test/core/astro/star_catalog_test.dart | 2 +- tool/gen/town_boundaries.dart | 4 ++-- tool/gen/town_label_points.dart | 2 +- tool/gen/widget_township_resources.py | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) rename assets/astro/{constellations.bin.gz => constellations.bin.Z} (100%) rename assets/astro/{stars.bin.gz => stars.bin.Z} (100%) rename assets/{box.json.gz => box.json.Z} (100%) rename assets/{location.json.gz => location.json.Z} (100%) rename assets/map/{town_boundaries.bin.gz => town_boundaries.bin.Z} (100%) rename assets/{travel_time.json.gz => travel_time.json.Z} (100%) diff --git a/assets/astro/constellations.bin.gz b/assets/astro/constellations.bin.Z similarity index 100% rename from assets/astro/constellations.bin.gz rename to assets/astro/constellations.bin.Z diff --git a/assets/astro/stars.bin.gz b/assets/astro/stars.bin.Z similarity index 100% rename from assets/astro/stars.bin.gz rename to assets/astro/stars.bin.Z diff --git a/assets/box.json.gz b/assets/box.json.Z similarity index 100% rename from assets/box.json.gz rename to assets/box.json.Z diff --git a/assets/location.json.gz b/assets/location.json.Z similarity index 100% rename from assets/location.json.gz rename to assets/location.json.Z diff --git a/assets/map/town_boundaries.bin.gz b/assets/map/town_boundaries.bin.Z similarity index 100% rename from assets/map/town_boundaries.bin.gz rename to assets/map/town_boundaries.bin.Z diff --git a/assets/travel_time.json.gz b/assets/travel_time.json.Z similarity index 100% rename from assets/travel_time.json.gz rename to assets/travel_time.json.Z diff --git a/lib/core/astro/star_catalog.dart b/lib/core/astro/star_catalog.dart index 7335adae3..841678ce9 100644 --- a/lib/core/astro/star_catalog.dart +++ b/lib/core/astro/star_catalog.dart @@ -70,9 +70,9 @@ class StarCatalog { } static Future _load() async { - final starBytes = await rootBundle.load('assets/astro/stars.bin.gz'); + final starBytes = await rootBundle.load('assets/astro/stars.bin.Z'); final lineBytes = await rootBundle.load( - 'assets/astro/constellations.bin.gz', + 'assets/astro/constellations.bin.Z', ); final decoded = await Isolate.run( () => _decode( diff --git a/lib/core/geo/town.dart b/lib/core/geo/town.dart index a91d788e6..75e97685b 100644 --- a/lib/core/geo/town.dart +++ b/lib/core/geo/town.dart @@ -6,7 +6,7 @@ part 'town.g.dart'; /// One Taiwan township (鄉鎮市區) — the unit the user picks as a saved region and /// that GPS resolves to. /// -/// Mirrors the bundled `assets/location.json.gz` entry (`code → {city, town, +/// Mirrors the bundled `assets/location.json.Z` entry (`code → {city, town, /// lat, lng, cityLevel, townLevel}`); [code] is the map key, injected when the /// directory is built. [lat]/[lng] are the township centroid, used for the /// nearest-town GPS lookup and for framing the map. diff --git a/lib/core/geo/town_boundaries.dart b/lib/core/geo/town_boundaries.dart index a124816a3..941f278bd 100644 --- a/lib/core/geo/town_boundaries.dart +++ b/lib/core/geo/town_boundaries.dart @@ -17,7 +17,7 @@ import 'package:flutter/services.dart' show rootBundle; /// index** that narrows each query to the handful of townships whose bounding /// box overlaps the query cell, so a lookup tests ~1–3 polygons instead of 367. /// -/// The bundled asset (`town_boundaries.bin.gz`) is a gzipped **delta + zig-zag +/// The bundled asset (`town_boundaries.bin.Z`) is a gzipped **delta + zig-zag /// varint** encoding of the polygons (see `tool/gen/town_boundaries.dart`): /// coordinates are ≤4-decimal, so each is stored as the `×1e4` integer delta /// from the previous vertex, LEB128-packed — ~72% smaller than the float-text @@ -85,7 +85,7 @@ class TownBoundaries { /// parse — doing it on the UI isolate stalls the first frames on a slow /// phone. static Future load() async { - final bytes = await rootBundle.load('assets/map/town_boundaries.bin.gz'); + final bytes = await rootBundle.load('assets/map/town_boundaries.bin.Z'); final decoded = await Isolate.run( () => _decodeTable( Uint8List.fromList(gzip.decode(bytes.buffer.asUint8List())), diff --git a/lib/core/geo/town_directory.dart b/lib/core/geo/town_directory.dart index 1797e258b..faa6df0ee 100644 --- a/lib/core/geo/town_directory.dart +++ b/lib/core/geo/town_directory.dart @@ -8,7 +8,7 @@ import 'package:dpip/core/geo/town.dart'; import 'package:flutter/services.dart' show rootBundle; /// The Taiwan township directory, loaded from the bundled -/// `assets/location.json.gz`, with lookup by code and by GPS coordinate. +/// `assets/location.json.Z`, with lookup by code and by GPS coordinate. /// /// The centroid-based [nearest] lookup is the **fallback** for GPS→township /// resolution — used at sea, in a boundary gap, or before the boundary data @@ -33,7 +33,7 @@ class TownDirectory { /// Loads and decodes the bundled directory in a background isolate /// (`gzip` → JSON); the towns are then built on the UI isolate. static Future load() async { - final bytes = await rootBundle.load('assets/location.json.gz'); + final bytes = await rootBundle.load('assets/location.json.Z'); final json = await Isolate.run( () => jsonDecode(utf8.decode(gzip.decode(bytes.buffer.asUint8List()))) diff --git a/lib/features/earthquake/data/rts_box_grid_source.dart b/lib/features/earthquake/data/rts_box_grid_source.dart index e758e90df..06bfbf425 100644 --- a/lib/features/earthquake/data/rts_box_grid_source.dart +++ b/lib/features/earthquake/data/rts_box_grid_source.dart @@ -6,7 +6,7 @@ import 'package:flutter/services.dart' show rootBundle; /// Loads the bundled RTS box grid into the domain [RtsBoxGrid]. /// -/// The asset (`assets/box.json.gz`, gzip → JSON) is a `FeatureCollection` of +/// The asset (`assets/box.json.Z`, gzip → JSON) is a `FeatureCollection` of /// `Polygon` features, each carrying an integer `ID` property matched against /// `Rts.box`'s keys. Kept out of the pure domain (which only consumes the /// parsed grid) so the domain stays Flutter-free. @@ -20,7 +20,7 @@ class RtsBoxGridSource { const RtsBoxGridSource(); Future load() async { - final bytes = await rootBundle.load('assets/box.json.gz'); + final bytes = await rootBundle.load('assets/box.json.Z'); final json = jsonDecode( utf8.decode(gzip.decode(bytes.buffer.asUint8List())), ) as Map; diff --git a/lib/features/earthquake/data/seismic_travel_time_source.dart b/lib/features/earthquake/data/seismic_travel_time_source.dart index 241335dbc..94e038054 100644 --- a/lib/features/earthquake/data/seismic_travel_time_source.dart +++ b/lib/features/earthquake/data/seismic_travel_time_source.dart @@ -8,7 +8,7 @@ import 'package:flutter/services.dart' show rootBundle; /// Loads the bundled seismic P/S travel-time table into the domain /// [SeismicTravelTimeTable]. /// -/// The asset (`assets/travel_time.json.gz`, gzip → JSON) is the CWA travel-time +/// The asset (`assets/travel_time.json.Z`, gzip → JSON) is the CWA travel-time /// model keyed by focal depth: `{ "": [ {"P":…,"S":…,"R":…}, … ] }`, /// where each row is the P/S travel time (s) at epicentral radius `R` (km). /// Kept out of the pure domain (which only consumes the parsed table) so the @@ -17,7 +17,7 @@ class SeismicTravelTimeSource { const SeismicTravelTimeSource(); Future load() async { - final bytes = await rootBundle.load('assets/travel_time.json.gz'); + final bytes = await rootBundle.load('assets/travel_time.json.Z'); // gzip, JSON decode *and* the row build all off the UI isolate: this is a // 213 KB asset (833 KB inflated, 25,016 rows) and it loads at bootstrap, // so the assembly would land in the first-frame window. diff --git a/pubspec.yaml b/pubspec.yaml index 7824bbd52..3ae6b509e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -194,17 +194,17 @@ flutter: - shaders/weather/card_water.frag assets: - assets/DPIP.png - - assets/box.json.gz + - assets/box.json.Z - assets/weather/clouds/ - assets/weather/particles/ - assets/weather/sky/ - - assets/location.json.gz + - assets/location.json.Z - assets/eew_points.json - - assets/map/town_boundaries.bin.gz + - assets/map/town_boundaries.bin.Z # The basemap a map with no network falls back to — Taiwan z0–9 and the # world z0–2, 1.05 MiB. Built by tool/gen/basemap_seed.sh. - assets/map/basemap_seed/ - - assets/travel_time.json.gz + - assets/travel_time.json.Z - assets/astro/ # Weather glyphs Flutter's bundled MaterialIcons font simply does not have — diff --git a/test/core/astro/star_catalog_test.dart b/test/core/astro/star_catalog_test.dart index c6c3704be..0227d2f42 100644 --- a/test/core/astro/star_catalog_test.dart +++ b/test/core/astro/star_catalog_test.dart @@ -5,7 +5,7 @@ /// transcription slip in the RA/Dec formula. /// /// The decode is exercised against the real shipped assets -/// (`assets/astro/stars.bin.gz`, `assets/astro/constellations.bin.gz`) — +/// (`assets/astro/stars.bin.Z`, `assets/astro/constellations.bin.Z`) — /// `flutter_test`'s asset bundle serves the project's actual files, so this /// is the real gzip-decode-plus-binary-unpack pipeline, not a synthetic /// stand-in. `StarCatalog._cached` is a static, process-lifetime memo with no diff --git a/tool/gen/town_boundaries.dart b/tool/gen/town_boundaries.dart index f4988e712..bc41c98f5 100644 --- a/tool/gen/town_boundaries.dart +++ b/tool/gen/town_boundaries.dart @@ -1,5 +1,5 @@ /// Re-encodes the township boundary polygons into the compact binary the app -/// bundles (`assets/map/town_boundaries.bin.gz`). +/// bundles (`assets/map/town_boundaries.bin.Z`). /// /// Source of truth is the human-readable `town_boundaries.json.gz` /// (`{ code: { b: bbox, p: [polygon…] } }`, rings are flat `[lng,lat,…]`). @@ -21,7 +21,7 @@ import 'dart:io'; import 'dart:typed_data'; const _src = 'assets/map/town_boundaries.json.gz'; -const _out = 'assets/map/town_boundaries.bin.gz'; +const _out = 'assets/map/town_boundaries.bin.Z'; void main() { final json = jsonDecode( diff --git a/tool/gen/town_label_points.dart b/tool/gen/town_label_points.dart index ea96645d5..19c4a7634 100644 --- a/tool/gen/town_label_points.dart +++ b/tool/gen/town_label_points.dart @@ -43,7 +43,7 @@ import 'dart:io'; import 'dart:math' as math; const _src = 'assets/map/town_boundaries.json.gz'; -const _directory = 'assets/location.json.gz'; +const _directory = 'assets/location.json.Z'; const _out = 'lib/shared/map/town_label_points.g.dart'; /// Stop subdividing once no cell can beat the best by more than this, in the diff --git a/tool/gen/widget_township_resources.py b/tool/gen/widget_township_resources.py index 53c152bf7..ff4b32611 100644 --- a/tool/gen/widget_township_resources.py +++ b/tool/gen/widget_township_resources.py @@ -26,8 +26,8 @@ REPO = Path(__file__).resolve().parents[2] -DIRECTORY_SOURCE = REPO / "assets/location.json.gz" -BOUNDARY_SOURCE = REPO / "assets/map/town_boundaries.bin.gz" +DIRECTORY_SOURCE = REPO / "assets/location.json.Z" +BOUNDARY_SOURCE = REPO / "assets/map/town_boundaries.bin.Z" DIRECTORY_OUTPUT = REPO / "ios/DPIPWidgets/WidgetTownshipDirectory.json" BOUNDARY_OUTPUT = REPO / "ios/DPIPWidgets/WidgetTownshipBoundaries.bin" # The Android Widget reads these from its APK's assets. Same bytes, same