From c7198c5a48810cd1039bd21b3d084f95be8cba45 Mon Sep 17 00:00:00 2001 From: misha Date: Tue, 10 Nov 2026 12:41:21 +0300 Subject: [PATCH] fix: exteshions removed --- .../insights/models/insights_period.dart | 22 +++++++++++- .../presentation/cubit/insights_panel.dart | 11 ++++++ .../presentation/widgets/insights_tabs.dart | 17 --------- .../presentation/widgets/period_pills.dart | 36 ------------------- 4 files changed, 32 insertions(+), 54 deletions(-) diff --git a/lib/features/insights/models/insights_period.dart b/lib/features/insights/models/insights_period.dart index 6ca91a9a..cd3d01a2 100644 --- a/lib/features/insights/models/insights_period.dart +++ b/lib/features/insights/models/insights_period.dart @@ -1,3 +1,5 @@ +import 'package:eatvio_app/generated/l10n.dart'; + /// Период для вкладок «Вес», «ИМТ» и «Замеры». Значение совпадает с `{period}` в /// `/api/profile/measure/weight/{period}`. enum BodyPeriod { @@ -10,9 +12,18 @@ enum BodyPeriod { const BodyPeriod(this.apiValue); final String apiValue; + + /// Подпись пилюли периода. + String pillLabel(S s) => switch (this) { + month => s.insights_period_1m, + threeMonths => s.insights_period_3m, + sixMonths => s.insights_period_6m, + year => s.insights_period_1y, + all => s.insights_period_all, + }; } -/// Период для вкладки «КБЖУ по дням» (используется со второй итерации). +/// Период для вкладки «КБЖУ по дням». Значение совпадает с `daily_period` в `/api/profile/insights`. enum DailyPeriod { week('7'), twoWeeks('14'), @@ -23,4 +34,13 @@ enum DailyPeriod { const DailyPeriod(this.apiValue); final String apiValue; + + /// Подпись пилюли периода. + String pillLabel(S s) => switch (this) { + week => s.insights_period_1w, + twoWeeks => s.insights_period_2w, + month => s.insights_period_1m, + threeMonths => s.insights_period_3m, + all => s.insights_period_all, + }; } diff --git a/lib/features/insights/presentation/cubit/insights_panel.dart b/lib/features/insights/presentation/cubit/insights_panel.dart index 8a7b3a9c..39aff3a9 100644 --- a/lib/features/insights/presentation/cubit/insights_panel.dart +++ b/lib/features/insights/presentation/cubit/insights_panel.dart @@ -1,3 +1,5 @@ +import 'package:eatvio_app/generated/l10n.dart'; + /// Вкладки блока «Аналитика». enum InsightsPanel { weight, @@ -12,6 +14,15 @@ enum InsightsPanel { /// Кнопка «+» есть только у вкладок с ручным вводом. bool get supportsAdd => this == weight || this == measures; + /// Подпись вкладки. + String label(S s) => switch (this) { + weight => s.insights_tab_weight, + bmi => s.insights_tab_bmi, + measures => s.insights_tab_measures, + daily => s.insights_tab_daily, + intra => s.insights_tab_intra, + }; + static List available({required bool kbjuEnabled}) { return values.where((panel) => kbjuEnabled || !panel.isKbju).toList(); } diff --git a/lib/features/insights/presentation/widgets/insights_tabs.dart b/lib/features/insights/presentation/widgets/insights_tabs.dart index e3babaf7..83b4e0f6 100644 --- a/lib/features/insights/presentation/widgets/insights_tabs.dart +++ b/lib/features/insights/presentation/widgets/insights_tabs.dart @@ -3,23 +3,6 @@ import 'package:eatvio_app/features/insights/presentation/widgets/insights_color import 'package:eatvio_app/generated/l10n.dart'; import 'package:flutter/material.dart'; -extension InsightsPanelLabel on InsightsPanel { - String label(S s) { - switch (this) { - case InsightsPanel.weight: - return s.insights_tab_weight; - case InsightsPanel.bmi: - return s.insights_tab_bmi; - case InsightsPanel.measures: - return s.insights_tab_measures; - case InsightsPanel.daily: - return s.insights_tab_daily; - case InsightsPanel.intra: - return s.insights_tab_intra; - } - } -} - /// Горизонтально прокручиваемые вкладки (`l-tab`). class InsightsTabs extends StatelessWidget { const InsightsTabs({ diff --git a/lib/features/insights/presentation/widgets/period_pills.dart b/lib/features/insights/presentation/widgets/period_pills.dart index e3c02996..edc3366c 100644 --- a/lib/features/insights/presentation/widgets/period_pills.dart +++ b/lib/features/insights/presentation/widgets/period_pills.dart @@ -1,42 +1,6 @@ -import 'package:eatvio_app/features/insights/models/insights_period.dart'; import 'package:eatvio_app/features/insights/presentation/widgets/insights_colors.dart'; -import 'package:eatvio_app/generated/l10n.dart'; import 'package:flutter/material.dart'; -extension BodyPeriodLabel on BodyPeriod { - String pillLabel(S s) { - switch (this) { - case BodyPeriod.month: - return s.insights_period_1m; - case BodyPeriod.threeMonths: - return s.insights_period_3m; - case BodyPeriod.sixMonths: - return s.insights_period_6m; - case BodyPeriod.year: - return s.insights_period_1y; - case BodyPeriod.all: - return s.insights_period_all; - } - } -} - -extension DailyPeriodLabel on DailyPeriod { - String pillLabel(S s) { - switch (this) { - case DailyPeriod.week: - return s.insights_period_1w; - case DailyPeriod.twoWeeks: - return s.insights_period_2w; - case DailyPeriod.month: - return s.insights_period_1m; - case DailyPeriod.threeMonths: - return s.insights_period_3m; - case DailyPeriod.all: - return s.insights_period_all; - } - } -} - /// Пилюли выбора периода (`1М 3М 6М 1Г Всё время`). class PeriodPills extends StatelessWidget { const PeriodPills({