diff --git a/lib/features/insights/presentation/charts/bmi_chart.dart b/lib/features/insights/presentation/charts/bmi_chart.dart index eedfbf3e..2c6776b9 100644 --- a/lib/features/insights/presentation/charts/bmi_chart.dart +++ b/lib/features/insights/presentation/charts/bmi_chart.dart @@ -2,7 +2,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart' import 'package:eatvio_app/features/insights/presentation/charts/insights_chart_common.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; /// График ИМТ с цветными зонами: норма 18.5–25, избыточная масса 25–30, ожирение 30–40. diff --git a/lib/features/insights/presentation/charts/daily_kbju_chart.dart b/lib/features/insights/presentation/charts/daily_kbju_chart.dart index dca6d310..f1013ea7 100644 --- a/lib/features/insights/presentation/charts/daily_kbju_chart.dart +++ b/lib/features/insights/presentation/charts/daily_kbju_chart.dart @@ -2,7 +2,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart' import 'package:eatvio_app/features/insights/presentation/charts/insights_chart_common.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; /// КБЖУ по дням: калории — площадь на левой оси («ккал»), Б/Ж/У — линии на diff --git a/lib/features/insights/presentation/charts/insights_chart_common.dart b/lib/features/insights/presentation/charts/insights_chart_common.dart index 07a2c35a..600677f6 100644 --- a/lib/features/insights/presentation/charts/insights_chart_common.dart +++ b/lib/features/insights/presentation/charts/insights_chart_common.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; /// Точка графика: индекс по оси X (как у Chart.js), подпись `dd.MM` и значение. diff --git a/lib/features/insights/presentation/charts/intra_day_chart.dart b/lib/features/insights/presentation/charts/intra_day_chart.dart index 05d90a78..4274ca8c 100644 --- a/lib/features/insights/presentation/charts/intra_day_chart.dart +++ b/lib/features/insights/presentation/charts/intra_day_chart.dart @@ -2,7 +2,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart' import 'package:eatvio_app/features/insights/presentation/charts/insights_chart_common.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; /// График «В течение дня»: столбики Б/Ж/У (ккал) по приёмам пищи на оси 0–24 ч, diff --git a/lib/features/insights/presentation/charts/measure_chart.dart b/lib/features/insights/presentation/charts/measure_chart.dart index 33bd3e35..8503c6e8 100644 --- a/lib/features/insights/presentation/charts/measure_chart.dart +++ b/lib/features/insights/presentation/charts/measure_chart.dart @@ -2,7 +2,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart' import 'package:eatvio_app/features/insights/presentation/charts/insights_chart_common.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; /// Три линии: талия, грудь, бёдра. [visibility] — видимость серий в этом порядке. diff --git a/lib/features/insights/presentation/charts/weight_chart.dart b/lib/features/insights/presentation/charts/weight_chart.dart index 0a85860a..34881c62 100644 --- a/lib/features/insights/presentation/charts/weight_chart.dart +++ b/lib/features/insights/presentation/charts/weight_chart.dart @@ -2,7 +2,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart' import 'package:eatvio_app/features/insights/presentation/charts/insights_chart_common.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; class WeightChart extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/add_circumference_bottom_sheet.dart b/lib/features/insights/presentation/widgets/add_circumference_bottom_sheet.dart index 1dc074f9..24477e15 100644 --- a/lib/features/insights/presentation/widgets/add_circumference_bottom_sheet.dart +++ b/lib/features/insights/presentation/widgets/add_circumference_bottom_sheet.dart @@ -1,7 +1,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; const int _minValue = 20; const int _maxValue = 199; diff --git a/lib/features/insights/presentation/widgets/add_weight_bottom_sheet.dart b/lib/features/insights/presentation/widgets/add_weight_bottom_sheet.dart index 2228ad0b..c2c0f0d0 100644 --- a/lib/features/insights/presentation/widgets/add_weight_bottom_sheet.dart +++ b/lib/features/insights/presentation/widgets/add_weight_bottom_sheet.dart @@ -1,7 +1,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; const int _minKilo = 20; const int _maxKilo = 299; diff --git a/lib/features/insights/presentation/widgets/insights_card.dart b/lib/features/insights/presentation/widgets/insights_card.dart index df1d1fa9..9432221f 100644 --- a/lib/features/insights/presentation/widgets/insights_card.dart +++ b/lib/features/insights/presentation/widgets/insights_card.dart @@ -23,7 +23,7 @@ import 'package:eatvio_app/features/insights/presentation/widgets/period_pills.d import 'package:eatvio_app/features/insights/presentation/widgets/series_chips.dart'; import 'package:eatvio_app/features/insights/repositories/insights_repository.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; /// Сворачиваемый блок «Аналитика» (вес, ИМТ, замеры). diff --git a/lib/features/insights/presentation/widgets/insights_fab.dart b/lib/features/insights/presentation/widgets/insights_fab.dart index 62403286..02ec76ed 100644 --- a/lib/features/insights/presentation/widgets/insights_fab.dart +++ b/lib/features/insights/presentation/widgets/insights_fab.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Круглая кнопка «+» (52px) справа-снизу карточки. class InsightsFab extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/insights_head.dart b/lib/features/insights/presentation/widgets/insights_head.dart index beffd9f3..7cad6850 100644 --- a/lib/features/insights/presentation/widgets/insights_head.dart +++ b/lib/features/insights/presentation/widgets/insights_head.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Крупное число + единица + строка с дельтой. class InsightsHead extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/insights_tabs.dart b/lib/features/insights/presentation/widgets/insights_tabs.dart index 83b4e0f6..41340114 100644 --- a/lib/features/insights/presentation/widgets/insights_tabs.dart +++ b/lib/features/insights/presentation/widgets/insights_tabs.dart @@ -1,7 +1,7 @@ import 'package:eatvio_app/features/insights/presentation/cubit/insights_panel.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Горизонтально прокручиваемые вкладки (`l-tab`). class InsightsTabs extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/intra_date_nav.dart b/lib/features/insights/presentation/widgets/intra_date_nav.dart index 90b24c1b..8771f608 100644 --- a/lib/features/insights/presentation/widgets/intra_date_nav.dart +++ b/lib/features/insights/presentation/widgets/intra_date_nav.dart @@ -1,7 +1,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Навигация по дням для вкладки «В течение дня»: `‹ дата ›` и выбор даты. /// diff --git a/lib/features/insights/presentation/widgets/intra_legend.dart b/lib/features/insights/presentation/widgets/intra_legend.dart index 31536714..738f375d 100644 --- a/lib/features/insights/presentation/widgets/intra_legend.dart +++ b/lib/features/insights/presentation/widgets/intra_legend.dart @@ -1,7 +1,7 @@ import 'package:eatvio_app/features/insights/models/insights_payload_model.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Легенда под графиком «В течение дня»: подъём, отход ко сну, затемнение сна. class IntraLegend extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/period_pills.dart b/lib/features/insights/presentation/widgets/period_pills.dart index edc3366c..d8c6c76d 100644 --- a/lib/features/insights/presentation/widgets/period_pills.dart +++ b/lib/features/insights/presentation/widgets/period_pills.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Пилюли выбора периода (`1М 3М 6М 1Г Всё время`). class PeriodPills extends StatelessWidget { diff --git a/lib/features/insights/presentation/widgets/series_chips.dart b/lib/features/insights/presentation/widgets/series_chips.dart index 5319b80f..2c300a93 100644 --- a/lib/features/insights/presentation/widgets/series_chips.dart +++ b/lib/features/insights/presentation/widgets/series_chips.dart @@ -1,5 +1,5 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SeriesChipData { const SeriesChipData({ diff --git a/test/features/insights/presentation/widgets/insights_card_test.dart b/test/features/insights/presentation/widgets/insights_card_test.dart index 18a29a44..2273995a 100644 --- a/test/features/insights/presentation/widgets/insights_card_test.dart +++ b/test/features/insights/presentation/widgets/insights_card_test.dart @@ -6,9 +6,8 @@ import 'package:eatvio_app/features/insights/presentation/charts/weight_chart.da import 'package:eatvio_app/features/insights/presentation/widgets/insights_card.dart'; import 'package:eatvio_app/features/insights/repositories/insights_repository.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import '../../../../fixtures/doubles/insights_doubles.dart'; @@ -16,12 +15,7 @@ void main() { Widget wrap(Widget child) { return MaterialApp( theme: ThemeHelper().themeData(), - localizationsDelegates: const [ - S.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], + localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates], supportedLocales: const [Locale('ru')], home: Scaffold(body: SingleChildScrollView(child: child)), ); diff --git a/test/features/insights/presentation/widgets/insights_kbju_test.dart b/test/features/insights/presentation/widgets/insights_kbju_test.dart index deb66788..b1daffae 100644 --- a/test/features/insights/presentation/widgets/insights_kbju_test.dart +++ b/test/features/insights/presentation/widgets/insights_kbju_test.dart @@ -7,9 +7,8 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_card. import 'package:eatvio_app/features/insights/presentation/widgets/intra_date_nav.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/intra_legend.dart'; import 'package:eatvio_app/generated/l10n.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; import '../../../../fixtures/doubles/insights_doubles.dart'; @@ -18,12 +17,7 @@ void main() { Widget wrap(Widget child) { return MaterialApp( theme: ThemeHelper().themeData(), - localizationsDelegates: const [ - S.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], + localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates], supportedLocales: const [Locale('ru')], home: Scaffold(body: SingleChildScrollView(child: child)), );