From 2da82f1ae42087e9a0da6253a25e2d34e816c7d6 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 11 Sep 2026 20:06:16 +0400 Subject: [PATCH 01/79] feat(ui): design system tokens and base components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The package had no UI layer at all until now, only the pigeon bridge. Colours land as a ThemeExtension so a host can override them through ThemeData and get both schemes; the type scale, spacing, radii and elevation are constants for now. The 16 icons are package assets — declared without the lib/ prefix, which Flutter implies for packages, and read back as packages/rees46_sdk/assets/icons. Flutter does not draw SVG without a dependency, so components that show an icon take the asset path plus a builder and the consumer picks the renderer. The space is reserved either way. 16 base components under lib/src/ui/components, all exported from rees46_sdk.dart — Button, ButtonGroup, InputField, Checkbox, CheckboxWithLabel, Tag, Badge, Loader, EmptyState, Title, SearchResultsTitle, Accordion, ListLabel, Dots, Count and Rating. InputField is built on TextField for selection and the copy menu, so it needs Material in the tree. It wraps itself in a transparent Material, which covers everything but MaterialLocalizations; that requirement is documented on the class. Nothing is wired into the existing widgets yet. --- lib/assets/icons/angle-down.svg | 3 + lib/assets/icons/angle-large-right.svg | 3 + lib/assets/icons/angle-up.svg | 3 + lib/assets/icons/arrow-left.svg | 3 + lib/assets/icons/arrows-up-down.svg | 4 + lib/assets/icons/copy.svg | 4 + lib/assets/icons/cross-large.svg | 3 + lib/assets/icons/cross.svg | 3 + lib/assets/icons/equalizer-horizontal.svg | 8 + lib/assets/icons/grid-2x2-fill.svg | 6 + lib/assets/icons/grid-2x2.svg | 6 + lib/assets/icons/list-fill.svg | 8 + lib/assets/icons/list.svg | 8 + lib/assets/icons/magnifier.svg | 3 + lib/assets/icons/spacing-md.svg | 5 + lib/assets/icons/star-fill.svg | 3 + lib/rees46_sdk.dart | 22 ++ .../components/personalization_accordion.dart | 71 ++++ .../ui/components/personalization_badge.dart | 51 +++ .../ui/components/personalization_button.dart | 237 ++++++++++++++ .../personalization_button_group.dart | 128 ++++++++ .../components/personalization_checkbox.dart | 119 +++++++ .../personalization_checkbox_with_label.dart | 58 ++++ .../ui/components/personalization_count.dart | 60 ++++ .../ui/components/personalization_dots.dart | 46 +++ .../personalization_empty_state.dart | 38 +++ .../personalization_input_field.dart | 304 ++++++++++++++++++ .../personalization_list_label.dart | 31 ++ .../ui/components/personalization_loader.dart | 84 +++++ .../ui/components/personalization_rating.dart | 86 +++++ .../personalization_search_results_title.dart | 169 ++++++++++ .../ui/components/personalization_tag.dart | 85 +++++ .../ui/components/personalization_title.dart | 48 +++ lib/src/ui/personalization_colors.dart | 292 +++++++++++++++++ lib/src/ui/personalization_elevation.dart | 78 +++++ lib/src/ui/personalization_icons.dart | 45 +++ lib/src/ui/personalization_radius.dart | 30 ++ lib/src/ui/personalization_spacing.dart | 26 ++ lib/src/ui/personalization_typography.dart | 143 ++++++++ pubspec.yaml | 5 + 40 files changed, 2329 insertions(+) create mode 100644 lib/assets/icons/angle-down.svg create mode 100644 lib/assets/icons/angle-large-right.svg create mode 100644 lib/assets/icons/angle-up.svg create mode 100644 lib/assets/icons/arrow-left.svg create mode 100644 lib/assets/icons/arrows-up-down.svg create mode 100644 lib/assets/icons/copy.svg create mode 100644 lib/assets/icons/cross-large.svg create mode 100644 lib/assets/icons/cross.svg create mode 100644 lib/assets/icons/equalizer-horizontal.svg create mode 100644 lib/assets/icons/grid-2x2-fill.svg create mode 100644 lib/assets/icons/grid-2x2.svg create mode 100644 lib/assets/icons/list-fill.svg create mode 100644 lib/assets/icons/list.svg create mode 100644 lib/assets/icons/magnifier.svg create mode 100644 lib/assets/icons/spacing-md.svg create mode 100644 lib/assets/icons/star-fill.svg create mode 100644 lib/src/ui/components/personalization_accordion.dart create mode 100644 lib/src/ui/components/personalization_badge.dart create mode 100644 lib/src/ui/components/personalization_button.dart create mode 100644 lib/src/ui/components/personalization_button_group.dart create mode 100644 lib/src/ui/components/personalization_checkbox.dart create mode 100644 lib/src/ui/components/personalization_checkbox_with_label.dart create mode 100644 lib/src/ui/components/personalization_count.dart create mode 100644 lib/src/ui/components/personalization_dots.dart create mode 100644 lib/src/ui/components/personalization_empty_state.dart create mode 100644 lib/src/ui/components/personalization_input_field.dart create mode 100644 lib/src/ui/components/personalization_list_label.dart create mode 100644 lib/src/ui/components/personalization_loader.dart create mode 100644 lib/src/ui/components/personalization_rating.dart create mode 100644 lib/src/ui/components/personalization_search_results_title.dart create mode 100644 lib/src/ui/components/personalization_tag.dart create mode 100644 lib/src/ui/components/personalization_title.dart create mode 100644 lib/src/ui/personalization_colors.dart create mode 100644 lib/src/ui/personalization_elevation.dart create mode 100644 lib/src/ui/personalization_icons.dart create mode 100644 lib/src/ui/personalization_radius.dart create mode 100644 lib/src/ui/personalization_spacing.dart create mode 100644 lib/src/ui/personalization_typography.dart diff --git a/lib/assets/icons/angle-down.svg b/lib/assets/icons/angle-down.svg new file mode 100644 index 0000000..36e2716 --- /dev/null +++ b/lib/assets/icons/angle-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/angle-large-right.svg b/lib/assets/icons/angle-large-right.svg new file mode 100644 index 0000000..f60a1c3 --- /dev/null +++ b/lib/assets/icons/angle-large-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/angle-up.svg b/lib/assets/icons/angle-up.svg new file mode 100644 index 0000000..f1d3774 --- /dev/null +++ b/lib/assets/icons/angle-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/arrow-left.svg b/lib/assets/icons/arrow-left.svg new file mode 100644 index 0000000..032dc9d --- /dev/null +++ b/lib/assets/icons/arrow-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/arrows-up-down.svg b/lib/assets/icons/arrows-up-down.svg new file mode 100644 index 0000000..ca31ef5 --- /dev/null +++ b/lib/assets/icons/arrows-up-down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/assets/icons/copy.svg b/lib/assets/icons/copy.svg new file mode 100644 index 0000000..2bd37d3 --- /dev/null +++ b/lib/assets/icons/copy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/assets/icons/cross-large.svg b/lib/assets/icons/cross-large.svg new file mode 100644 index 0000000..1d2398c --- /dev/null +++ b/lib/assets/icons/cross-large.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/cross.svg b/lib/assets/icons/cross.svg new file mode 100644 index 0000000..9a3faaa --- /dev/null +++ b/lib/assets/icons/cross.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/equalizer-horizontal.svg b/lib/assets/icons/equalizer-horizontal.svg new file mode 100644 index 0000000..30ecf8a --- /dev/null +++ b/lib/assets/icons/equalizer-horizontal.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/lib/assets/icons/grid-2x2-fill.svg b/lib/assets/icons/grid-2x2-fill.svg new file mode 100644 index 0000000..90c3a67 --- /dev/null +++ b/lib/assets/icons/grid-2x2-fill.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/assets/icons/grid-2x2.svg b/lib/assets/icons/grid-2x2.svg new file mode 100644 index 0000000..1b587b2 --- /dev/null +++ b/lib/assets/icons/grid-2x2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/assets/icons/list-fill.svg b/lib/assets/icons/list-fill.svg new file mode 100644 index 0000000..74bc51c --- /dev/null +++ b/lib/assets/icons/list-fill.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/lib/assets/icons/list.svg b/lib/assets/icons/list.svg new file mode 100644 index 0000000..936f41e --- /dev/null +++ b/lib/assets/icons/list.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/lib/assets/icons/magnifier.svg b/lib/assets/icons/magnifier.svg new file mode 100644 index 0000000..0678b51 --- /dev/null +++ b/lib/assets/icons/magnifier.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/assets/icons/spacing-md.svg b/lib/assets/icons/spacing-md.svg new file mode 100644 index 0000000..06cf362 --- /dev/null +++ b/lib/assets/icons/spacing-md.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/lib/assets/icons/star-fill.svg b/lib/assets/icons/star-fill.svg new file mode 100644 index 0000000..b40c135 --- /dev/null +++ b/lib/assets/icons/star-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index 6cd497a..a63eb19 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -19,3 +19,25 @@ export 'src/sdk_init_config.dart'; export 'src/tracking/purchase_line_item.dart'; export 'src/tracking/tracking_api.dart'; export 'src/tracking/tracking_models.dart'; +export 'src/ui/personalization_typography.dart'; +export 'src/ui/personalization_spacing.dart'; +export 'src/ui/personalization_radius.dart'; +export 'src/ui/personalization_elevation.dart'; +export 'src/ui/personalization_icons.dart'; +export 'src/ui/personalization_colors.dart'; +export 'src/ui/components/personalization_badge.dart'; +export 'src/ui/components/personalization_tag.dart'; +export 'src/ui/components/personalization_checkbox.dart'; +export 'src/ui/components/personalization_checkbox_with_label.dart'; +export 'src/ui/components/personalization_loader.dart'; +export 'src/ui/components/personalization_empty_state.dart'; +export 'src/ui/components/personalization_button.dart'; +export 'src/ui/components/personalization_button_group.dart'; +export 'src/ui/components/personalization_input_field.dart'; +export 'src/ui/components/personalization_title.dart'; +export 'src/ui/components/personalization_accordion.dart'; +export 'src/ui/components/personalization_list_label.dart'; +export 'src/ui/components/personalization_dots.dart'; +export 'src/ui/components/personalization_count.dart'; +export 'src/ui/components/personalization_rating.dart'; +export 'src/ui/components/personalization_search_results_title.dart'; diff --git a/lib/src/ui/components/personalization_accordion.dart b/lib/src/ui/components/personalization_accordion.dart new file mode 100644 index 0000000..6665a7e --- /dev/null +++ b/lib/src/ui/components/personalization_accordion.dart @@ -0,0 +1,71 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import '../personalization_icons.dart'; + +/// Строка-аккордеон списка. +/// +/// Источник: Figma Mobile SDK UI Kit, секция List (241:10565), фрейм Accordion (241:10575). +/// Два варианта — Expanded=False и True, отличаются только направлением шеврона. +/// +/// Шеврон отдаётся путём к SVG-ассету: пакет не рисует SVG сам, +/// отрисовку выбирает потребитель через [iconBuilder]. +class PersonalizationAccordion extends StatelessWidget { + const PersonalizationAccordion({ + super.key, + required this.label, + this.count, + this.expanded = false, + this.onToggle, + this.iconBuilder, + }); + + final String label; + + /// Число в скобках после подписи. `null` — не показывать. + final int? count; + final bool expanded; + final ValueChanged? onToggle; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final style = TextStyle( + fontSize: 16, + height: 24 / 16, + letterSpacing: 0, + fontWeight: FontWeight.w400, + color: colors.textPrimary, + ); + final asset = + expanded ? PersonalizationIcons.angleUp : PersonalizationIcons.angleDown; + + return GestureDetector( + onTap: onToggle == null ? null : () => onToggle!(!expanded), + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text(label, style: style), + if (count != null) ...[ + const SizedBox(width: 4), + Text('($count)', style: style.copyWith(color: colors.textSecondary)), + ], + const SizedBox(width: 4), + SizedBox( + width: 24, + height: 24, + child: iconBuilder?.call(context, asset, 24, colors.textPrimary), + ), + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_badge.dart b/lib/src/ui/components/personalization_badge.dart new file mode 100644 index 0000000..a6e9190 --- /dev/null +++ b/lib/src/ui/components/personalization_badge.dart @@ -0,0 +1,51 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Размер бейджа. +enum PersonalizationBadgeSize { sm, md, lg } + +/// Бейдж дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Badge (241:7434). +/// +/// Внимание: типографика бейджа не совпадает со ступенями [PersonalizationTypography] — +/// кегль берётся с одной ступени, интерлиньяж с другой (20/24, 16/20, 14/16). +/// Поэтому стиль собирается здесь явно, а не переиспользуется. +class PersonalizationBadge extends StatelessWidget { + const PersonalizationBadge({ + super.key, + required this.label, + this.size = PersonalizationBadgeSize.lg, + }); + + final String label; + final PersonalizationBadgeSize size; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final (padH, padV, radius, fontSize, lineHeight) = switch (size) { + PersonalizationBadgeSize.lg => (12.0, 8.0, 10.0, 20.0, 24.0), + PersonalizationBadgeSize.md => (8.0, 4.0, 8.0, 16.0, 20.0), + PersonalizationBadgeSize.sm => (4.0, 2.0, 6.0, 14.0, 16.0), + }; + + return Container( + padding: EdgeInsets.symmetric(horizontal: padH, vertical: padV), + decoration: BoxDecoration( + color: colors.semanticWarning, + borderRadius: BorderRadius.circular(radius), + ), + child: Text( + label, + style: TextStyle( + fontSize: fontSize, + height: lineHeight / fontSize, + fontWeight: FontWeight.w600, + color: colors.textLightPrimary, + ), + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart new file mode 100644 index 0000000..3523f87 --- /dev/null +++ b/lib/src/ui/components/personalization_button.dart @@ -0,0 +1,237 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Размер кнопки. +enum PersonalizationButtonSize { lg, md, sm } + +/// Вид кнопки. +enum PersonalizationButtonView { primary, secondary, ghost } + +/// Кнопка дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Button (90:862), фрейм 90:869. +/// Матрица: 3 размера x 3 вида x 3 состояния x 4 конфигурации контента. +/// +/// Состояние Focus из макета — это нажатие, оно ведётся внутри виджета. +/// Disabled наступает, когда [onPressed] не задан. +/// +/// Иконки отдаются путями к SVG-ассетам ([PersonalizationIcons]): пакет не +/// рисует SVG сам, отрисовку выбирает потребитель через [iconBuilder]. +class PersonalizationButton extends StatefulWidget { + const PersonalizationButton({ + super.key, + this.label, + this.size = PersonalizationButtonSize.lg, + this.view = PersonalizationButtonView.primary, + this.onPressed, + this.iconStart, + this.iconEnd, + this.iconBuilder, + }); + + final String? label; + final PersonalizationButtonSize size; + final PersonalizationButtonView view; + + /// Не задан — кнопка недоступна. + final VoidCallback? onPressed; + + /// Ассет иконки перед текстом. Без текста кнопка становится кнопкой-иконкой. + final String? iconStart; + + /// Ассет иконки после текста. + final String? iconEnd; + + /// Как нарисовать иконку заданного размера и цвета из ассета. Не задан — + /// место под иконку остаётся пустым, но отступы сохраняются. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + State createState() => _PersonalizationButtonState(); +} + +class _PersonalizationButtonState extends State { + bool _pressed = false; + + bool get _enabled => widget.onPressed != null; + + bool get _hasText => widget.label != null && widget.label!.isNotEmpty; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final metrics = _metrics[widget.size]!; + final foreground = _foreground(colors); + + final children = [ + if (widget.iconStart != null) _icon(context, widget.iconStart!, metrics, foreground), + if (_hasText) + Text( + widget.label!, + textAlign: TextAlign.center, + style: TextStyle( + fontSize: metrics.fontSize, + height: metrics.lineHeight / metrics.fontSize, + letterSpacing: metrics.letterSpacing, + fontWeight: FontWeight.w600, + color: foreground, + ), + ), + if (widget.iconEnd != null) _icon(context, widget.iconEnd!, metrics, foreground), + ]; + + return GestureDetector( + onTap: widget.onPressed, + onTapDown: _enabled ? (_) => setState(() => _pressed = true) : null, + onTapUp: _enabled ? (_) => setState(() => _pressed = false) : null, + onTapCancel: _enabled ? () => setState(() => _pressed = false) : null, + child: Container( + padding: _padding(metrics), + decoration: BoxDecoration( + color: _background(colors), + borderRadius: BorderRadius.circular(metrics.radius), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + for (int i = 0; i < children.length; i++) ...[ + if (i > 0) const SizedBox(width: 8), + children[i], + ], + ], + ), + ), + ); + } + + Widget _icon( + BuildContext context, + String asset, + _ButtonMetrics metrics, + Color color, + ) { + return SizedBox( + width: metrics.iconSize, + height: metrics.iconSize, + child: widget.iconBuilder?.call(context, asset, metrics.iconSize, color), + ); + } + + EdgeInsets _padding(_ButtonMetrics metrics) { + if (!_hasText) { + // Кнопка-иконка: со всех сторон вертикальный отступ, 12/8/4. + return EdgeInsets.all(metrics.paddingVertical); + } + return EdgeInsets.only( + left: widget.iconStart != null ? metrics.paddingNarrow : metrics.paddingWide, + right: widget.iconEnd != null ? metrics.paddingNarrow : metrics.paddingWide, + top: metrics.paddingVertical, + bottom: metrics.paddingVertical, + ); + } + + Color _background(PersonalizationColors colors) { + if (!_enabled) { + switch (widget.view) { + case PersonalizationButtonView.primary: + return colors.buttonPrimaryDisabled; + case PersonalizationButtonView.secondary: + return colors.buttonSecondaryDisabled; + case PersonalizationButtonView.ghost: + return colors.backgroundTransparent; + } + } + if (_pressed) { + // Ghost в нажатии красится тем же, что и Secondary. + return widget.view == PersonalizationButtonView.primary + ? colors.buttonPrimaryFocus + : colors.buttonSecondaryFocus; + } + switch (widget.view) { + // Кнопка привязана к Brand/Primary, а не к Button/Primary — так в макете. + case PersonalizationButtonView.primary: + return colors.brandPrimary; + case PersonalizationButtonView.secondary: + return colors.buttonSecondary; + case PersonalizationButtonView.ghost: + return colors.backgroundTransparent; + } + } + + Color _foreground(PersonalizationColors colors) { + if (widget.view == PersonalizationButtonView.primary) { + return _enabled ? colors.textLightPrimary : colors.textLightHint; + } + return _enabled ? colors.textPrimary : colors.textHint; + } +} + +class _ButtonMetrics { + const _ButtonMetrics({ + required this.fontSize, + required this.lineHeight, + required this.letterSpacing, + required this.radius, + required this.paddingVertical, + required this.paddingWide, + required this.paddingNarrow, + required this.iconSize, + }); + + final double fontSize; + final double lineHeight; + final double letterSpacing; + final double radius; + final double paddingVertical; + + /// Горизонтальный отступ со стороны без иконки. + final double paddingWide; + + /// Горизонтальный отступ со стороны с иконкой. + final double paddingNarrow; + final double iconSize; +} + +const Map _metrics = + { + PersonalizationButtonSize.lg: _ButtonMetrics( + fontSize: 20, + lineHeight: 32, + letterSpacing: 0, + radius: 10, + paddingVertical: 12, + paddingWide: 24, + paddingNarrow: 16, + iconSize: 32, + ), + PersonalizationButtonSize.md: _ButtonMetrics( + fontSize: 16, + lineHeight: 24, + letterSpacing: 0, + radius: 8, + paddingVertical: 8, + paddingWide: 16, + paddingNarrow: 12, + iconSize: 24, + ), + // SM берёт кегль со ступени sm, а интерлиньяж со ступени base: + // в макете 14/24, тогда как ступень sm — это 14/20. + PersonalizationButtonSize.sm: _ButtonMetrics( + fontSize: 14, + lineHeight: 24, + letterSpacing: 0.05, + radius: 4, + paddingVertical: 4, + paddingWide: 12, + paddingNarrow: 8, + iconSize: 20, + ), +}; diff --git a/lib/src/ui/components/personalization_button_group.dart b/lib/src/ui/components/personalization_button_group.dart new file mode 100644 index 0000000..8bc492b --- /dev/null +++ b/lib/src/ui/components/personalization_button_group.dart @@ -0,0 +1,128 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Размер группы кнопок. +enum PersonalizationButtonGroupSize { md, sm } + +/// Сегмент группы. +class PersonalizationButtonGroupItem { + const PersonalizationButtonGroupItem({required this.icon, this.activeIcon}); + + /// Ассет иконки сегмента. + final String icon; + + /// Ассет иконки выбранного сегмента. В макете Grid оставляет ту же иконку, + /// а List подменяет её на залитую, поэтому это отдельное поле. + final String? activeIcon; +} + +/// Группа кнопок (сегментированный переключатель). +/// +/// Источник: Figma Mobile SDK UI Kit, секция Button Group (185:5253): +/// фрейм Base Button (185:5315) — сегмент, фрейм Button Group (185:5484) — сама группа. +/// +/// В макете нарисован только случай на два сегмента (Grid/List) в размере MD, +/// сегмент же есть и в MD, и в SM — поэтому размер вынесен в API, +/// а число сегментов не ограничено. +class PersonalizationButtonGroup extends StatelessWidget { + const PersonalizationButtonGroup({ + super.key, + required this.items, + this.selectedIndex = 0, + this.size = PersonalizationButtonGroupSize.md, + this.onSelected, + this.iconBuilder, + }); + + final List items; + final int selectedIndex; + final PersonalizationButtonGroupSize size; + final ValueChanged? onSelected; + + /// Как нарисовать иконку заданного размера и цвета из ассета. Не задан — + /// место под иконку остаётся пустым, но отступы сохраняются. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final metrics = _groupMetrics[size]!; + final side = metrics.iconSize + metrics.padding * 2; + + return Container( + padding: const EdgeInsets.all(2), + decoration: BoxDecoration( + color: colors.buttonSecondary, + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + for (int index = 0; index < items.length; index++) ...[ + if (index > 0) const SizedBox(width: 2), + _segment(context, colors, metrics, side, index), + ], + ], + ), + ); + } + + Widget _segment( + BuildContext context, + PersonalizationColors colors, + _GroupMetrics metrics, + double side, + int index, + ) { + final item = items[index]; + final active = index == selectedIndex; + final asset = active ? (item.activeIcon ?? item.icon) : item.icon; + final tint = active ? colors.textInvertedPrimary : colors.textHint; + + return GestureDetector( + onTap: onSelected == null ? null : () => onSelected!(index), + child: Container( + width: side, + height: side, + alignment: Alignment.center, + decoration: BoxDecoration( + color: active ? colors.buttonPrimary : colors.backgroundTransparent, + borderRadius: BorderRadius.circular(metrics.radius), + ), + child: SizedBox( + width: metrics.iconSize, + height: metrics.iconSize, + child: iconBuilder?.call(context, asset, metrics.iconSize, tint), + ), + ), + ); + } +} + +class _GroupMetrics { + const _GroupMetrics({ + required this.radius, + required this.padding, + required this.iconSize, + }); + + final double radius; + + /// Отступ сегмента: 6 в MD и 2 в SM, обоих значений нет в шкале спейсингов. + final double padding; + final double iconSize; +} + +const Map _groupMetrics = + { + PersonalizationButtonGroupSize.md: + _GroupMetrics(radius: 6, padding: 6, iconSize: 24), + PersonalizationButtonGroupSize.sm: + _GroupMetrics(radius: 4, padding: 2, iconSize: 20), +}; diff --git a/lib/src/ui/components/personalization_checkbox.dart b/lib/src/ui/components/personalization_checkbox.dart new file mode 100644 index 0000000..ab4ee4e --- /dev/null +++ b/lib/src/ui/components/personalization_checkbox.dart @@ -0,0 +1,119 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Состояние чекбокса. +enum PersonalizationCheckboxState { unchecked, checked, indeterminate } + +/// Чекбокс дизайн-системы, 20x20. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Input, фрейм Checkbox (205:10128). +/// В макете только размер MD, поэтому размера в API нет. +/// +/// Галка и черта рисуются штрихом по геометрии из макета: +/// `M5 10 L8.75 13.75 L15 7.5` и `M5 10 H15`, толщина 2, круглые концы. +class PersonalizationCheckbox extends StatelessWidget { + const PersonalizationCheckbox({ + super.key, + this.state = PersonalizationCheckboxState.unchecked, + this.disabled = false, + this.onChanged, + }); + + final PersonalizationCheckboxState state; + final bool disabled; + + /// Зовётся с состоянием, в которое чекбокс переходит по нажатию. + final ValueChanged? onChanged; + + static const double size = 20; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final isFilled = state != PersonalizationCheckboxState.unchecked; + + final Widget box = CustomPaint( + size: const Size.square(size), + painter: _CheckboxPainter( + state: state, + fill: isFilled + ? (disabled ? colors.buttonPrimaryDisabled : colors.buttonPrimary) + : (disabled ? colors.backgroundInputDisabled : colors.backgroundInput), + border: isFilled ? null : colors.lineInput, + glyph: colors.textLightPrimary, + ), + ); + + if (disabled || onChanged == null) return box; + + return GestureDetector( + onTap: () => onChanged!( + state == PersonalizationCheckboxState.checked + ? PersonalizationCheckboxState.unchecked + : PersonalizationCheckboxState.checked, + ), + child: box, + ); + } +} + +class _CheckboxPainter extends CustomPainter { + const _CheckboxPainter({ + required this.state, + required this.fill, + required this.border, + required this.glyph, + }); + + final PersonalizationCheckboxState state; + final Color fill; + final Color? border; + final Color glyph; + + @override + void paint(Canvas canvas, Size size) { + final rect = Offset.zero & size; + final rrect = RRect.fromRectAndRadius(rect, const Radius.circular(4)); + + canvas.drawRRect(rrect, Paint()..color = fill); + + if (border != null) { + // Рамка внутрь, чтобы внешний размер остался ровно 20. + final inset = rect.deflate(0.5); + canvas.drawRRect( + RRect.fromRectAndRadius(inset, const Radius.circular(4)), + Paint() + ..color = border! + ..style = PaintingStyle.stroke + ..strokeWidth = 1, + ); + } + + if (state == PersonalizationCheckboxState.unchecked) return; + + final stroke = Paint() + ..color = glyph + ..style = PaintingStyle.stroke + ..strokeWidth = 2 + ..strokeCap = StrokeCap.round + ..strokeJoin = StrokeJoin.round; + + final path = Path(); + if (state == PersonalizationCheckboxState.checked) { + path + ..moveTo(5, 10) + ..lineTo(8.75, 13.75) + ..lineTo(15, 7.5); + } else { + path + ..moveTo(5, 10) + ..lineTo(15, 10); + } + canvas.drawPath(path, stroke); + } + + @override + bool shouldRepaint(_CheckboxPainter old) => + old.state != state || old.fill != fill || old.border != border || old.glyph != glyph; +} diff --git a/lib/src/ui/components/personalization_checkbox_with_label.dart b/lib/src/ui/components/personalization_checkbox_with_label.dart new file mode 100644 index 0000000..5ba05f5 --- /dev/null +++ b/lib/src/ui/components/personalization_checkbox_with_label.dart @@ -0,0 +1,58 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import 'personalization_checkbox.dart'; + +/// Чекбокс с подписью. +/// +/// Источник: Figma Mobile SDK UI Kit, фрейм Checkbox with Label (205:10151). +/// Зазор 8, подпись 16/20 обычного начертания; в disabled подпись уходит +/// в Text/Hint. +class PersonalizationCheckboxWithLabel extends StatelessWidget { + const PersonalizationCheckboxWithLabel({ + super.key, + required this.label, + this.state = PersonalizationCheckboxState.unchecked, + this.disabled = false, + this.onChanged, + }); + + final String label; + final PersonalizationCheckboxState state; + final bool disabled; + final ValueChanged? onChanged; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + + final row = Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + PersonalizationCheckbox(state: state, disabled: disabled), + const SizedBox(width: 8), + Text( + label, + style: TextStyle( + fontSize: 16, + height: 20 / 16, + fontWeight: FontWeight.w400, + color: disabled ? colors.textHint : colors.textPrimary, + ), + ), + ], + ); + + if (disabled || onChanged == null) return row; + + return GestureDetector( + onTap: () => onChanged!( + state == PersonalizationCheckboxState.checked + ? PersonalizationCheckboxState.unchecked + : PersonalizationCheckboxState.checked, + ), + child: row, + ); + } +} diff --git a/lib/src/ui/components/personalization_count.dart b/lib/src/ui/components/personalization_count.dart new file mode 100644 index 0000000..4e1d1b7 --- /dev/null +++ b/lib/src/ui/components/personalization_count.dart @@ -0,0 +1,60 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Счётчик «показано N из M». +/// +/// Источник: Figma Mobile SDK UI Kit, секция Navigation (90:660), символ Count (301:6810). +/// Слова — параметры, а не константы: локализация остаётся за интегратором. +/// В макете это «Showed 6 from 569». +class PersonalizationCount extends StatelessWidget { + const PersonalizationCount({ + super.key, + required this.prefix, + required this.shown, + required this.separator, + required this.total, + }); + + /// Слово перед первым числом («Показано»). + final String prefix; + final int shown; + + /// Слово между числами («из»). + final String separator; + final int total; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + const double fontSize = 16; + final TextStyle regular = TextStyle( + fontSize: fontSize, + height: 24 / fontSize, + letterSpacing: 0, + fontWeight: FontWeight.w400, + color: colors.textSecondary, + ); + final TextStyle strong = regular.copyWith( + fontWeight: FontWeight.w600, + color: colors.textPrimary, + ); + + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(prefix, style: regular), + const SizedBox(width: 4), + Text('$shown', style: strong), + const SizedBox(width: 4), + Text(separator, style: regular), + const SizedBox(width: 4), + Text('$total', style: strong), + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_dots.dart b/lib/src/ui/components/personalization_dots.dart new file mode 100644 index 0000000..ffc1afd --- /dev/null +++ b/lib/src/ui/components/personalization_dots.dart @@ -0,0 +1,46 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Точки-индикатор карусели. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Navigation (90:660), +/// символы Dots (90:669) и Dot (90:685). +/// В макете нарисовано пять точек, число вынесено в API. +class PersonalizationDots extends StatelessWidget { + const PersonalizationDots({ + super.key, + required this.count, + this.selectedIndex = 0, + }); + + final int count; + final int selectedIndex; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + for (int index = 0; index < count; index++) ...[ + if (index > 0) const SizedBox(width: 12), + Container( + width: 16, + height: 16, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == selectedIndex + ? colors.brandPrimary + : colors.lineGeneric, + ), + ), + ], + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_empty_state.dart b/lib/src/ui/components/personalization_empty_state.dart new file mode 100644 index 0000000..cf01232 --- /dev/null +++ b/lib/src/ui/components/personalization_empty_state.dart @@ -0,0 +1,38 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Пустое состояние дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Empty State (319:7736). +/// Горизонтальные отступы 16, вертикальные 92, текст по центру ступенью +/// XL/Default цветом Text/Secondary. +/// +/// Текст не зашит: в макете стоит «No results for your request.», но строку +/// подставляет потребитель — локализация остаётся на его стороне. +class PersonalizationEmptyState extends StatelessWidget { + const PersonalizationEmptyState({super.key, required this.message}); + + final String message; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 92), + child: Center( + child: Text( + message, + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + height: 32 / 20, + fontWeight: FontWeight.w400, + color: colors.textSecondary, + ), + ), + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_input_field.dart b/lib/src/ui/components/personalization_input_field.dart new file mode 100644 index 0000000..6fea8d2 --- /dev/null +++ b/lib/src/ui/components/personalization_input_field.dart @@ -0,0 +1,304 @@ +import 'package:flutter/material.dart' + show InputDecoration, Material, MaterialType, TextField; +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import '../personalization_icons.dart'; + +/// Размер поля ввода. +enum PersonalizationInputFieldSize { lg, md, sm } + +/// Тип поля ввода. +enum PersonalizationInputFieldType { search, input, select } + +/// Поле ввода дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Input (167:3746), фрейм Input Field (205:10194). +/// Матрица: 3 размера x 4 состояния x 3 типа. +/// +/// Состояния из макета не задаются снаружи, а выводятся из самого поля: +/// Default — пусто, Filled — есть текст, Focus — поле в фокусе, Disabled — [enabled]. +/// +/// Иконки отдаются путями к SVG-ассетам: пакет не рисует SVG сам, +/// отрисовку выбирает потребитель через [iconBuilder]. +/// +/// Поле построено на [TextField] ради выделения и меню копирования. [TextField] +/// требует в предках `Material` и `MaterialLocalizations`. Первое компонент +/// добавляет сам, так что его можно класть в любой оверлей. Второе даёт +/// `MaterialApp`; в `CupertinoApp` нужно добавить делегат: +/// ```dart +/// CupertinoApp( +/// localizationsDelegates: [DefaultMaterialLocalizations.delegate], +/// ) +/// ``` +class PersonalizationInputField extends StatefulWidget { + const PersonalizationInputField({ + super.key, + this.controller, + this.placeholder, + this.size = PersonalizationInputFieldSize.lg, + this.type = PersonalizationInputFieldType.search, + this.enabled = true, + this.onChanged, + this.onClear, + this.onSelectTap, + this.iconBuilder, + }); + + final TextEditingController? controller; + final String? placeholder; + final PersonalizationInputFieldSize size; + final PersonalizationInputFieldType type; + final bool enabled; + final ValueChanged? onChanged; + + /// Нажатие на крестик у типа Search. Поле очищается в любом случае. + final VoidCallback? onClear; + + /// Нажатие на поле у типа Select: список открывает потребитель. + final VoidCallback? onSelectTap; + + /// Как нарисовать иконку заданного размера и цвета из ассета. Не задан — + /// место под иконку остаётся пустым, но отступы сохраняются. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + State createState() => _PersonalizationInputFieldState(); +} + +class _PersonalizationInputFieldState extends State { + late final TextEditingController _controller = + widget.controller ?? TextEditingController(); + final FocusNode _focusNode = FocusNode(); + bool _focused = false; + + bool get _ownsController => widget.controller == null; + + @override + void initState() { + super.initState(); + _focusNode.addListener(_onFocusChanged); + _controller.addListener(_onTextChanged); + } + + @override + void dispose() { + _focusNode.removeListener(_onFocusChanged); + _focusNode.dispose(); + _controller.removeListener(_onTextChanged); + if (_ownsController) _controller.dispose(); + super.dispose(); + } + + void _onFocusChanged() => setState(() => _focused = _focusNode.hasFocus); + + void _onTextChanged() => setState(() {}); + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final metrics = _inputMetrics[widget.size]!; + final filled = _controller.text.isNotEmpty; + final foreground = + filled && widget.enabled ? colors.textPrimary : colors.textHint; + + final style = TextStyle( + fontSize: metrics.fontSize, + height: metrics.lineHeight / metrics.fontSize, + letterSpacing: metrics.letterSpacing, + fontWeight: FontWeight.w400, + color: foreground, + ); + + // Крестик — это очистка, поэтому он появляется только когда есть что чистить. + final String? endAsset; + switch (widget.type) { + case PersonalizationInputFieldType.select: + endAsset = PersonalizationIcons.angleDown; + case PersonalizationInputFieldType.search: + endAsset = filled && widget.enabled ? PersonalizationIcons.cross : null; + case PersonalizationInputFieldType.input: + endAsset = null; + } + + final field = Container( + padding: _padding(metrics), + decoration: BoxDecoration( + color: widget.enabled ? colors.backgroundInput : colors.backgroundInputDisabled, + borderRadius: BorderRadius.circular(metrics.radius), + border: Border.all( + color: _focused && widget.enabled ? colors.lineInputFocus : colors.lineInput, + width: _border, + ), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (widget.type == PersonalizationInputFieldType.search) ...[ + // В макете иконка идёт в цвет текста: серая в Default и Disabled, тёмная в Filled. + _icon(context, PersonalizationIcons.magnifier, metrics, foreground), + const SizedBox(width: 8), + ], + Expanded(child: _body(style, colors)), + if (endAsset != null) ...[ + const SizedBox(width: 8), + GestureDetector( + onTap: widget.type == PersonalizationInputFieldType.search + ? _clear + : widget.onSelectTap, + child: _icon(context, endAsset, metrics, foreground), + ), + ], + ], + ), + ); + + // Select — не поле ввода: список открывает потребитель по нажатию на всю строку. + if (widget.type == PersonalizationInputFieldType.select) { + return GestureDetector( + onTap: widget.enabled ? widget.onSelectTap : null, + child: field, + ); + } + return field; + } + + Widget _body(TextStyle style, PersonalizationColors colors) { + if (widget.type == PersonalizationInputFieldType.select) { + final filled = _controller.text.isNotEmpty; + return Text( + filled ? _controller.text : (widget.placeholder ?? ''), + style: style, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ); + } + // TextField требует предка Material — без этой обёртки он падает на ассерте + // везде, кроме Scaffold. Прозрачный тип ничего не рисует поверх нашего фона. + return Material( + type: MaterialType.transparency, + child: TextField( + controller: _controller, + focusNode: _focusNode, + enabled: widget.enabled, + onChanged: widget.onChanged, + style: style, + decoration: InputDecoration.collapsed( + hintText: widget.placeholder, + hintStyle: style.copyWith(color: colors.textHint), + ), + ), + ); + } + + void _clear() { + _controller.clear(); + widget.onChanged?.call(''); + widget.onClear?.call(); + } + + Widget _icon( + BuildContext context, + String asset, + _InputMetrics metrics, + Color color, + ) { + return SizedBox( + width: metrics.iconSize, + height: metrics.iconSize, + child: widget.iconBuilder?.call(context, asset, metrics.iconSize, color), + ); + } + + EdgeInsets _padding(_InputMetrics metrics) { + // Рамка добавляется к размеру сверх отступов, поэтому отступ уменьшен на её + // толщину: иначе поле выходит на 2px выше макета. + final double vertical = metrics.paddingVertical - _border; + switch (widget.type) { + case PersonalizationInputFieldType.search: + return EdgeInsets.all(vertical); + case PersonalizationInputFieldType.input: + return EdgeInsets.symmetric( + vertical: vertical, + horizontal: metrics.paddingInput - _border, + ); + case PersonalizationInputFieldType.select: + return EdgeInsets.only( + left: metrics.paddingSelectStart - _border, + right: vertical, + top: vertical, + bottom: vertical, + ); + } + } +} + +const double _border = 1; + +class _InputMetrics { + const _InputMetrics({ + required this.fontSize, + required this.lineHeight, + required this.letterSpacing, + required this.radius, + required this.paddingVertical, + required this.paddingInput, + required this.paddingSelectStart, + required this.iconSize, + }); + + final double fontSize; + final double lineHeight; + final double letterSpacing; + final double radius; + final double paddingVertical; + + /// Горизонтальный отступ типа Input. У Search он равен вертикальному. + final double paddingInput; + + /// Отступ слева у типа Select. Справа там тоже вертикальный. + final double paddingSelectStart; + final double iconSize; +} + +// LG берёт кегль со ступени lg, а интерлиньяж со ступени xl: в макете 18/32, +// тогда как ступень lg — это 18/28. SM так же смешан: 14/24 против 14/20. +const Map _inputMetrics = + { + PersonalizationInputFieldSize.lg: _InputMetrics( + fontSize: 18, + lineHeight: 32, + letterSpacing: 0, + radius: 10, + paddingVertical: 12, + paddingInput: 16, + paddingSelectStart: 16, + iconSize: 32, + ), + PersonalizationInputFieldSize.md: _InputMetrics( + fontSize: 16, + lineHeight: 24, + letterSpacing: 0, + radius: 8, + paddingVertical: 8, + paddingInput: 12, + paddingSelectStart: 12, + iconSize: 24, + ), + // Радиус SM — 6, из переменной Button SM, а не 4 из общей шкалы: так в макете. + PersonalizationInputFieldSize.sm: _InputMetrics( + fontSize: 14, + lineHeight: 24, + letterSpacing: 0.05, + radius: 6, + paddingVertical: 4, + paddingInput: 12, + paddingSelectStart: 8, + iconSize: 24, + ), +}; diff --git a/lib/src/ui/components/personalization_list_label.dart b/lib/src/ui/components/personalization_list_label.dart new file mode 100644 index 0000000..dcd76e1 --- /dev/null +++ b/lib/src/ui/components/personalization_list_label.dart @@ -0,0 +1,31 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Подпись-разделитель списка. +/// +/// Источник: Figma Mobile SDK UI Kit, секция List (241:10565), символ Label (243:10967). +/// Единственное место в макете, где шрифт берётся из Font Family/Body, а не Heading. +/// Inter в SDK не поставляется, так что на отрисовку это пока не влияет. +/// +/// Текст переводится в верхний регистр самим компонентом — так задано в макете. +class PersonalizationListLabel extends StatelessWidget { + const PersonalizationListLabel({super.key, required this.label}); + + final String label; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + return Text( + label.toUpperCase(), + style: TextStyle( + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.05, + fontWeight: FontWeight.w400, + color: colors.textHint, + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_loader.dart b/lib/src/ui/components/personalization_loader.dart new file mode 100644 index 0000000..caa8ebd --- /dev/null +++ b/lib/src/ui/components/personalization_loader.dart @@ -0,0 +1,84 @@ +import 'dart:math' as math; + +import 'package:flutter/widgets.dart'; + +/// Индикатор загрузки дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Loader (296:3717). +/// Кольцо 26 с внешним радиусом 13 и толщиной 3.5, свип-градиент от прозрачного +/// к чёрному 47%, вращение против часовой стрелки. +/// +/// Градиент снят с растрового экспорта макета: в переменных Figma значение +/// `Gradient/Loader` приходит пустым. +class PersonalizationLoader extends StatefulWidget { + const PersonalizationLoader({ + super.key, + this.size = 26, + this.period = const Duration(milliseconds: 900), + }); + + final double size; + final Duration period; + + @override + State createState() => _PersonalizationLoaderState(); +} + +class _PersonalizationLoaderState extends State + with SingleTickerProviderStateMixin { + late final AnimationController _controller = AnimationController( + vsync: this, + duration: widget.period, + )..repeat(); + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + // Контейнер повторяет макет: вертикальные отступы 4, содержимое по центру. + return Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Center( + child: RotationTransition( + turns: _controller, + child: CustomPaint( + size: Size.square(widget.size), + painter: const _LoaderPainter(), + ), + ), + ), + ); + } +} + +class _LoaderPainter extends CustomPainter { + const _LoaderPainter(); + + @override + void paint(Canvas canvas, Size size) { + // Толщина и радиус пропорциональны эталонным 26 из макета. + final scale = size.width / 26; + final strokeWidth = 3.5 * scale; + final rect = Offset.zero & size; + final ring = rect.deflate(strokeWidth / 2); + + final paint = Paint() + ..style = PaintingStyle.stroke + ..strokeWidth = strokeWidth + ..strokeCap = StrokeCap.round + ..shader = const SweepGradient( + startAngle: 0, + endAngle: math.pi * 2, + colors: [Color(0x00000000), Color(0x78000000)], + ).createShader(ring); + + canvas.drawArc(ring, 0, math.pi * 2, false, paint); + } + + @override + bool shouldRepaint(_LoaderPainter oldDelegate) => false; +} diff --git a/lib/src/ui/components/personalization_rating.dart b/lib/src/ui/components/personalization_rating.dart new file mode 100644 index 0000000..6a1be7b --- /dev/null +++ b/lib/src/ui/components/personalization_rating.dart @@ -0,0 +1,86 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import '../personalization_icons.dart'; + +/// Рейтинг товара, короткая форма. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Rating (88:209), фрейм Product Short (237:4711). +/// Вариант Reviews меняет только данные и цвет звезды: без отзывов она серая. +/// +/// Внимание: типографика 16/20 — кегль со ступени base, интерлиньяж со ступени sm. +/// Ступень base — это 16/24, поэтому размеры заданы явно. +/// +/// Цвет заполненной звезды в макете не привязан к переменной, взят ближайший +/// существующий токен semanticWarning — его стоит подтвердить у дизайнера. +class PersonalizationRating extends StatelessWidget { + const PersonalizationRating({ + super.key, + required this.value, + required this.reviews, + this.iconBuilder, + }); + + /// Уже отформатированная оценка: в макете «4,7» с запятой. + final String value; + final int reviews; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + const double fontSize = 16; + final TextStyle base = TextStyle( + fontSize: fontSize, + height: 20 / fontSize, + letterSpacing: 0, + fontWeight: FontWeight.w400, + color: colors.textHint, + ); + final Color starColor = + reviews > 0 ? colors.semanticWarning : colors.lineGeneric; + + return Padding( + padding: const EdgeInsets.only(bottom: 4), + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + width: 20, + height: 20, + child: iconBuilder?.call( + context, + PersonalizationIcons.starFill, + 20, + starColor, + ), + ), + const SizedBox(width: 4), + Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + value, + style: base.copyWith( + fontWeight: FontWeight.w600, + color: colors.textSecondary, + ), + ), + const SizedBox(width: 2), + Text('($reviews)', style: base), + ], + ), + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_search_results_title.dart b/lib/src/ui/components/personalization_search_results_title.dart new file mode 100644 index 0000000..7b3d373 --- /dev/null +++ b/lib/src/ui/components/personalization_search_results_title.dart @@ -0,0 +1,169 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import '../personalization_icons.dart'; +import 'personalization_button.dart'; +import 'personalization_button_group.dart'; +import 'personalization_tag.dart'; +import 'personalization_title.dart'; + +/// Применённый фильтр: подпись и снятие по крестику. +class PersonalizationSearchFilter { + const PersonalizationSearchFilter({required this.label, required this.onRemove}); + + final String label; + final VoidCallback onRemove; +} + +/// Строка «найдено N товаров». Слова — параметры, локализация за интегратором. +class PersonalizationSearchResults { + const PersonalizationSearchResults({ + required this.prefix, + required this.count, + required this.suffix, + }); + + final String prefix; + final int count; + final String suffix; +} + +/// Заголовок выдачи поиска. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Title (167:3802), символ Search results (167:3807). +/// Три ряда: заголовок с кнопкой «назад» и переключателем вида, строка с фильтром, +/// сортировкой и числом найденного, ряд применённых фильтров-тегов. +/// Два нижних ряда в макете скрываемые (showResults, showFilters) — здесь они +/// прячутся сами, когда данных нет. +/// +/// Собран из готовых компонентов: [PersonalizationTitle], [PersonalizationButton], +/// [PersonalizationButtonGroup], [PersonalizationTag]. +class PersonalizationSearchResultsTitle extends StatelessWidget { + const PersonalizationSearchResultsTitle({ + super.key, + required this.title, + this.selectedViewIndex = 0, + this.onBack, + this.onViewChanged, + this.onFilters, + this.onSort, + this.results, + this.filters = const [], + this.iconBuilder, + }); + + final String title; + + /// Индекс выбранного вида выдачи: 0 — плитка, 1 — список. + final int selectedViewIndex; + final VoidCallback? onBack; + final ValueChanged? onViewChanged; + final VoidCallback? onFilters; + final VoidCallback? onSort; + final PersonalizationSearchResults? results; + final List filters; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final TextStyle regular = TextStyle( + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.05, + fontWeight: FontWeight.w400, + color: colors.textSecondary, + ); + final TextStyle strong = regular.copyWith(fontWeight: FontWeight.w600); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationTitle( + title: title, + leading: PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.arrowLeft, + iconBuilder: iconBuilder, + onPressed: onBack, + ), + trailing: PersonalizationButtonGroup( + items: const [ + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.grid2x2, + activeIcon: PersonalizationIcons.grid2x2Fill, + ), + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.list, + activeIcon: PersonalizationIcons.listFill, + ), + ], + selectedIndex: selectedViewIndex, + onSelected: onViewChanged, + iconBuilder: iconBuilder, + ), + ), + if (results != null) ...[ + const SizedBox(height: 8), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.equalizerHorizontal, + iconBuilder: iconBuilder, + onPressed: onFilters, + ), + const SizedBox(width: 4), + PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.arrowsUpDown, + iconBuilder: iconBuilder, + onPressed: onSort, + ), + const SizedBox(width: 12), + Text(results!.prefix, style: regular), + const SizedBox(width: 4), + Text('${results!.count}', style: strong), + const SizedBox(width: 4), + Text(results!.suffix, style: strong), + ], + ), + ], + if (filters.isNotEmpty) ...[ + const SizedBox(height: 8), + Wrap( + spacing: 4, + runSpacing: 4, + children: [ + for (final PersonalizationSearchFilter filter in filters) + PersonalizationTag( + label: filter.label, + view: PersonalizationTagView.secondary, + onRemove: filter.onRemove, + removeIconBuilder: iconBuilder == null + ? null + : (BuildContext context, String asset) => iconBuilder!( + context, + asset, + 16, + colors.textPrimary, + ), + ), + ], + ), + ], + ], + ); + } +} diff --git a/lib/src/ui/components/personalization_tag.dart b/lib/src/ui/components/personalization_tag.dart new file mode 100644 index 0000000..a179f3e --- /dev/null +++ b/lib/src/ui/components/personalization_tag.dart @@ -0,0 +1,85 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; +import '../personalization_icons.dart'; + +/// Вид тега. +enum PersonalizationTagView { primary, secondary } + +/// Тег дизайн-системы. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Tag (243:10993). +/// В макете только размер MD, поэтому размера в API нет. +/// +/// Крестик удаления отдаётся как путь к SVG-ассету в [iconAsset]: пакет не +/// рисует SVG сам, отрисовку выбирает потребитель. +class PersonalizationTag extends StatelessWidget { + const PersonalizationTag({ + super.key, + required this.label, + this.view = PersonalizationTagView.primary, + this.onRemove, + this.removeIconBuilder, + }); + + final String label; + final PersonalizationTagView view; + + /// Задан — тег показывает крестик и зовёт колбэк по нажатию. + final VoidCallback? onRemove; + + /// Как нарисовать крестик 16x16 из [iconAsset]. Не задан — место под иконку + /// остаётся пустым, но отступы сохраняются. + final Widget Function(BuildContext context, String asset)? removeIconBuilder; + + /// Ассет крестика для [removeIconBuilder]. + static const String iconAsset = PersonalizationIcons.cross; + + bool get _removable => onRemove != null; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + final isPrimary = view == PersonalizationTagView.primary; + + return Container( + padding: EdgeInsets.only( + left: 8, + right: _removable ? 4 : 8, + top: 4, + bottom: 4, + ), + decoration: BoxDecoration( + color: isPrimary ? colors.buttonPrimary : colors.buttonSecondary, + borderRadius: BorderRadius.circular(6), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + label, + style: TextStyle( + fontSize: 12, + height: 16 / 12, + letterSpacing: 0.05, + fontWeight: FontWeight.w400, + color: isPrimary ? colors.textLightPrimary : colors.textPrimary, + ), + ), + if (_removable) ...[ + const SizedBox(width: 4), + GestureDetector( + onTap: onRemove, + child: SizedBox( + width: 16, + height: 16, + child: removeIconBuilder?.call(context, iconAsset), + ), + ), + ], + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_title.dart b/lib/src/ui/components/personalization_title.dart new file mode 100644 index 0000000..b8bbd3a --- /dev/null +++ b/lib/src/ui/components/personalization_title.dart @@ -0,0 +1,48 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_colors.dart'; + +/// Заголовок блока. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Title (167:3802). +/// Все четыре заголовка на странице — один и тот же ряд «слева иконка, заголовок, +/// справа управление», отличается только содержимое по краям: +/// Recommender block (157:5176) — кнопка «Show all», Category (167:3812) — группа кнопок, +/// Filters (204:8340) — кнопка-крестик, Search results (167:3807) — кнопка «назад» и группа. +/// Поэтому края здесь — произвольные виджеты, а не фиксированные варианты. +class PersonalizationTitle extends StatelessWidget { + const PersonalizationTitle({ + super.key, + required this.title, + this.leading, + this.trailing, + }); + + final String title; + final Widget? leading; + final Widget? trailing; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationColors.of(context); + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (leading != null) ...[leading!, const SizedBox(width: 4)], + Expanded( + child: Text( + title, + style: TextStyle( + fontSize: 24, + height: 36 / 24, + letterSpacing: 0, + fontWeight: FontWeight.w600, + color: colors.textPrimary, + ), + ), + ), + if (trailing != null) ...[const SizedBox(width: 4), trailing!], + ], + ); + } +} diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart new file mode 100644 index 0000000..9b8502d --- /dev/null +++ b/lib/src/ui/personalization_colors.dart @@ -0,0 +1,292 @@ +import 'package:flutter/material.dart'; + +/// Цвета дизайн-системы. +/// +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Colors, +/// фреймы 57:141 (Light) и 187:362 (Dark). Снято 2026-09-09. +/// +/// Подключается к теме хоста как расширение: +/// ```dart +/// ThemeData(extensions: [PersonalizationColors.light]) +/// ThemeData.dark().copyWith(extensions: [PersonalizationColors.dark]) +/// ``` +/// и читается через `Theme.of(context).extension()`. +@immutable +class PersonalizationColors extends ThemeExtension { + final Color brandPrimary; + final Color semanticWarning; + final Color backgroundPrimary; + final Color backgroundGeneric; + final Color backgroundCard; + final Color backgroundInput; + final Color backgroundTransparent; + final Color backgroundInputDisabled; + final Color buttonPrimary; + final Color buttonPrimaryFocus; + final Color buttonSecondary; + final Color buttonSecondaryFocus; + final Color buttonPrimaryDisabled; + final Color buttonSecondaryDisabled; + final Color buttonGhost; + final Color lineBrand; + final Color lineGeneric; + final Color lineGenericSubtle; + final Color lineInput; + final Color lineInputFocus; + final Color textPrimary; + final Color textSecondary; + final Color textHint; + final Color textDarkPrimary; + final Color textDarkSecondary; + final Color textDarkHint; + final Color textLightPrimary; + final Color textLightSecondary; + final Color textLightHint; + final Color textInvertedPrimary; + final Color textInvertedSecondary; + final Color textInvertedHint; + final Color textBrand; + final Color textLink; + final Color textLinkVisited; + + const PersonalizationColors({ + required this.brandPrimary, + required this.semanticWarning, + required this.backgroundPrimary, + required this.backgroundGeneric, + required this.backgroundCard, + required this.backgroundInput, + required this.backgroundTransparent, + required this.backgroundInputDisabled, + required this.buttonPrimary, + required this.buttonPrimaryFocus, + required this.buttonSecondary, + required this.buttonSecondaryFocus, + required this.buttonPrimaryDisabled, + required this.buttonSecondaryDisabled, + required this.buttonGhost, + required this.lineBrand, + required this.lineGeneric, + required this.lineGenericSubtle, + required this.lineInput, + required this.lineInputFocus, + required this.textPrimary, + required this.textSecondary, + required this.textHint, + required this.textDarkPrimary, + required this.textDarkSecondary, + required this.textDarkHint, + required this.textLightPrimary, + required this.textLightSecondary, + required this.textLightHint, + required this.textInvertedPrimary, + required this.textInvertedSecondary, + required this.textInvertedHint, + required this.textBrand, + required this.textLink, + required this.textLinkVisited, + }); + + static const PersonalizationColors light = PersonalizationColors( + brandPrimary: Color(0xFF007DF2), + semanticWarning: Color(0xFFF37A17), + backgroundPrimary: Color(0xFF007DF2), + backgroundGeneric: Color(0xFFFAFAFA), + backgroundCard: Color(0xFFF2F2F2), + backgroundInput: Color(0xFFFAFAFA), + backgroundTransparent: Color(0x00FFFFFF), + backgroundInputDisabled: Color(0x0D000000), + buttonPrimary: Color(0xFF007DF2), + buttonPrimaryFocus: Color(0xFF004BC0), + buttonSecondary: Color(0x0D000000), + buttonSecondaryFocus: Color(0x1A000000), + buttonPrimaryDisabled: Color(0xFF32AFFF), + buttonSecondaryDisabled: Color(0x0D000000), + buttonGhost: Color(0x00FFFFFF), + lineBrand: Color(0xFF007DF2), + lineGeneric: Color(0x33000000), + lineGenericSubtle: Color(0x0D000000), + lineInput: Color(0x33000000), + lineInputFocus: Color(0xFF007DF2), + textPrimary: Color(0xFF000000), + textSecondary: Color(0xB2000000), + textHint: Color(0x66000000), + textDarkPrimary: Color(0xFF000000), + textDarkSecondary: Color(0xB2000000), + textDarkHint: Color(0x66000000), + textLightPrimary: Color(0xFFFFFFFF), + textLightSecondary: Color(0xCCFFFFFF), + textLightHint: Color(0x80FFFFFF), + textInvertedPrimary: Color(0xFFFFFFFF), + textInvertedSecondary: Color(0xCCFFFFFF), + textInvertedHint: Color(0x80FFFFFF), + textBrand: Color(0xFF007DF2), + textLink: Color(0xFF007DF2), + textLinkVisited: Color(0xFF4D00F2), + ); + + static const PersonalizationColors dark = PersonalizationColors( + brandPrimary: Color(0xFF007DF2), + semanticWarning: Color(0xFFF37A17), + backgroundPrimary: Color(0xFF007DF2), + backgroundGeneric: Color(0xFF141414), + backgroundCard: Color(0xFF0D0D0D), + backgroundInput: Color(0xFF141414), + backgroundTransparent: Color(0x00FFFFFF), + backgroundInputDisabled: Color(0x0DFFFFFF), + buttonPrimary: Color(0xFF007DF2), + buttonPrimaryFocus: Color(0xFF32AFFF), + buttonSecondary: Color(0x0DFFFFFF), + buttonSecondaryFocus: Color(0x1AFFFFFF), + buttonPrimaryDisabled: Color(0xFF32AFFF), + buttonSecondaryDisabled: Color(0x0DFFFFFF), + buttonGhost: Color(0x00FFFFFF), + lineBrand: Color(0xFF007DF2), + lineGeneric: Color(0x33FFFFFF), + lineGenericSubtle: Color(0x0DFFFFFF), + lineInput: Color(0x33FFFFFF), + lineInputFocus: Color(0xFF007DF2), + textPrimary: Color(0xFFFFFFFF), + textSecondary: Color(0xCCFFFFFF), + textHint: Color(0x80FFFFFF), + textDarkPrimary: Color(0xFF000000), + textDarkSecondary: Color(0xB2000000), + textDarkHint: Color(0x66000000), + textLightPrimary: Color(0xFFFFFFFF), + textLightSecondary: Color(0xCCFFFFFF), + textLightHint: Color(0x80FFFFFF), + textInvertedPrimary: Color(0xFF000000), + textInvertedSecondary: Color(0xB2000000), + textInvertedHint: Color(0x66000000), + textBrand: Color(0xFF007DF2), + textLink: Color(0xFF007DF2), + textLinkVisited: Color(0xFF4D00F2), + ); + + /// Набор из темы хоста. Если расширение не подключено к ThemeData, + /// возвращается светлый — чтобы компоненты не падали на голой теме. + static PersonalizationColors of(BuildContext context) => + Theme.of(context).extension() ?? light; + + @override + PersonalizationColors copyWith({ + Color? brandPrimary, + Color? semanticWarning, + Color? backgroundPrimary, + Color? backgroundGeneric, + Color? backgroundCard, + Color? backgroundInput, + Color? backgroundTransparent, + Color? backgroundInputDisabled, + Color? buttonPrimary, + Color? buttonPrimaryFocus, + Color? buttonSecondary, + Color? buttonSecondaryFocus, + Color? buttonPrimaryDisabled, + Color? buttonSecondaryDisabled, + Color? buttonGhost, + Color? lineBrand, + Color? lineGeneric, + Color? lineGenericSubtle, + Color? lineInput, + Color? lineInputFocus, + Color? textPrimary, + Color? textSecondary, + Color? textHint, + Color? textDarkPrimary, + Color? textDarkSecondary, + Color? textDarkHint, + Color? textLightPrimary, + Color? textLightSecondary, + Color? textLightHint, + Color? textInvertedPrimary, + Color? textInvertedSecondary, + Color? textInvertedHint, + Color? textBrand, + Color? textLink, + Color? textLinkVisited, + }) { + return PersonalizationColors( + brandPrimary: brandPrimary ?? this.brandPrimary, + semanticWarning: semanticWarning ?? this.semanticWarning, + backgroundPrimary: backgroundPrimary ?? this.backgroundPrimary, + backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, + backgroundCard: backgroundCard ?? this.backgroundCard, + backgroundInput: backgroundInput ?? this.backgroundInput, + backgroundTransparent: backgroundTransparent ?? this.backgroundTransparent, + backgroundInputDisabled: backgroundInputDisabled ?? this.backgroundInputDisabled, + buttonPrimary: buttonPrimary ?? this.buttonPrimary, + buttonPrimaryFocus: buttonPrimaryFocus ?? this.buttonPrimaryFocus, + buttonSecondary: buttonSecondary ?? this.buttonSecondary, + buttonSecondaryFocus: buttonSecondaryFocus ?? this.buttonSecondaryFocus, + buttonPrimaryDisabled: buttonPrimaryDisabled ?? this.buttonPrimaryDisabled, + buttonSecondaryDisabled: buttonSecondaryDisabled ?? this.buttonSecondaryDisabled, + buttonGhost: buttonGhost ?? this.buttonGhost, + lineBrand: lineBrand ?? this.lineBrand, + lineGeneric: lineGeneric ?? this.lineGeneric, + lineGenericSubtle: lineGenericSubtle ?? this.lineGenericSubtle, + lineInput: lineInput ?? this.lineInput, + lineInputFocus: lineInputFocus ?? this.lineInputFocus, + textPrimary: textPrimary ?? this.textPrimary, + textSecondary: textSecondary ?? this.textSecondary, + textHint: textHint ?? this.textHint, + textDarkPrimary: textDarkPrimary ?? this.textDarkPrimary, + textDarkSecondary: textDarkSecondary ?? this.textDarkSecondary, + textDarkHint: textDarkHint ?? this.textDarkHint, + textLightPrimary: textLightPrimary ?? this.textLightPrimary, + textLightSecondary: textLightSecondary ?? this.textLightSecondary, + textLightHint: textLightHint ?? this.textLightHint, + textInvertedPrimary: textInvertedPrimary ?? this.textInvertedPrimary, + textInvertedSecondary: textInvertedSecondary ?? this.textInvertedSecondary, + textInvertedHint: textInvertedHint ?? this.textInvertedHint, + textBrand: textBrand ?? this.textBrand, + textLink: textLink ?? this.textLink, + textLinkVisited: textLinkVisited ?? this.textLinkVisited, + ); + } + + @override + PersonalizationColors lerp( + ThemeExtension? other, + double t, + ) { + if (other is! PersonalizationColors) return this; + return PersonalizationColors( + brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, + semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, + backgroundPrimary: Color.lerp(backgroundPrimary, other.backgroundPrimary, t)!, + backgroundGeneric: Color.lerp(backgroundGeneric, other.backgroundGeneric, t)!, + backgroundCard: Color.lerp(backgroundCard, other.backgroundCard, t)!, + backgroundInput: Color.lerp(backgroundInput, other.backgroundInput, t)!, + backgroundTransparent: Color.lerp(backgroundTransparent, other.backgroundTransparent, t)!, + backgroundInputDisabled: Color.lerp(backgroundInputDisabled, other.backgroundInputDisabled, t)!, + buttonPrimary: Color.lerp(buttonPrimary, other.buttonPrimary, t)!, + buttonPrimaryFocus: Color.lerp(buttonPrimaryFocus, other.buttonPrimaryFocus, t)!, + buttonSecondary: Color.lerp(buttonSecondary, other.buttonSecondary, t)!, + buttonSecondaryFocus: Color.lerp(buttonSecondaryFocus, other.buttonSecondaryFocus, t)!, + buttonPrimaryDisabled: Color.lerp(buttonPrimaryDisabled, other.buttonPrimaryDisabled, t)!, + buttonSecondaryDisabled: Color.lerp(buttonSecondaryDisabled, other.buttonSecondaryDisabled, t)!, + buttonGhost: Color.lerp(buttonGhost, other.buttonGhost, t)!, + lineBrand: Color.lerp(lineBrand, other.lineBrand, t)!, + lineGeneric: Color.lerp(lineGeneric, other.lineGeneric, t)!, + lineGenericSubtle: Color.lerp(lineGenericSubtle, other.lineGenericSubtle, t)!, + lineInput: Color.lerp(lineInput, other.lineInput, t)!, + lineInputFocus: Color.lerp(lineInputFocus, other.lineInputFocus, t)!, + textPrimary: Color.lerp(textPrimary, other.textPrimary, t)!, + textSecondary: Color.lerp(textSecondary, other.textSecondary, t)!, + textHint: Color.lerp(textHint, other.textHint, t)!, + textDarkPrimary: Color.lerp(textDarkPrimary, other.textDarkPrimary, t)!, + textDarkSecondary: Color.lerp(textDarkSecondary, other.textDarkSecondary, t)!, + textDarkHint: Color.lerp(textDarkHint, other.textDarkHint, t)!, + textLightPrimary: Color.lerp(textLightPrimary, other.textLightPrimary, t)!, + textLightSecondary: Color.lerp(textLightSecondary, other.textLightSecondary, t)!, + textLightHint: Color.lerp(textLightHint, other.textLightHint, t)!, + textInvertedPrimary: Color.lerp(textInvertedPrimary, other.textInvertedPrimary, t)!, + textInvertedSecondary: Color.lerp(textInvertedSecondary, other.textInvertedSecondary, t)!, + textInvertedHint: Color.lerp(textInvertedHint, other.textInvertedHint, t)!, + textBrand: Color.lerp(textBrand, other.textBrand, t)!, + textLink: Color.lerp(textLink, other.textLink, t)!, + textLinkVisited: Color.lerp(textLinkVisited, other.textLinkVisited, t)!, + ); + } +} diff --git a/lib/src/ui/personalization_elevation.dart b/lib/src/ui/personalization_elevation.dart new file mode 100644 index 0000000..8e750d4 --- /dev/null +++ b/lib/src/ui/personalization_elevation.dart @@ -0,0 +1,78 @@ +import 'package:flutter/painting.dart'; + +/// Высоты дизайн-системы. +/// +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. +/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// +/// Единственная платформа, где обе тени макета ложатся без потерь: +/// [BoxShadow] складывается списком. +abstract final class PersonalizationElevation { + /// None + static const List none = []; + /// Elevation 1 + static const List e1 = [ + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 2), + blurRadius: 4, + ), + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 1), + blurRadius: 2, + ), + ]; + /// Elevation 2 + static const List e2 = [ + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 6), + blurRadius: 8, + ), + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 3), + blurRadius: 6, + ), + ]; + /// Elevation 3 + static const List e3 = [ + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 10), + blurRadius: 10, + ), + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 3), + blurRadius: 6, + ), + ]; + /// Elevation 4 + static const List e4 = [ + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 15), + blurRadius: 15, + ), + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 4), + blurRadius: 8, + ), + ]; + /// Elevation 5 + static const List e5 = [ + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 23), + blurRadius: 23, + ), + BoxShadow( + color: Color(0x14000000), // чёрный, 0.08 + offset: Offset(0, 6), + blurRadius: 13, + ), + ]; +} diff --git a/lib/src/ui/personalization_icons.dart b/lib/src/ui/personalization_icons.dart new file mode 100644 index 0000000..359889f --- /dev/null +++ b/lib/src/ui/personalization_icons.dart @@ -0,0 +1,45 @@ +/// Пути к иконкам дизайн-системы внутри пакета. +/// +/// Источник: Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), +/// страница Icons, секция 157:5185. +/// +/// Ассеты в формате SVG: Flutter не рисует его без сторонней библиотеки, +/// поэтому пакет отдаёт только пути, а отрисовка остаётся за потребителем +/// (например flutter_svg). Зависимостей это не добавляет. +abstract final class PersonalizationIcons { + static const String angleDown = 'packages/rees46_sdk/assets/icons/angle-down.svg'; + static const String angleLargeRight = 'packages/rees46_sdk/assets/icons/angle-large-right.svg'; + static const String angleUp = 'packages/rees46_sdk/assets/icons/angle-up.svg'; + static const String arrowLeft = 'packages/rees46_sdk/assets/icons/arrow-left.svg'; + static const String arrowsUpDown = 'packages/rees46_sdk/assets/icons/arrows-up-down.svg'; + static const String copy = 'packages/rees46_sdk/assets/icons/copy.svg'; + static const String crossLarge = 'packages/rees46_sdk/assets/icons/cross-large.svg'; + static const String cross = 'packages/rees46_sdk/assets/icons/cross.svg'; + static const String equalizerHorizontal = 'packages/rees46_sdk/assets/icons/equalizer-horizontal.svg'; + static const String grid2x2Fill = 'packages/rees46_sdk/assets/icons/grid-2x2-fill.svg'; + static const String grid2x2 = 'packages/rees46_sdk/assets/icons/grid-2x2.svg'; + static const String listFill = 'packages/rees46_sdk/assets/icons/list-fill.svg'; + static const String list = 'packages/rees46_sdk/assets/icons/list.svg'; + static const String magnifier = 'packages/rees46_sdk/assets/icons/magnifier.svg'; + static const String spacingMd = 'packages/rees46_sdk/assets/icons/spacing-md.svg'; + static const String starFill = 'packages/rees46_sdk/assets/icons/star-fill.svg'; + + static const List all = [ + angleDown, + angleLargeRight, + angleUp, + arrowLeft, + arrowsUpDown, + copy, + crossLarge, + cross, + equalizerHorizontal, + grid2x2Fill, + grid2x2, + listFill, + list, + magnifier, + spacingMd, + starFill, + ]; +} diff --git a/lib/src/ui/personalization_radius.dart b/lib/src/ui/personalization_radius.dart new file mode 100644 index 0000000..7f59cdf --- /dev/null +++ b/lib/src/ui/personalization_radius.dart @@ -0,0 +1,30 @@ +/// Радиусы скругления дизайн-системы. +/// +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. +/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// +/// `rounded` — pill: значение заведомо больше любой стороны. +abstract final class PersonalizationRadius { + /// XS + static const double xs = 2; + /// SM + static const double sm = 4; + /// MD + static const double md = 6; + /// LG + static const double lg = 8; + /// XL + static const double xl = 10; + /// 2XL + static const double xl2 = 12; + /// 3XL + static const double xl3 = 14; + /// 4XL + static const double xl4 = 16; + /// 5XL + static const double xl5 = 20; + /// 6XL + static const double xl6 = 24; + /// Rounded + static const double rounded = 999; +} diff --git a/lib/src/ui/personalization_spacing.dart b/lib/src/ui/personalization_spacing.dart new file mode 100644 index 0000000..6d9a7d6 --- /dev/null +++ b/lib/src/ui/personalization_spacing.dart @@ -0,0 +1,26 @@ +/// Отступы дизайн-системы. +/// +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. +/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// +/// Шкала независима от типографической: здесь MD вместо Base и нет 6XL. +abstract final class PersonalizationSpacing { + /// XS + static const double xs = 2; + /// SM + static const double sm = 4; + /// MD + static const double md = 8; + /// LG + static const double lg = 12; + /// XL + static const double xl = 16; + /// 2XL + static const double xl2 = 24; + /// 3XL + static const double xl3 = 32; + /// 4XL + static const double xl4 = 48; + /// 5XL + static const double xl5 = 64; +} diff --git a/lib/src/ui/personalization_typography.dart b/lib/src/ui/personalization_typography.dart new file mode 100644 index 0000000..6518b0c --- /dev/null +++ b/lib/src/ui/personalization_typography.dart @@ -0,0 +1,143 @@ +import 'package:flutter/widgets.dart'; + +/// Типографика дизайн-системы. +/// +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. +/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// +/// Inter в SDK не поставляется — `fontFamily` не задан, берётся системный. +/// `height` — отношение интерлиньяжа к кеглю, как того требует [TextStyle]. +abstract final class PersonalizationTypography { + // XS — 12/16 + static const TextStyle xsDefault = TextStyle( + fontSize: 12, + height: 1.3333, // 16 / 12 + fontWeight: FontWeight.w400, + letterSpacing: 0.05, + ); + static const TextStyle xsEmphasized = TextStyle( + fontSize: 12, + height: 1.3333, // 16 / 12 + fontWeight: FontWeight.w600, + letterSpacing: 0.05, + ); + + // SM — 14/20 + static const TextStyle smDefault = TextStyle( + fontSize: 14, + height: 1.4286, // 20 / 14 + fontWeight: FontWeight.w400, + letterSpacing: 0.05, + ); + static const TextStyle smEmphasized = TextStyle( + fontSize: 14, + height: 1.4286, // 20 / 14 + fontWeight: FontWeight.w600, + letterSpacing: 0.05, + ); + + // Base — 16/24 + static const TextStyle baseDefault = TextStyle( + fontSize: 16, + height: 1.5000, // 24 / 16 + fontWeight: FontWeight.w400, + ); + static const TextStyle baseEmphasized = TextStyle( + fontSize: 16, + height: 1.5000, // 24 / 16 + fontWeight: FontWeight.w600, + ); + + // LG — 18/28 + static const TextStyle lgDefault = TextStyle( + fontSize: 18, + height: 1.5556, // 28 / 18 + fontWeight: FontWeight.w400, + ); + static const TextStyle lgEmphasized = TextStyle( + fontSize: 18, + height: 1.5556, // 28 / 18 + fontWeight: FontWeight.w600, + ); + + // XL — 20/32 + static const TextStyle xlDefault = TextStyle( + fontSize: 20, + height: 1.6000, // 32 / 20 + fontWeight: FontWeight.w400, + ); + static const TextStyle xlEmphasized = TextStyle( + fontSize: 20, + height: 1.6000, // 32 / 20 + fontWeight: FontWeight.w600, + ); + + // 2XL — 24/36 + static const TextStyle xl2Default = TextStyle( + fontSize: 24, + height: 1.5000, // 36 / 24 + fontWeight: FontWeight.w400, + ); + static const TextStyle xl2Emphasized = TextStyle( + fontSize: 24, + height: 1.5000, // 36 / 24 + fontWeight: FontWeight.w600, + ); + + // 3XL — 30/40 + static const TextStyle xl3Default = TextStyle( + fontSize: 30, + height: 1.3333, // 40 / 30 + fontWeight: FontWeight.w400, + letterSpacing: -0.5, + ); + static const TextStyle xl3Emphasized = TextStyle( + fontSize: 30, + height: 1.3333, // 40 / 30 + fontWeight: FontWeight.w600, + letterSpacing: -0.5, + ); + + // 4XL — 36/52 + static const TextStyle xl4Default = TextStyle( + fontSize: 36, + height: 1.4444, // 52 / 36 + fontWeight: FontWeight.w400, + letterSpacing: -0.5, + ); + static const TextStyle xl4Emphasized = TextStyle( + fontSize: 36, + height: 1.4444, // 52 / 36 + fontWeight: FontWeight.w600, + letterSpacing: -0.5, + ); + + // 5XL — 48/64 + static const TextStyle xl5Default = TextStyle( + fontSize: 48, + height: 1.3333, // 64 / 48 + fontWeight: FontWeight.w400, + letterSpacing: -0.5, + ); + static const TextStyle xl5Emphasized = TextStyle( + fontSize: 48, + height: 1.3333, // 64 / 48 + fontWeight: FontWeight.w600, + letterSpacing: -0.5, + ); + + // 6XL — 60/72 + static const TextStyle xl6Default = TextStyle( + fontSize: 60, + height: 1.2000, // 72 / 60 + fontWeight: FontWeight.w400, + letterSpacing: -0.5, + ); + static const TextStyle xl6Emphasized = TextStyle( + fontSize: 60, + height: 1.2000, // 72 / 60 + fontWeight: FontWeight.w600, + letterSpacing: -0.5, + ); + +} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index c85c43d..be3a3aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,6 +43,11 @@ flutter: ios: pluginClass: Rees46FlutterSdkPlugin + # Иконки дизайн-системы. Отдаются как ассеты пакета: Flutter не рисует SVG + # без сторонней библиотеки, поэтому отрисовка остаётся за потребителем. + assets: + - assets/icons/ + # To add assets to your plugin package, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg From 9833d40d0fc221dd5e9891c8cc2d6bae3d594de7 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 14 Sep 2026 12:22:45 +0400 Subject: [PATCH 02/79] feat(ui): PersonalizationTheme extension so a host can rebrand the design system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One ThemeExtension now carries colours, radii and the font family, registered on ThemeData like any other and overridable per subtree through Theme(data:) — which is what a multi-shop app needs when two shops carry different branding. PersonalizationColors stops being an extension of its own and becomes a field of the theme; its of(context) delegates, so the widgets did not need to change how they read colours. Radii leave the widgets as literals. Where a widget keeps its metrics in a const table the table cannot see the theme, so it holds a PersonalizationRadiusToken and the value is resolved at build. The checkbox painter takes the radius as a field and repaints when it changes. The font was not a token until now — every TextStyle hardcoded a weight and left the family to the platform. Every style now asks the theme for a family and package per weight: the SDK does not bundle Inter, a host names its own. Spacing, elevation and the type scale stay constants on purpose: they are the layout of the design file, not its branding. --- lib/rees46_sdk.dart | 1 + .../components/personalization_accordion.dart | 7 +- .../ui/components/personalization_badge.dart | 18 +- .../ui/components/personalization_button.dart | 16 +- .../personalization_button_group.dart | 22 ++- .../components/personalization_checkbox.dart | 18 +- .../personalization_checkbox_with_label.dart | 7 +- .../ui/components/personalization_count.dart | 9 +- .../ui/components/personalization_dots.dart | 5 +- .../personalization_empty_state.dart | 7 +- .../personalization_input_field.dart | 16 +- .../personalization_list_label.dart | 7 +- .../ui/components/personalization_rating.dart | 9 +- .../personalization_search_results_title.dart | 7 +- .../ui/components/personalization_tag.dart | 11 +- .../ui/components/personalization_title.dart | 7 +- lib/src/ui/personalization_colors.dart | 26 +-- lib/src/ui/personalization_theme.dart | 157 ++++++++++++++++++ 18 files changed, 280 insertions(+), 70 deletions(-) create mode 100644 lib/src/ui/personalization_theme.dart diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index a63eb19..23a3b1f 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -25,6 +25,7 @@ export 'src/ui/personalization_radius.dart'; export 'src/ui/personalization_elevation.dart'; export 'src/ui/personalization_icons.dart'; export 'src/ui/personalization_colors.dart'; +export 'src/ui/personalization_theme.dart'; export 'src/ui/components/personalization_badge.dart'; export 'src/ui/components/personalization_tag.dart'; export 'src/ui/components/personalization_checkbox.dart'; diff --git a/lib/src/ui/components/personalization_accordion.dart b/lib/src/ui/components/personalization_accordion.dart index 6665a7e..6b8fc55 100644 --- a/lib/src/ui/components/personalization_accordion.dart +++ b/lib/src/ui/components/personalization_accordion.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import '../personalization_icons.dart'; /// Строка-аккордеон списка. @@ -36,12 +36,15 @@ class PersonalizationAccordion extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final style = TextStyle( fontSize: 16, height: 24 / 16, letterSpacing: 0, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textPrimary, ); final asset = diff --git a/lib/src/ui/components/personalization_badge.dart b/lib/src/ui/components/personalization_badge.dart index a6e9190..d37dfe7 100644 --- a/lib/src/ui/components/personalization_badge.dart +++ b/lib/src/ui/components/personalization_badge.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Размер бейджа. enum PersonalizationBadgeSize { sm, md, lg } @@ -24,18 +24,22 @@ class PersonalizationBadge extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final (padH, padV, radius, fontSize, lineHeight) = switch (size) { - PersonalizationBadgeSize.lg => (12.0, 8.0, 10.0, 20.0, 24.0), - PersonalizationBadgeSize.md => (8.0, 4.0, 8.0, 16.0, 20.0), - PersonalizationBadgeSize.sm => (4.0, 2.0, 6.0, 14.0, 16.0), + PersonalizationBadgeSize.lg => + (12.0, 8.0, PersonalizationRadiusToken.xl, 20.0, 24.0), + PersonalizationBadgeSize.md => + (8.0, 4.0, PersonalizationRadiusToken.lg, 16.0, 20.0), + PersonalizationBadgeSize.sm => + (4.0, 2.0, PersonalizationRadiusToken.md, 14.0, 16.0), }; return Container( padding: EdgeInsets.symmetric(horizontal: padH, vertical: padV), decoration: BoxDecoration( color: colors.semanticWarning, - borderRadius: BorderRadius.circular(radius), + borderRadius: BorderRadius.circular(theme.radius.resolve(radius)), ), child: Text( label, @@ -43,6 +47,8 @@ class PersonalizationBadge extends StatelessWidget { fontSize: fontSize, height: lineHeight / fontSize, fontWeight: FontWeight.w600, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, color: colors.textLightPrimary, ), ), diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart index 3523f87..390216e 100644 --- a/lib/src/ui/components/personalization_button.dart +++ b/lib/src/ui/components/personalization_button.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Размер кнопки. enum PersonalizationButtonSize { lg, md, sm } @@ -65,7 +66,8 @@ class _PersonalizationButtonState extends State { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final metrics = _metrics[widget.size]!; final foreground = _foreground(colors); @@ -80,6 +82,8 @@ class _PersonalizationButtonState extends State { height: metrics.lineHeight / metrics.fontSize, letterSpacing: metrics.letterSpacing, fontWeight: FontWeight.w600, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, color: foreground, ), ), @@ -95,7 +99,7 @@ class _PersonalizationButtonState extends State { padding: _padding(metrics), decoration: BoxDecoration( color: _background(colors), - borderRadius: BorderRadius.circular(metrics.radius), + borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), ), child: Row( mainAxisSize: MainAxisSize.min, @@ -189,7 +193,7 @@ class _ButtonMetrics { final double fontSize; final double lineHeight; final double letterSpacing; - final double radius; + final PersonalizationRadiusToken radius; final double paddingVertical; /// Горизонтальный отступ со стороны без иконки. @@ -206,7 +210,7 @@ const Map _metrics = fontSize: 20, lineHeight: 32, letterSpacing: 0, - radius: 10, + radius: PersonalizationRadiusToken.xl, paddingVertical: 12, paddingWide: 24, paddingNarrow: 16, @@ -216,7 +220,7 @@ const Map _metrics = fontSize: 16, lineHeight: 24, letterSpacing: 0, - radius: 8, + radius: PersonalizationRadiusToken.lg, paddingVertical: 8, paddingWide: 16, paddingNarrow: 12, @@ -228,7 +232,7 @@ const Map _metrics = fontSize: 14, lineHeight: 24, letterSpacing: 0.05, - radius: 4, + radius: PersonalizationRadiusToken.sm, paddingVertical: 4, paddingWide: 12, paddingNarrow: 8, diff --git a/lib/src/ui/components/personalization_button_group.dart b/lib/src/ui/components/personalization_button_group.dart index 8bc492b..c86fe6e 100644 --- a/lib/src/ui/components/personalization_button_group.dart +++ b/lib/src/ui/components/personalization_button_group.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Размер группы кнопок. enum PersonalizationButtonGroupSize { md, sm } @@ -51,7 +51,8 @@ class PersonalizationButtonGroup extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final metrics = _groupMetrics[size]!; final side = metrics.iconSize + metrics.padding * 2; @@ -59,14 +60,16 @@ class PersonalizationButtonGroup extends StatelessWidget { padding: const EdgeInsets.all(2), decoration: BoxDecoration( color: colors.buttonSecondary, - borderRadius: BorderRadius.circular(8), + borderRadius: BorderRadius.circular( + theme.radius.resolve(PersonalizationRadiusToken.lg), + ), ), child: Row( mainAxisSize: MainAxisSize.min, children: [ for (int index = 0; index < items.length; index++) ...[ if (index > 0) const SizedBox(width: 2), - _segment(context, colors, metrics, side, index), + _segment(context, theme, metrics, side, index), ], ], ), @@ -75,11 +78,12 @@ class PersonalizationButtonGroup extends StatelessWidget { Widget _segment( BuildContext context, - PersonalizationColors colors, + PersonalizationTheme theme, _GroupMetrics metrics, double side, int index, ) { + final colors = theme.colors; final item = items[index]; final active = index == selectedIndex; final asset = active ? (item.activeIcon ?? item.icon) : item.icon; @@ -93,7 +97,7 @@ class PersonalizationButtonGroup extends StatelessWidget { alignment: Alignment.center, decoration: BoxDecoration( color: active ? colors.buttonPrimary : colors.backgroundTransparent, - borderRadius: BorderRadius.circular(metrics.radius), + borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), ), child: SizedBox( width: metrics.iconSize, @@ -112,7 +116,7 @@ class _GroupMetrics { required this.iconSize, }); - final double radius; + final PersonalizationRadiusToken radius; /// Отступ сегмента: 6 в MD и 2 в SM, обоих значений нет в шкале спейсингов. final double padding; @@ -122,7 +126,7 @@ class _GroupMetrics { const Map _groupMetrics = { PersonalizationButtonGroupSize.md: - _GroupMetrics(radius: 6, padding: 6, iconSize: 24), + _GroupMetrics(radius: PersonalizationRadiusToken.md, padding: 6, iconSize: 24), PersonalizationButtonGroupSize.sm: - _GroupMetrics(radius: 4, padding: 2, iconSize: 20), + _GroupMetrics(radius: PersonalizationRadiusToken.sm, padding: 2, iconSize: 20), }; diff --git a/lib/src/ui/components/personalization_checkbox.dart b/lib/src/ui/components/personalization_checkbox.dart index ab4ee4e..100d82e 100644 --- a/lib/src/ui/components/personalization_checkbox.dart +++ b/lib/src/ui/components/personalization_checkbox.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Состояние чекбокса. enum PersonalizationCheckboxState { unchecked, checked, indeterminate } @@ -30,7 +30,8 @@ class PersonalizationCheckbox extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final isFilled = state != PersonalizationCheckboxState.unchecked; final Widget box = CustomPaint( @@ -42,6 +43,7 @@ class PersonalizationCheckbox extends StatelessWidget { : (disabled ? colors.backgroundInputDisabled : colors.backgroundInput), border: isFilled ? null : colors.lineInput, glyph: colors.textLightPrimary, + radius: theme.radius.resolve(PersonalizationRadiusToken.sm), ), ); @@ -64,17 +66,19 @@ class _CheckboxPainter extends CustomPainter { required this.fill, required this.border, required this.glyph, + required this.radius, }); final PersonalizationCheckboxState state; final Color fill; final Color? border; final Color glyph; + final double radius; @override void paint(Canvas canvas, Size size) { final rect = Offset.zero & size; - final rrect = RRect.fromRectAndRadius(rect, const Radius.circular(4)); + final rrect = RRect.fromRectAndRadius(rect, Radius.circular(radius)); canvas.drawRRect(rrect, Paint()..color = fill); @@ -82,7 +86,7 @@ class _CheckboxPainter extends CustomPainter { // Рамка внутрь, чтобы внешний размер остался ровно 20. final inset = rect.deflate(0.5); canvas.drawRRect( - RRect.fromRectAndRadius(inset, const Radius.circular(4)), + RRect.fromRectAndRadius(inset, Radius.circular(radius)), Paint() ..color = border! ..style = PaintingStyle.stroke @@ -115,5 +119,9 @@ class _CheckboxPainter extends CustomPainter { @override bool shouldRepaint(_CheckboxPainter old) => - old.state != state || old.fill != fill || old.border != border || old.glyph != glyph; + old.state != state || + old.fill != fill || + old.border != border || + old.glyph != glyph || + old.radius != radius; } diff --git a/lib/src/ui/components/personalization_checkbox_with_label.dart b/lib/src/ui/components/personalization_checkbox_with_label.dart index 5ba05f5..c6ec6b7 100644 --- a/lib/src/ui/components/personalization_checkbox_with_label.dart +++ b/lib/src/ui/components/personalization_checkbox_with_label.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import 'personalization_checkbox.dart'; /// Чекбокс с подписью. @@ -24,7 +24,8 @@ class PersonalizationCheckboxWithLabel extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final row = Row( mainAxisSize: MainAxisSize.min, @@ -38,6 +39,8 @@ class PersonalizationCheckboxWithLabel extends StatelessWidget { fontSize: 16, height: 20 / 16, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: disabled ? colors.textHint : colors.textPrimary, ), ), diff --git a/lib/src/ui/components/personalization_count.dart b/lib/src/ui/components/personalization_count.dart index 4e1d1b7..dcd1ad5 100644 --- a/lib/src/ui/components/personalization_count.dart +++ b/lib/src/ui/components/personalization_count.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Счётчик «показано N из M». /// @@ -26,17 +26,22 @@ class PersonalizationCount extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; const double fontSize = 16; final TextStyle regular = TextStyle( fontSize: fontSize, height: 24 / fontSize, letterSpacing: 0, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textSecondary, ); final TextStyle strong = regular.copyWith( fontWeight: FontWeight.w600, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, color: colors.textPrimary, ); diff --git a/lib/src/ui/components/personalization_dots.dart b/lib/src/ui/components/personalization_dots.dart index ffc1afd..6b97b13 100644 --- a/lib/src/ui/components/personalization_dots.dart +++ b/lib/src/ui/components/personalization_dots.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Точки-индикатор карусели. /// @@ -19,7 +19,8 @@ class PersonalizationDots extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; return Padding( padding: const EdgeInsets.symmetric(vertical: 8), child: Row( diff --git a/lib/src/ui/components/personalization_empty_state.dart b/lib/src/ui/components/personalization_empty_state.dart index cf01232..b3a9612 100644 --- a/lib/src/ui/components/personalization_empty_state.dart +++ b/lib/src/ui/components/personalization_empty_state.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Пустое состояние дизайн-системы. /// @@ -17,7 +17,8 @@ class PersonalizationEmptyState extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; return Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 92), @@ -29,6 +30,8 @@ class PersonalizationEmptyState extends StatelessWidget { fontSize: 20, height: 32 / 20, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textSecondary, ), ), diff --git a/lib/src/ui/components/personalization_input_field.dart b/lib/src/ui/components/personalization_input_field.dart index 6fea8d2..d3b2f05 100644 --- a/lib/src/ui/components/personalization_input_field.dart +++ b/lib/src/ui/components/personalization_input_field.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart' import 'package:flutter/widgets.dart'; import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import '../personalization_icons.dart'; /// Размер поля ввода. @@ -101,7 +102,8 @@ class _PersonalizationInputFieldState extends State { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final metrics = _inputMetrics[widget.size]!; final filled = _controller.text.isNotEmpty; final foreground = @@ -112,6 +114,8 @@ class _PersonalizationInputFieldState extends State { height: metrics.lineHeight / metrics.fontSize, letterSpacing: metrics.letterSpacing, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: foreground, ); @@ -130,7 +134,7 @@ class _PersonalizationInputFieldState extends State { padding: _padding(metrics), decoration: BoxDecoration( color: widget.enabled ? colors.backgroundInput : colors.backgroundInputDisabled, - borderRadius: BorderRadius.circular(metrics.radius), + borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), border: Border.all( color: _focused && widget.enabled ? colors.lineInputFocus : colors.lineInput, width: _border, @@ -255,7 +259,7 @@ class _InputMetrics { final double fontSize; final double lineHeight; final double letterSpacing; - final double radius; + final PersonalizationRadiusToken radius; final double paddingVertical; /// Горизонтальный отступ типа Input. У Search он равен вертикальному. @@ -274,7 +278,7 @@ const Map _inputMetrics = fontSize: 18, lineHeight: 32, letterSpacing: 0, - radius: 10, + radius: PersonalizationRadiusToken.xl, paddingVertical: 12, paddingInput: 16, paddingSelectStart: 16, @@ -284,7 +288,7 @@ const Map _inputMetrics = fontSize: 16, lineHeight: 24, letterSpacing: 0, - radius: 8, + radius: PersonalizationRadiusToken.lg, paddingVertical: 8, paddingInput: 12, paddingSelectStart: 12, @@ -295,7 +299,7 @@ const Map _inputMetrics = fontSize: 14, lineHeight: 24, letterSpacing: 0.05, - radius: 6, + radius: PersonalizationRadiusToken.md, paddingVertical: 4, paddingInput: 12, paddingSelectStart: 8, diff --git a/lib/src/ui/components/personalization_list_label.dart b/lib/src/ui/components/personalization_list_label.dart index dcd76e1..2b5f7c9 100644 --- a/lib/src/ui/components/personalization_list_label.dart +++ b/lib/src/ui/components/personalization_list_label.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Подпись-разделитель списка. /// @@ -16,7 +16,8 @@ class PersonalizationListLabel extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; return Text( label.toUpperCase(), style: TextStyle( @@ -24,6 +25,8 @@ class PersonalizationListLabel extends StatelessWidget { height: 20 / 14, letterSpacing: 0.05, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textHint, ), ); diff --git a/lib/src/ui/components/personalization_rating.dart b/lib/src/ui/components/personalization_rating.dart index 6a1be7b..39fc3a8 100644 --- a/lib/src/ui/components/personalization_rating.dart +++ b/lib/src/ui/components/personalization_rating.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import '../personalization_icons.dart'; /// Рейтинг товара, короткая форма. @@ -34,13 +34,16 @@ class PersonalizationRating extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; const double fontSize = 16; final TextStyle base = TextStyle( fontSize: fontSize, height: 20 / fontSize, letterSpacing: 0, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textHint, ); final Color starColor = @@ -72,6 +75,8 @@ class PersonalizationRating extends StatelessWidget { value, style: base.copyWith( fontWeight: FontWeight.w600, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, color: colors.textSecondary, ), ), diff --git a/lib/src/ui/components/personalization_search_results_title.dart b/lib/src/ui/components/personalization_search_results_title.dart index 7b3d373..61cadf7 100644 --- a/lib/src/ui/components/personalization_search_results_title.dart +++ b/lib/src/ui/components/personalization_search_results_title.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import '../personalization_icons.dart'; import 'personalization_button.dart'; import 'personalization_button_group.dart'; @@ -72,12 +72,15 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final TextStyle regular = TextStyle( fontSize: 14, height: 20 / 14, letterSpacing: 0.05, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: colors.textSecondary, ); final TextStyle strong = regular.copyWith(fontWeight: FontWeight.w600); diff --git a/lib/src/ui/components/personalization_tag.dart b/lib/src/ui/components/personalization_tag.dart index a179f3e..519441b 100644 --- a/lib/src/ui/components/personalization_tag.dart +++ b/lib/src/ui/components/personalization_tag.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; import '../personalization_icons.dart'; /// Вид тега. @@ -39,7 +39,8 @@ class PersonalizationTag extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; final isPrimary = view == PersonalizationTagView.primary; return Container( @@ -51,7 +52,9 @@ class PersonalizationTag extends StatelessWidget { ), decoration: BoxDecoration( color: isPrimary ? colors.buttonPrimary : colors.buttonSecondary, - borderRadius: BorderRadius.circular(6), + borderRadius: BorderRadius.circular( + theme.radius.resolve(PersonalizationRadiusToken.md), + ), ), child: Row( mainAxisSize: MainAxisSize.min, @@ -64,6 +67,8 @@ class PersonalizationTag extends StatelessWidget { height: 16 / 12, letterSpacing: 0.05, fontWeight: FontWeight.w400, + fontFamily: theme.fontFamily.familyFor(FontWeight.w400), + package: theme.fontFamily.package, color: isPrimary ? colors.textLightPrimary : colors.textPrimary, ), ), diff --git a/lib/src/ui/components/personalization_title.dart b/lib/src/ui/components/personalization_title.dart index b8bbd3a..caccb0f 100644 --- a/lib/src/ui/components/personalization_title.dart +++ b/lib/src/ui/components/personalization_title.dart @@ -1,6 +1,6 @@ import 'package:flutter/widgets.dart'; -import '../personalization_colors.dart'; +import '../personalization_theme.dart'; /// Заголовок блока. /// @@ -24,7 +24,8 @@ class PersonalizationTitle extends StatelessWidget { @override Widget build(BuildContext context) { - final colors = PersonalizationColors.of(context); + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; return Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ @@ -37,6 +38,8 @@ class PersonalizationTitle extends StatelessWidget { height: 36 / 24, letterSpacing: 0, fontWeight: FontWeight.w600, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, color: colors.textPrimary, ), ), diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index 9b8502d..4671cdf 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -1,18 +1,16 @@ import 'package:flutter/material.dart'; +import 'personalization_theme.dart'; + /// Цвета дизайн-системы. /// /// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Colors, /// фреймы 57:141 (Light) и 187:362 (Dark). Снято 2026-09-09. /// -/// Подключается к теме хоста как расширение: -/// ```dart -/// ThemeData(extensions: [PersonalizationColors.light]) -/// ThemeData.dark().copyWith(extensions: [PersonalizationColors.dark]) -/// ``` -/// и читается через `Theme.of(context).extension()`. +/// Набор цветов внутри [PersonalizationTheme]: подключается не сам по себе, +/// а полем темы, и читается через [of] или `PersonalizationTheme.of(context).colors`. @immutable -class PersonalizationColors extends ThemeExtension { +class PersonalizationColors { final Color brandPrimary; final Color semanticWarning; final Color backgroundPrimary; @@ -163,12 +161,11 @@ class PersonalizationColors extends ThemeExtension { textLinkVisited: Color(0xFF4D00F2), ); - /// Набор из темы хоста. Если расширение не подключено к ThemeData, - /// возвращается светлый — чтобы компоненты не падали на голой теме. + /// Цвета действующей темы. Расширение не подключено — берётся светлый набор, + /// чтобы компоненты не падали на голой теме. static PersonalizationColors of(BuildContext context) => - Theme.of(context).extension() ?? light; + PersonalizationTheme.of(context).colors; - @override PersonalizationColors copyWith({ Color? brandPrimary, Color? semanticWarning, @@ -245,12 +242,7 @@ class PersonalizationColors extends ThemeExtension { ); } - @override - PersonalizationColors lerp( - ThemeExtension? other, - double t, - ) { - if (other is! PersonalizationColors) return this; + PersonalizationColors lerp(PersonalizationColors other, double t) { return PersonalizationColors( brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart new file mode 100644 index 0000000..02b1e26 --- /dev/null +++ b/lib/src/ui/personalization_theme.dart @@ -0,0 +1,157 @@ +import 'package:flutter/material.dart'; + +import 'personalization_colors.dart'; +import 'personalization_radius.dart'; + +/// Шрифт дизайн-системы: семейства под обычное и усиленное начертание. +/// +/// Inter в SDK не поставляется — по умолчанию используется системный шрифт. +/// Хост может подставить свой, в том числе из другого пакета. +@immutable +class PersonalizationFontFamily { + const PersonalizationFontFamily({this.regular, this.emphasized, this.package}); + + /// Семейство для FontWeight.w400. `null` — системный. + final String? regular; + + /// Семейство для FontWeight.w600. `null` — системный. + final String? emphasized; + + /// Пакет, из которого берутся шрифты, если они лежат не в приложении. + final String? package; + + /// Семейство под вес: только w600 считается усиленным, как в макете. + String? familyFor(FontWeight weight) => + weight == FontWeight.w600 ? emphasized : regular; + + static const PersonalizationFontFamily system = PersonalizationFontFamily(); +} + +/// Ступень шкалы радиусов. Нужна там, где компонент держит метрики в `const` +/// таблице и не может обратиться к теме на уровне файла. +enum PersonalizationRadiusToken { xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded } + +/// Радиусы темы. Значения по умолчанию — шкала из макета. +@immutable +class PersonalizationRadiusScale { + const PersonalizationRadiusScale({ + this.xs = PersonalizationRadius.xs, + this.sm = PersonalizationRadius.sm, + this.md = PersonalizationRadius.md, + this.lg = PersonalizationRadius.lg, + this.xl = PersonalizationRadius.xl, + this.xl2 = PersonalizationRadius.xl2, + this.xl3 = PersonalizationRadius.xl3, + this.xl4 = PersonalizationRadius.xl4, + this.xl5 = PersonalizationRadius.xl5, + this.xl6 = PersonalizationRadius.xl6, + this.rounded = PersonalizationRadius.rounded, + }); + + final double xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded; + + /// Значение ступени из действующей темы. + double resolve(PersonalizationRadiusToken token) => switch (token) { + PersonalizationRadiusToken.xs => xs, + PersonalizationRadiusToken.sm => sm, + PersonalizationRadiusToken.md => md, + PersonalizationRadiusToken.lg => lg, + PersonalizationRadiusToken.xl => xl, + PersonalizationRadiusToken.xl2 => xl2, + PersonalizationRadiusToken.xl3 => xl3, + PersonalizationRadiusToken.xl4 => xl4, + PersonalizationRadiusToken.xl5 => xl5, + PersonalizationRadiusToken.xl6 => xl6, + PersonalizationRadiusToken.rounded => rounded, + }; + + PersonalizationRadiusScale lerp(PersonalizationRadiusScale other, double t) => + PersonalizationRadiusScale( + xs: lerpDouble(xs, other.xs, t), + sm: lerpDouble(sm, other.sm, t), + md: lerpDouble(md, other.md, t), + lg: lerpDouble(lg, other.lg, t), + xl: lerpDouble(xl, other.xl, t), + xl2: lerpDouble(xl2, other.xl2, t), + xl3: lerpDouble(xl3, other.xl3, t), + xl4: lerpDouble(xl4, other.xl4, t), + xl5: lerpDouble(xl5, other.xl5, t), + xl6: lerpDouble(xl6, other.xl6, t), + rounded: lerpDouble(rounded, other.rounded, t), + ); + + static double lerpDouble(double a, double b, double t) => a + (b - a) * t; +} + +/// Тема дизайн-системы: то, что хост может подменить под свой бренд. +/// +/// Подключается расширением к теме приложения: +/// +/// ```dart +/// MaterialApp( +/// theme: ThemeData(extensions: >[ +/// PersonalizationTheme.light.copyWith( +/// colors: PersonalizationColors.light.copyWith(brandPrimary: Color(0xFF7C3AED)), +/// fontFamily: PersonalizationFontFamily( +/// regular: 'Inter', emphasized: 'Inter', +/// ), +/// ), +/// ]), +/// darkTheme: ThemeData.dark().copyWith(extensions: >[ +/// PersonalizationTheme.dark, +/// ]), +/// ) +/// ``` +/// +/// Расширение можно переопределить и на поддереве через `Theme(data: ...)`: +/// разным магазинам в одном приложении можно дать разный брендинг. +/// +/// Темизуются цвета, радиусы и шрифт — поверхность брендирования. Отступы, тени +/// и кегли остаются константами: это шкала макета, менять её не предполагается. +@immutable +class PersonalizationTheme extends ThemeExtension { + const PersonalizationTheme({ + required this.colors, + this.radius = const PersonalizationRadiusScale(), + this.fontFamily = PersonalizationFontFamily.system, + }); + + final PersonalizationColors colors; + final PersonalizationRadiusScale radius; + final PersonalizationFontFamily fontFamily; + + static const PersonalizationTheme light = + PersonalizationTheme(colors: PersonalizationColors.light); + + static const PersonalizationTheme dark = + PersonalizationTheme(colors: PersonalizationColors.dark); + + /// Тема из контекста. Расширение не подключено — берётся светлая по умолчанию, + /// поэтому компоненты работают и у хоста, которому тема не нужна. + static PersonalizationTheme of(BuildContext context) => + Theme.of(context).extension() ?? light; + + @override + PersonalizationTheme copyWith({ + PersonalizationColors? colors, + PersonalizationRadiusScale? radius, + PersonalizationFontFamily? fontFamily, + }) { + return PersonalizationTheme( + colors: colors ?? this.colors, + radius: radius ?? this.radius, + fontFamily: fontFamily ?? this.fontFamily, + ); + } + + @override + PersonalizationTheme lerp(ThemeExtension? other, double t) { + if (other is! PersonalizationTheme) return this; + return PersonalizationTheme( + colors: colors.lerp(other.colors, t), + radius: radius.lerp(other.radius, t), + // Шрифт не интерполируется: переключается разом на середине перехода. + fontFamily: t < 0.5 ? fontFamily : other.fontFamily, + ); + } +} From 17c3203a6380e618bbf4911a533521dab3416f87 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 14 Sep 2026 12:35:52 +0400 Subject: [PATCH 03/79] =?UTF-8?q?fix(ui):=20follow=20the=20design=20file?= =?UTF-8?q?=20=E2=80=94=20button=20radii,=20LG=20height,=20input=20fill,?= =?UTF-8?q?=20loader=20slot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Re-read against the file on 14 September: every radius in the button family moved up by two — Button LG/MD/SM are now 12/10/8, Segmented MD is 8 — and the SM button switched from the generic sm step to Button SM. They were Figma variables all along, bound by Button, Input, Badge, Tag and Button Group, so they become semantic fields on PersonalizationRadiusScale with matching tokens. Segmented SM was not on the page and is inferred from the +2 step. LG button is 48 now (vertical padding 8) and its icon-only form is 56x48, so icon-only padding gets its own value per size. Background/Input is #F2F2F2 in light; dark stays as it was, unmeasured. The loader slot is 32 with the 26 ring centred inside — the ring alone put the component at 34 against 40 on the page. --- .../ui/components/personalization_badge.dart | 6 ++--- .../ui/components/personalization_button.dart | 23 ++++++++++++++----- .../personalization_button_group.dart | 6 ++--- .../personalization_input_field.dart | 7 +++--- .../ui/components/personalization_loader.dart | 13 +++++++---- .../ui/components/personalization_tag.dart | 2 +- lib/src/ui/personalization_colors.dart | 2 +- lib/src/ui/personalization_radius.dart | 10 ++++++++ lib/src/ui/personalization_theme.dart | 23 ++++++++++++++++++- 9 files changed, 69 insertions(+), 23 deletions(-) diff --git a/lib/src/ui/components/personalization_badge.dart b/lib/src/ui/components/personalization_badge.dart index d37dfe7..d6ad025 100644 --- a/lib/src/ui/components/personalization_badge.dart +++ b/lib/src/ui/components/personalization_badge.dart @@ -28,11 +28,11 @@ class PersonalizationBadge extends StatelessWidget { final colors = theme.colors; final (padH, padV, radius, fontSize, lineHeight) = switch (size) { PersonalizationBadgeSize.lg => - (12.0, 8.0, PersonalizationRadiusToken.xl, 20.0, 24.0), + (12.0, 8.0, PersonalizationRadiusToken.buttonLg, 20.0, 24.0), PersonalizationBadgeSize.md => - (8.0, 4.0, PersonalizationRadiusToken.lg, 16.0, 20.0), + (8.0, 4.0, PersonalizationRadiusToken.buttonMd, 16.0, 20.0), PersonalizationBadgeSize.sm => - (4.0, 2.0, PersonalizationRadiusToken.md, 14.0, 16.0), + (4.0, 2.0, PersonalizationRadiusToken.buttonSm, 14.0, 16.0), }; return Container( diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart index 390216e..f0f92a2 100644 --- a/lib/src/ui/components/personalization_button.dart +++ b/lib/src/ui/components/personalization_button.dart @@ -131,8 +131,11 @@ class _PersonalizationButtonState extends State { EdgeInsets _padding(_ButtonMetrics metrics) { if (!_hasText) { - // Кнопка-иконка: со всех сторон вертикальный отступ, 12/8/4. - return EdgeInsets.all(metrics.paddingVertical); + // Кнопка-иконка: по вертикали как у текстовой, по горизонтали своё — 12/8/4. + return EdgeInsets.symmetric( + vertical: metrics.paddingVertical, + horizontal: metrics.paddingIconOnly, + ); } return EdgeInsets.only( left: widget.iconStart != null ? metrics.paddingNarrow : metrics.paddingWide, @@ -187,6 +190,7 @@ class _ButtonMetrics { required this.paddingVertical, required this.paddingWide, required this.paddingNarrow, + required this.paddingIconOnly, required this.iconSize, }); @@ -201,6 +205,10 @@ class _ButtonMetrics { /// Горизонтальный отступ со стороны с иконкой. final double paddingNarrow; + + /// Горизонтальный отступ кнопки-иконки: у LG он 12 при вертикальном 8, + /// у остальных равен вертикальному. + final double paddingIconOnly; final double iconSize; } @@ -210,20 +218,22 @@ const Map _metrics = fontSize: 20, lineHeight: 32, letterSpacing: 0, - radius: PersonalizationRadiusToken.xl, - paddingVertical: 12, + radius: PersonalizationRadiusToken.buttonLg, + paddingVertical: 8, paddingWide: 24, paddingNarrow: 16, + paddingIconOnly: 12, iconSize: 32, ), PersonalizationButtonSize.md: _ButtonMetrics( fontSize: 16, lineHeight: 24, letterSpacing: 0, - radius: PersonalizationRadiusToken.lg, + radius: PersonalizationRadiusToken.buttonMd, paddingVertical: 8, paddingWide: 16, paddingNarrow: 12, + paddingIconOnly: 8, iconSize: 24, ), // SM берёт кегль со ступени sm, а интерлиньяж со ступени base: @@ -232,10 +242,11 @@ const Map _metrics = fontSize: 14, lineHeight: 24, letterSpacing: 0.05, - radius: PersonalizationRadiusToken.sm, + radius: PersonalizationRadiusToken.buttonSm, paddingVertical: 4, paddingWide: 12, paddingNarrow: 8, + paddingIconOnly: 4, iconSize: 20, ), }; diff --git a/lib/src/ui/components/personalization_button_group.dart b/lib/src/ui/components/personalization_button_group.dart index c86fe6e..31d9e06 100644 --- a/lib/src/ui/components/personalization_button_group.dart +++ b/lib/src/ui/components/personalization_button_group.dart @@ -61,7 +61,7 @@ class PersonalizationButtonGroup extends StatelessWidget { decoration: BoxDecoration( color: colors.buttonSecondary, borderRadius: BorderRadius.circular( - theme.radius.resolve(PersonalizationRadiusToken.lg), + theme.radius.resolve(PersonalizationRadiusToken.buttonMd), ), ), child: Row( @@ -126,7 +126,7 @@ class _GroupMetrics { const Map _groupMetrics = { PersonalizationButtonGroupSize.md: - _GroupMetrics(radius: PersonalizationRadiusToken.md, padding: 6, iconSize: 24), + _GroupMetrics(radius: PersonalizationRadiusToken.segmentedMd, padding: 6, iconSize: 24), PersonalizationButtonGroupSize.sm: - _GroupMetrics(radius: PersonalizationRadiusToken.sm, padding: 2, iconSize: 20), + _GroupMetrics(radius: PersonalizationRadiusToken.segmentedSm, padding: 2, iconSize: 20), }; diff --git a/lib/src/ui/components/personalization_input_field.dart b/lib/src/ui/components/personalization_input_field.dart index d3b2f05..67ed9b1 100644 --- a/lib/src/ui/components/personalization_input_field.dart +++ b/lib/src/ui/components/personalization_input_field.dart @@ -278,7 +278,7 @@ const Map _inputMetrics = fontSize: 18, lineHeight: 32, letterSpacing: 0, - radius: PersonalizationRadiusToken.xl, + radius: PersonalizationRadiusToken.buttonLg, paddingVertical: 12, paddingInput: 16, paddingSelectStart: 16, @@ -288,18 +288,17 @@ const Map _inputMetrics = fontSize: 16, lineHeight: 24, letterSpacing: 0, - radius: PersonalizationRadiusToken.lg, + radius: PersonalizationRadiusToken.buttonMd, paddingVertical: 8, paddingInput: 12, paddingSelectStart: 12, iconSize: 24, ), - // Радиус SM — 6, из переменной Button SM, а не 4 из общей шкалы: так в макете. PersonalizationInputFieldSize.sm: _InputMetrics( fontSize: 14, lineHeight: 24, letterSpacing: 0.05, - radius: PersonalizationRadiusToken.md, + radius: PersonalizationRadiusToken.buttonSm, paddingVertical: 4, paddingInput: 12, paddingSelectStart: 8, diff --git a/lib/src/ui/components/personalization_loader.dart b/lib/src/ui/components/personalization_loader.dart index caa8ebd..c66599a 100644 --- a/lib/src/ui/components/personalization_loader.dart +++ b/lib/src/ui/components/personalization_loader.dart @@ -13,7 +13,7 @@ import 'package:flutter/widgets.dart'; class PersonalizationLoader extends StatefulWidget { const PersonalizationLoader({ super.key, - this.size = 26, + this.size = 32, this.period = const Duration(milliseconds: 900), }); @@ -60,10 +60,15 @@ class _LoaderPainter extends CustomPainter { @override void paint(Canvas canvas, Size size) { - // Толщина и радиус пропорциональны эталонным 26 из макета. - final scale = size.width / 26; + // Кольцо 26 лежит в слоте 32 по центру; толщина пропорциональна кольцу. + final ringSide = size.width * 26 / 32; + final scale = ringSide / 26; final strokeWidth = 3.5 * scale; - final rect = Offset.zero & size; + final rect = Rect.fromCenter( + center: size.center(Offset.zero), + width: ringSide, + height: ringSide, + ); final ring = rect.deflate(strokeWidth / 2); final paint = Paint() diff --git a/lib/src/ui/components/personalization_tag.dart b/lib/src/ui/components/personalization_tag.dart index 519441b..e5d11fd 100644 --- a/lib/src/ui/components/personalization_tag.dart +++ b/lib/src/ui/components/personalization_tag.dart @@ -53,7 +53,7 @@ class PersonalizationTag extends StatelessWidget { decoration: BoxDecoration( color: isPrimary ? colors.buttonPrimary : colors.buttonSecondary, borderRadius: BorderRadius.circular( - theme.radius.resolve(PersonalizationRadiusToken.md), + theme.radius.resolve(PersonalizationRadiusToken.buttonSm), ), ), child: Row( diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index 4671cdf..39fef6c 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -91,7 +91,7 @@ class PersonalizationColors { backgroundPrimary: Color(0xFF007DF2), backgroundGeneric: Color(0xFFFAFAFA), backgroundCard: Color(0xFFF2F2F2), - backgroundInput: Color(0xFFFAFAFA), + backgroundInput: Color(0xFFF2F2F2), backgroundTransparent: Color(0x00FFFFFF), backgroundInputDisabled: Color(0x0D000000), buttonPrimary: Color(0xFF007DF2), diff --git a/lib/src/ui/personalization_radius.dart b/lib/src/ui/personalization_radius.dart index 7f59cdf..1b03dcf 100644 --- a/lib/src/ui/personalization_radius.dart +++ b/lib/src/ui/personalization_radius.dart @@ -27,4 +27,14 @@ abstract final class PersonalizationRadius { static const double xl6 = 24; /// Rounded static const double rounded = 999; + + /// Семантические радиусы: переменные Button LG/MD/SM и Segmented Button MD/SM + /// из Figma. К ним привязаны Button, Input, Badge, Tag и Button Group — + /// дизайнер меняет их отдельно от шкалы, поэтому и здесь они отдельно. + /// segmentedSm в макете не снят, выведен по шагу остальных (+2). + static const double buttonLg = 12; + static const double buttonMd = 10; + static const double buttonSm = 8; + static const double segmentedMd = 8; + static const double segmentedSm = 6; } diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart index 02b1e26..d0d7a60 100644 --- a/lib/src/ui/personalization_theme.dart +++ b/lib/src/ui/personalization_theme.dart @@ -29,7 +29,10 @@ class PersonalizationFontFamily { /// Ступень шкалы радиусов. Нужна там, где компонент держит метрики в `const` /// таблице и не может обратиться к теме на уровне файла. -enum PersonalizationRadiusToken { xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded } +enum PersonalizationRadiusToken { + xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded, + buttonLg, buttonMd, buttonSm, segmentedMd, segmentedSm, +} /// Радиусы темы. Значения по умолчанию — шкала из макета. @immutable @@ -46,10 +49,18 @@ class PersonalizationRadiusScale { this.xl5 = PersonalizationRadius.xl5, this.xl6 = PersonalizationRadius.xl6, this.rounded = PersonalizationRadius.rounded, + this.buttonLg = PersonalizationRadius.buttonLg, + this.buttonMd = PersonalizationRadius.buttonMd, + this.buttonSm = PersonalizationRadius.buttonSm, + this.segmentedMd = PersonalizationRadius.segmentedMd, + this.segmentedSm = PersonalizationRadius.segmentedSm, }); final double xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded; + /// Семантические радиусы кнопочного семейства, см. [PersonalizationRadius]. + final double buttonLg, buttonMd, buttonSm, segmentedMd, segmentedSm; + /// Значение ступени из действующей темы. double resolve(PersonalizationRadiusToken token) => switch (token) { PersonalizationRadiusToken.xs => xs, @@ -63,6 +74,11 @@ class PersonalizationRadiusScale { PersonalizationRadiusToken.xl5 => xl5, PersonalizationRadiusToken.xl6 => xl6, PersonalizationRadiusToken.rounded => rounded, + PersonalizationRadiusToken.buttonLg => buttonLg, + PersonalizationRadiusToken.buttonMd => buttonMd, + PersonalizationRadiusToken.buttonSm => buttonSm, + PersonalizationRadiusToken.segmentedMd => segmentedMd, + PersonalizationRadiusToken.segmentedSm => segmentedSm, }; PersonalizationRadiusScale lerp(PersonalizationRadiusScale other, double t) => @@ -78,6 +94,11 @@ class PersonalizationRadiusScale { xl5: lerpDouble(xl5, other.xl5, t), xl6: lerpDouble(xl6, other.xl6, t), rounded: lerpDouble(rounded, other.rounded, t), + buttonLg: lerpDouble(buttonLg, other.buttonLg, t), + buttonMd: lerpDouble(buttonMd, other.buttonMd, t), + buttonSm: lerpDouble(buttonSm, other.buttonSm, t), + segmentedMd: lerpDouble(segmentedMd, other.segmentedMd, t), + segmentedSm: lerpDouble(segmentedSm, other.segmentedSm, t), ); static double lerpDouble(double a, double b, double t) => a + (b - a) * t; From 6c41f9ab1bec275e98e965d5909bd4a868244c4a Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 14 Sep 2026 12:43:00 +0400 Subject: [PATCH 04/79] feat(ui): product card, product image and favorites badge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first catalogue pieces, built on the base components. ProductImage is an aspect-ratio slot (1:1, 4:3, 3:4) with a Background/Card placeholder — the placeholder fill in the file is not bound to a variable, so the nearest token stands in. ProductCard comes in the three shapes on the page: carousel (220 wide), grid (fills its cell) and list (image 120, price and action at the bottom right). Each shape sets its own name and price type — 20/32, 18/28 and 16/24 for the price — so those live in a table rather than on the base scale. The discount badge is the SM Badge in a new Semantic/Danger colour (#E51919), which the card introduced and the Colors page does not carry; its dark value is unmeasured and stays the same. Badge gains a view for it. Favorites is the 24x24 star pill from the Badge section. Loading is not the component's job: the image slot is handed to the host — the ImageView on Android, the UIImageView on iOS, an Image source in React Native and an ImageProvider in Flutter. Computed heights match the page: 390, 327 and 120. --- lib/rees46_sdk.dart | 3 + .../ui/components/personalization_badge.dart | 9 +- .../personalization_favorites_badge.dart | 36 +++ .../personalization_product_card.dart | 241 ++++++++++++++++++ .../personalization_product_image.dart | 43 ++++ lib/src/ui/personalization_colors.dart | 7 + 6 files changed, 338 insertions(+), 1 deletion(-) create mode 100644 lib/src/ui/components/personalization_favorites_badge.dart create mode 100644 lib/src/ui/components/personalization_product_card.dart create mode 100644 lib/src/ui/components/personalization_product_image.dart diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index 23a3b1f..cefd375 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -42,3 +42,6 @@ export 'src/ui/components/personalization_dots.dart'; export 'src/ui/components/personalization_count.dart'; export 'src/ui/components/personalization_rating.dart'; export 'src/ui/components/personalization_search_results_title.dart'; +export 'src/ui/components/personalization_product_image.dart'; +export 'src/ui/components/personalization_favorites_badge.dart'; +export 'src/ui/components/personalization_product_card.dart'; diff --git a/lib/src/ui/components/personalization_badge.dart b/lib/src/ui/components/personalization_badge.dart index d6ad025..24605b1 100644 --- a/lib/src/ui/components/personalization_badge.dart +++ b/lib/src/ui/components/personalization_badge.dart @@ -5,6 +5,9 @@ import '../personalization_theme.dart'; /// Размер бейджа. enum PersonalizationBadgeSize { sm, md, lg } +/// Вид: warning — как в секции Badge, danger — бейдж скидки на карточке товара (Card/Product, 126:2263), тот же SM в цвете Semantic/Danger. +enum PersonalizationBadgeView { warning, danger } + /// Бейдж дизайн-системы. /// /// Источник: Figma Mobile SDK UI Kit, секция Badge (241:7434). @@ -17,10 +20,12 @@ class PersonalizationBadge extends StatelessWidget { super.key, required this.label, this.size = PersonalizationBadgeSize.lg, + this.view = PersonalizationBadgeView.warning, }); final String label; final PersonalizationBadgeSize size; + final PersonalizationBadgeView view; @override Widget build(BuildContext context) { @@ -38,7 +43,9 @@ class PersonalizationBadge extends StatelessWidget { return Container( padding: EdgeInsets.symmetric(horizontal: padH, vertical: padV), decoration: BoxDecoration( - color: colors.semanticWarning, + color: view == PersonalizationBadgeView.danger + ? colors.semanticDanger + : colors.semanticWarning, borderRadius: BorderRadius.circular(theme.radius.resolve(radius)), ), child: Text( diff --git a/lib/src/ui/components/personalization_favorites_badge.dart b/lib/src/ui/components/personalization_favorites_badge.dart new file mode 100644 index 0000000..d5325cf --- /dev/null +++ b/lib/src/ui/components/personalization_favorites_badge.dart @@ -0,0 +1,36 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; + +/// Метка «в избранном»: звезда в круге цвета Semantic/Warning, 24x24. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Badge, символ Favorites (391:17117). +class PersonalizationFavoritesBadge extends StatelessWidget { + const PersonalizationFavoritesBadge({super.key, this.iconBuilder}); + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + return Container( + // Звезда 16 плюс поле 4 с каждой стороны. + width: 24, + height: 24, + padding: const EdgeInsets.all(4), + decoration: BoxDecoration(shape: BoxShape.circle, color: colors.semanticWarning), + child: iconBuilder?.call( + context, + PersonalizationIcons.starFill, + 16, + colors.textLightPrimary, + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_product_card.dart b/lib/src/ui/components/personalization_product_card.dart new file mode 100644 index 0000000..fb440b3 --- /dev/null +++ b/lib/src/ui/components/personalization_product_card.dart @@ -0,0 +1,241 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import 'personalization_badge.dart'; +import 'personalization_button.dart'; +import 'personalization_product_image.dart'; +import 'personalization_rating.dart'; + +/// Тип карточки товара. +enum PersonalizationProductCardType { carousel, grid, list } + +/// Оценка товара для карточки. +class PersonalizationProductRating { + const PersonalizationProductRating({required this.value, required this.reviews}); + + /// Уже отформатированная оценка: в макете «4,7» с запятой. + final String value; + final int reviews; +} + +/// Карточка товара. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card, фрейм Product (126:2263): +/// carousel — колонка 220 с картинкой 1:1, grid — колонка на всю ширину ячейки, +/// list — строка с картинкой 120 и ценой с кнопкой внизу справа. +/// У трёх типов разная типографика цены и названия, поэтому она задана в таблице. +/// +/// Собрана из готовых блоков: [PersonalizationProductImage], [PersonalizationRating], +/// [PersonalizationBadge] (скидка, вид danger), [PersonalizationButton]. +class PersonalizationProductCard extends StatelessWidget { + const PersonalizationProductCard({ + super.key, + this.type = PersonalizationProductCardType.carousel, + this.image, + this.brand, + required this.name, + this.rating, + required this.price, + this.oldPrice, + this.discount, + this.actionText, + this.onAction, + this.iconBuilder, + }); + + final PersonalizationProductCardType type; + final ImageProvider? image; + final String? brand; + final String name; + final PersonalizationProductRating? rating; + final String price; + + /// Старая цена, зачёркнутая. `null` — не показывать. + final String? oldPrice; + + /// Скидка, например «-15%». `null` — без бейджа. + final String? discount; + + /// Подпись кнопки. `null` — без кнопки. + final String? actionText; + final VoidCallback? onAction; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final metrics = _metrics[type]!; + + TextStyle style(double fontSize, double lineHeight, double letterSpacing, FontWeight weight, Color color) => + TextStyle( + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + fontSize: fontSize, + height: lineHeight / fontSize, + letterSpacing: letterSpacing, + fontWeight: weight, + color: color, + ); + + Widget nameBlock(double gap) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + if (brand != null && brand!.isNotEmpty) ...[ + Text(brand!, style: style(12, 16, 0.05, FontWeight.w400, colors.textSecondary)), + SizedBox(height: gap), + ], + Text( + name, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: style(metrics.nameSize, metrics.nameLineHeight, metrics.nameLetterSpacing, + FontWeight.w400, colors.textPrimary), + ), + ], + ); + + final Widget? ratingRow = rating == null + ? null + : PersonalizationRating(value: rating!.value, reviews: rating!.reviews, iconBuilder: iconBuilder); + final Widget priceText = Text( + price, + style: style(metrics.priceSize, metrics.priceLineHeight, 0, FontWeight.w600, colors.textPrimary), + ); + final Widget? oldPriceText = oldPrice == null + ? null + : Text( + oldPrice!, + style: style(14, 20, 0.05, FontWeight.w400, colors.textHint) + .copyWith(decoration: TextDecoration.lineThrough), + ); + final Widget? discountBadge = discount == null + ? null + : PersonalizationBadge( + label: discount!, + size: PersonalizationBadgeSize.sm, + view: PersonalizationBadgeView.danger, + ); + final Widget? action = actionText == null + ? null + : PersonalizationButton( + label: actionText, + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.primary, + onPressed: onAction, + ); + + // List: картинка 120 слева, справа колонка — название с рейтингом сверху, цена с кнопкой снизу. + if (type == PersonalizationProductCardType.list) { + return SizedBox( + height: 120, + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + SizedBox(width: 120, child: PersonalizationProductImage(image: image)), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + nameBlock(2), + if (ratingRow != null) ...[const SizedBox(height: 4), ratingRow], + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + children: [ + priceText, + if (discountBadge != null) ...[const SizedBox(width: 8), discountBadge], + ], + ), + ?oldPriceText, + ], + ), + ?action, + ], + ), + ], + ), + ), + ], + ), + ); + } + + // Carousel и Grid: картинка, название, рейтинг, цена, кнопка — колонкой с шагом 8. + // У колонок скидка лежит на картинке: отступ 8 у carousel и 4 у grid. + final column = Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + Stack( + children: [ + PersonalizationProductImage(image: image), + if (discountBadge != null) + Positioned(top: metrics.badgeInset, right: metrics.badgeInset, child: discountBadge), + ], + ), + const SizedBox(height: 8), + nameBlock(2), + if (ratingRow != null) ...[const SizedBox(height: 8), ratingRow], + const SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + priceText, + if (oldPriceText != null) ...[const SizedBox(width: 8), oldPriceText], + ], + ), + if (action != null) ...[const SizedBox(height: 8), action], + ], + ); + return type == PersonalizationProductCardType.carousel + ? SizedBox(width: 220, child: column) + : column; + } +} + +class _CardMetrics { + const _CardMetrics({ + required this.nameSize, + required this.nameLineHeight, + required this.nameLetterSpacing, + required this.priceSize, + required this.priceLineHeight, + required this.badgeInset, + }); + + final double nameSize, nameLineHeight, nameLetterSpacing, priceSize, priceLineHeight, badgeInset; +} + +const Map _metrics = + { + PersonalizationProductCardType.carousel: _CardMetrics( + nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 20, priceLineHeight: 32, badgeInset: 8), + PersonalizationProductCardType.grid: _CardMetrics( + nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 18, priceLineHeight: 28, badgeInset: 4), + PersonalizationProductCardType.list: _CardMetrics( + nameSize: 14, nameLineHeight: 20, nameLetterSpacing: 0.05, priceSize: 16, priceLineHeight: 24, badgeInset: 0), +}; diff --git a/lib/src/ui/components/personalization_product_image.dart b/lib/src/ui/components/personalization_product_image.dart new file mode 100644 index 0000000..e75b034 --- /dev/null +++ b/lib/src/ui/components/personalization_product_image.dart @@ -0,0 +1,43 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; + +/// Пропорция изображения товара. +enum PersonalizationProductImageAspect { square, landscape, portrait } + +/// Изображение товара с фиксированной пропорцией. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Image (88:93), фрейм Product (88:94): +/// три пропорции — 1:1, 4:3, 3:4. Ширину задаёт разметка, высота считается сама. +/// +/// Картинку грузит штатный [Image] по [image]: NetworkImage есть в самом фреймворке. +/// До загрузки виден плейсхолдер цвета Background/Card — в макете заливка +/// плейсхолдера к переменной не привязана, взят ближайший токен. +class PersonalizationProductImage extends StatelessWidget { + const PersonalizationProductImage({ + super.key, + this.image, + this.aspect = PersonalizationProductImageAspect.square, + }); + + final ImageProvider? image; + final PersonalizationProductImageAspect aspect; + + double get _ratio => switch (aspect) { + PersonalizationProductImageAspect.square => 1, + PersonalizationProductImageAspect.landscape => 4 / 3, + PersonalizationProductImageAspect.portrait => 3 / 4, + }; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + return AspectRatio( + aspectRatio: _ratio, + child: ColoredBox( + color: colors.backgroundCard, + child: image == null ? null : Image(image: image!, fit: BoxFit.cover), + ), + ); + } +} diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index 39fef6c..cc62067 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -13,6 +13,7 @@ import 'personalization_theme.dart'; class PersonalizationColors { final Color brandPrimary; final Color semanticWarning; + final Color semanticDanger; final Color backgroundPrimary; final Color backgroundGeneric; final Color backgroundCard; @@ -50,6 +51,7 @@ class PersonalizationColors { const PersonalizationColors({ required this.brandPrimary, required this.semanticWarning, + required this.semanticDanger, required this.backgroundPrimary, required this.backgroundGeneric, required this.backgroundCard, @@ -88,6 +90,7 @@ class PersonalizationColors { static const PersonalizationColors light = PersonalizationColors( brandPrimary: Color(0xFF007DF2), semanticWarning: Color(0xFFF37A17), + semanticDanger: Color(0xFFE51919), backgroundPrimary: Color(0xFF007DF2), backgroundGeneric: Color(0xFFFAFAFA), backgroundCard: Color(0xFFF2F2F2), @@ -126,6 +129,7 @@ class PersonalizationColors { static const PersonalizationColors dark = PersonalizationColors( brandPrimary: Color(0xFF007DF2), semanticWarning: Color(0xFFF37A17), + semanticDanger: Color(0xFFE51919), backgroundPrimary: Color(0xFF007DF2), backgroundGeneric: Color(0xFF141414), backgroundCard: Color(0xFF0D0D0D), @@ -169,6 +173,7 @@ class PersonalizationColors { PersonalizationColors copyWith({ Color? brandPrimary, Color? semanticWarning, + Color? semanticDanger, Color? backgroundPrimary, Color? backgroundGeneric, Color? backgroundCard, @@ -206,6 +211,7 @@ class PersonalizationColors { return PersonalizationColors( brandPrimary: brandPrimary ?? this.brandPrimary, semanticWarning: semanticWarning ?? this.semanticWarning, + semanticDanger: semanticDanger ?? this.semanticDanger, backgroundPrimary: backgroundPrimary ?? this.backgroundPrimary, backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, backgroundCard: backgroundCard ?? this.backgroundCard, @@ -246,6 +252,7 @@ class PersonalizationColors { return PersonalizationColors( brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, + semanticDanger: Color.lerp(semanticDanger, other.semanticDanger, t)!, backgroundPrimary: Color.lerp(backgroundPrimary, other.backgroundPrimary, t)!, backgroundGeneric: Color.lerp(backgroundGeneric, other.backgroundGeneric, t)!, backgroundCard: Color.lerp(backgroundCard, other.backgroundCard, t)!, From e8046f6f6562ae9b4a9652a128da2e4ee5cde595 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 14 Sep 2026 12:48:03 +0400 Subject: [PATCH 05/79] feat(ui): product lists and recommender block MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The catalogue layouts on top of the product card. One list component carries the three shapes from the page — Products Carousel (carousel cards, 16 apart, horizontal) and Products Grid in its two views (grid cards two across, 16 apart both ways; list cards stacked 16 apart). The grid and list do not scroll on their own: their height is their content, so they sit inside the host's screen without a nested scroll. The carousel scrolls and reports the first fully visible card. RecommenderBlock is the three Recommender/* symbols as one component with a layout switch: the title above, the list, and for the carousel a "show all" ghost button in the title row and Dots below, driven by the carousel's first-visible index. Spacing is 16 for the carousel and 12 for grid and list, as on the page. Product data is a plain value type with pre-formatted strings; the image is handed to the host per card through imageLoader on Android and iOS, and is a source or ImageProvider on React Native and Flutter. One discrepancy noted, not resolved: the old price inside the compositions is 16/24 while the card's master component says 14/20. The master is followed. --- lib/rees46_sdk.dart | 3 + .../components/personalization_product.dart | 33 ++++ .../personalization_products_list.dart | 141 ++++++++++++++++++ .../personalization_recommender_block.dart | 96 ++++++++++++ 4 files changed, 273 insertions(+) create mode 100644 lib/src/ui/components/personalization_product.dart create mode 100644 lib/src/ui/components/personalization_products_list.dart create mode 100644 lib/src/ui/components/personalization_recommender_block.dart diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index cefd375..71fa471 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -45,3 +45,6 @@ export 'src/ui/components/personalization_search_results_title.dart'; export 'src/ui/components/personalization_product_image.dart'; export 'src/ui/components/personalization_favorites_badge.dart'; export 'src/ui/components/personalization_product_card.dart'; +export 'src/ui/components/personalization_product.dart'; +export 'src/ui/components/personalization_products_list.dart'; +export 'src/ui/components/personalization_recommender_block.dart'; diff --git a/lib/src/ui/components/personalization_product.dart b/lib/src/ui/components/personalization_product.dart new file mode 100644 index 0000000..18b7aa2 --- /dev/null +++ b/lib/src/ui/components/personalization_product.dart @@ -0,0 +1,33 @@ +import 'package:flutter/widgets.dart'; + +import 'personalization_product_card.dart'; + +/// Данные товара для карточки и раскладок каталога. +/// +/// Строки уже отформатированы: цена с валютой, оценка с запятой, скидка со знаком — +/// форматирование и локализация остаются за интегратором. +/// Картинку грузит штатный [Image] по [image]: NetworkImage есть во фреймворке. +@immutable +class PersonalizationProduct { + const PersonalizationProduct({ + required this.id, + required this.name, + required this.price, + this.image, + this.brand, + this.rating, + this.oldPrice, + this.discount, + this.actionText, + }); + + final String id; + final String name; + final String price; + final ImageProvider? image; + final String? brand; + final PersonalizationProductRating? rating; + final String? oldPrice; + final String? discount; + final String? actionText; +} diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart new file mode 100644 index 0000000..328d74c --- /dev/null +++ b/lib/src/ui/components/personalization_products_list.dart @@ -0,0 +1,141 @@ +import 'package:flutter/widgets.dart'; + +import 'personalization_product.dart'; +import 'personalization_product_card.dart'; + +/// Раскладка каталога. +enum PersonalizationProductsLayout { carousel, grid, list } + +/// Лента, плитка и список карточек товара. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card — Products Carousel (203:6296) +/// и Products Grid (203:4766) в видах Grid и List. +/// Карусель — карточки carousel горизонтально с шагом 16; плитка — карточки grid +/// в две колонки с шагом 16 по обеим осям; список — карточки list столбиком с шагом 16. +/// +/// Плитка и список сами не скроллят: их высоту задаёт содержимое, прокрутка +/// остаётся за экраном хоста. Карусель скроллит горизонтально и сообщает +/// индекс первой видимой карточки через [onFirstVisibleChanged]. +class PersonalizationProductsList extends StatefulWidget { + const PersonalizationProductsList({ + super.key, + this.layout = PersonalizationProductsLayout.carousel, + required this.products, + this.onProductAction, + this.onFirstVisibleChanged, + this.iconBuilder, + }); + + final PersonalizationProductsLayout layout; + final List products; + final ValueChanged? onProductAction; + final ValueChanged? onFirstVisibleChanged; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + State createState() => _PersonalizationProductsListState(); +} + +class _PersonalizationProductsListState extends State { + final ScrollController _controller = ScrollController(); + int _lastFirst = -1; + + static const double _gap = 16; + static const double _carouselCard = 220; + + @override + void initState() { + super.initState(); + _controller.addListener(_onScroll); + } + + @override + void dispose() { + _controller.removeListener(_onScroll); + _controller.dispose(); + super.dispose(); + } + + void _onScroll() { + if (widget.layout != PersonalizationProductsLayout.carousel) return; + // Первая полностью видимая карточка: шаг ленты — ширина карточки плюс зазор. + final first = (_controller.offset / (_carouselCard + _gap)).ceil(); + final clamped = first.clamp(0, widget.products.isEmpty ? 0 : widget.products.length - 1); + if (clamped != _lastFirst) { + _lastFirst = clamped; + widget.onFirstVisibleChanged?.call(clamped); + } + } + + Widget _card(PersonalizationProduct product, PersonalizationProductCardType type) { + return PersonalizationProductCard( + type: type, + image: product.image, + brand: product.brand, + name: product.name, + rating: product.rating, + price: product.price, + oldPrice: product.oldPrice, + discount: product.discount, + actionText: product.actionText, + onAction: widget.onProductAction == null ? null : () => widget.onProductAction!(product), + iconBuilder: widget.iconBuilder, + ); + } + + @override + Widget build(BuildContext context) { + final products = widget.products; + switch (widget.layout) { + case PersonalizationProductsLayout.carousel: + return SingleChildScrollView( + controller: _controller, + scrollDirection: Axis.horizontal, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (int i = 0; i < products.length; i++) ...[ + if (i > 0) const SizedBox(width: _gap), + _card(products[i], PersonalizationProductCardType.carousel), + ], + ], + ), + ); + case PersonalizationProductsLayout.grid: + return Column( + children: [ + for (int row = 0; row < products.length; row += 2) ...[ + if (row > 0) const SizedBox(height: _gap), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded(child: _card(products[row], PersonalizationProductCardType.grid)), + const SizedBox(width: _gap), + Expanded( + child: row + 1 < products.length + ? _card(products[row + 1], PersonalizationProductCardType.grid) + : const SizedBox.shrink(), + ), + ], + ), + ], + ], + ); + case PersonalizationProductsLayout.list: + return Column( + children: [ + for (int i = 0; i < products.length; i++) ...[ + if (i > 0) const SizedBox(height: _gap), + _card(products[i], PersonalizationProductCardType.list), + ], + ], + ); + } + } +} diff --git a/lib/src/ui/components/personalization_recommender_block.dart b/lib/src/ui/components/personalization_recommender_block.dart new file mode 100644 index 0000000..8a2a429 --- /dev/null +++ b/lib/src/ui/components/personalization_recommender_block.dart @@ -0,0 +1,96 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import 'personalization_button.dart'; +import 'personalization_dots.dart'; +import 'personalization_product.dart'; +import 'personalization_products_list.dart'; +import 'personalization_title.dart'; + +/// Блок рекомендаций: заголовок, товары, у карусели — точки. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card — Recommender/Carousel (90:655), +/// Recommender/Grid (126:1944), Recommender/List (126:2551). +/// У карусели заголовок с кнопкой «Show all» и точки под лентой, шаг блока 16; +/// у плитки и списка только заголовок, шаг 12. +/// +/// Собран из [PersonalizationTitle], [PersonalizationButton], +/// [PersonalizationProductsList], [PersonalizationDots]. +class PersonalizationRecommenderBlock extends StatefulWidget { + const PersonalizationRecommenderBlock({ + super.key, + this.layout = PersonalizationProductsLayout.carousel, + required this.title, + this.showAllText, + this.onShowAll, + this.showDots = true, + required this.products, + this.onProductAction, + this.iconBuilder, + }); + + final PersonalizationProductsLayout layout; + final String title; + + /// Подпись кнопки «показать все» у карусели. `null` — без кнопки. + final String? showAllText; + final VoidCallback? onShowAll; + + /// У карусели точки под лентой; выключаются, как в макете (showDots). + final bool showDots; + final List products; + final ValueChanged? onProductAction; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + State createState() => _PersonalizationRecommenderBlockState(); +} + +class _PersonalizationRecommenderBlockState extends State { + int _page = 0; + + @override + Widget build(BuildContext context) { + final carousel = widget.layout == PersonalizationProductsLayout.carousel; + final double gap = carousel ? 16 : 12; + final bool showAll = carousel && widget.showAllText != null && widget.showAllText!.isNotEmpty; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationTitle( + title: widget.title, + trailing: showAll + ? PersonalizationButton( + label: widget.showAllText, + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.ghost, + iconEnd: PersonalizationIcons.angleLargeRight, + iconBuilder: widget.iconBuilder, + onPressed: widget.onShowAll, + ) + : null, + ), + SizedBox(height: gap), + PersonalizationProductsList( + layout: widget.layout, + products: widget.products, + onProductAction: widget.onProductAction, + onFirstVisibleChanged: carousel ? (int index) => setState(() => _page = index) : null, + iconBuilder: widget.iconBuilder, + ), + if (carousel && widget.showDots) ...[ + SizedBox(height: gap), + PersonalizationDots(count: widget.products.length, selectedIndex: _page), + ], + ], + ); + } +} From 609172c1a3f96dfbe33500945efb97eb657b0e1e Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 14 Sep 2026 12:55:17 +0400 Subject: [PATCH 06/79] feat(ui): search suggestions and catalogue screen, plus the arrow-rotate-cw icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last catalogue pieces. SuggestionRow is the Product and Category rows from the page in their Image and Text forms — a 40px image, a title, a second line that is the price for a product and the parent for a category, a chevron on categories — with the query match set in bold as the suggestions mock shows. The 10px gap between image and text is off the spacing scale and is kept as drawn. SearchSuggestions is the panel around those rows. The Search frame is a sketch rather than a component — the header is hand-placed instead of the InputField, the font is SF Pro — so only what reads unambiguously is taken: tag chips 8 apart, category and product blocks 12 apart inside and between, a 1px separator, 16px side insets. The separator is black at 4% in the file, which no token carries; Line/Generic Subtle at 5% stands in. Catalog is Search results and Category as one component: both are a header, a product grid or list, then an optional loader, count and "load more" button 12 apart. The header differs — SearchResultsTitle for one, Title with the view switch for the other — so it is a slot rather than a variant. The "load more" button carries arrow-rotate-cw, which the Icons page does not have. It is taken from the button on the Search results symbol, exported at 24 and scaled to the 32 grid the other sixteen use; the generator lays it down on all four platforms alongside them. --- lib/assets/icons/arrow-rotate-cw.svg | 3 + lib/rees46_sdk.dart | 3 + .../components/personalization_catalog.dart | 107 ++++++++++++++ .../personalization_search_suggestions.dart | 136 ++++++++++++++++++ .../personalization_suggestion_row.dart | 128 +++++++++++++++++ lib/src/ui/personalization_icons.dart | 2 + 6 files changed, 379 insertions(+) create mode 100644 lib/assets/icons/arrow-rotate-cw.svg create mode 100644 lib/src/ui/components/personalization_catalog.dart create mode 100644 lib/src/ui/components/personalization_search_suggestions.dart create mode 100644 lib/src/ui/components/personalization_suggestion_row.dart diff --git a/lib/assets/icons/arrow-rotate-cw.svg b/lib/assets/icons/arrow-rotate-cw.svg new file mode 100644 index 0000000..d328573 --- /dev/null +++ b/lib/assets/icons/arrow-rotate-cw.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index 71fa471..efbaef9 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -48,3 +48,6 @@ export 'src/ui/components/personalization_product_card.dart'; export 'src/ui/components/personalization_product.dart'; export 'src/ui/components/personalization_products_list.dart'; export 'src/ui/components/personalization_recommender_block.dart'; +export 'src/ui/components/personalization_suggestion_row.dart'; +export 'src/ui/components/personalization_search_suggestions.dart'; +export 'src/ui/components/personalization_catalog.dart'; diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart new file mode 100644 index 0000000..16f20c3 --- /dev/null +++ b/lib/src/ui/components/personalization_catalog.dart @@ -0,0 +1,107 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import 'personalization_button.dart'; +import 'personalization_count.dart'; +import 'personalization_loader.dart'; +import 'personalization_product.dart'; +import 'personalization_products_list.dart'; + +/// Счётчик каталога «показано N из M». Слова — параметры. +@immutable +class PersonalizationCatalogCount { + const PersonalizationCatalogCount({ + required this.prefix, + required this.shown, + required this.separator, + required this.total, + }); + + final String prefix; + final int shown; + final String separator; + final int total; +} + +/// Экран каталога: заголовок, плитка или список товаров, внизу лоадер, счётчик +/// и кнопка «загрузить ещё». +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card — Search results (167:4477) и +/// Category (167:4856). Оба одной формы, разница только в заголовке: у выдачи +/// [PersonalizationSearchResultsTitle], у категории [PersonalizationTitle] с +/// переключателем вида. Поэтому заголовок здесь — слот, а не вариант. +/// Три нижних элемента в макете скрываемые (showLoader, showCount, showLoadMore). +/// Шаг блока 12. +class PersonalizationCatalog extends StatelessWidget { + const PersonalizationCatalog({ + super.key, + this.header, + this.layout = PersonalizationProductsLayout.grid, + required this.products, + this.onProductAction, + this.loading = false, + this.count, + this.loadMoreText, + this.onLoadMore, + this.iconBuilder, + }); + + final Widget? header; + final PersonalizationProductsLayout layout; + final List products; + final ValueChanged? onProductAction; + final bool loading; + final PersonalizationCatalogCount? count; + + /// Подпись кнопки «загрузить ещё». `null` — без кнопки. + final String? loadMoreText; + final VoidCallback? onLoadMore; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final sections = [ + ?header, + PersonalizationProductsList( + layout: layout, + products: products, + onProductAction: onProductAction, + iconBuilder: iconBuilder, + ), + if (loading) const PersonalizationLoader(), + if (count != null) + PersonalizationCount( + prefix: count!.prefix, + shown: count!.shown, + separator: count!.separator, + total: count!.total, + ), + if (loadMoreText != null && loadMoreText!.isNotEmpty) + PersonalizationButton( + label: loadMoreText, + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + iconStart: PersonalizationIcons.arrowRotateCw, + iconBuilder: iconBuilder, + onPressed: onLoadMore, + ), + ]; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < sections.length; i++) ...[ + if (i > 0) const SizedBox(height: 12), + sections[i], + ], + ], + ); + } +} diff --git a/lib/src/ui/components/personalization_search_suggestions.dart b/lib/src/ui/components/personalization_search_suggestions.dart new file mode 100644 index 0000000..1a36096 --- /dev/null +++ b/lib/src/ui/components/personalization_search_suggestions.dart @@ -0,0 +1,136 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import 'personalization_suggestion_row.dart'; +import 'personalization_tag.dart'; + +/// Подсказка поиска. +@immutable +class PersonalizationSuggestion { + const PersonalizationSuggestion({ + required this.id, + required this.title, + this.subtitle, + this.image, + }); + + final String id; + final String title; + + /// Цена у товара, родительская категория у категории. + final String? subtitle; + final ImageProvider? image; +} + +/// Панель подсказок поиска: теги-подсказки, категории, товары. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card, фрейм Search (151:3880). +/// Экран там нарисован наброском — шапка вручную, а не из InputField, шрифт +/// SF Pro, — поэтому сюда взято только то, что читается однозначно: ряд тегов +/// с шагом 8, блоки категорий и товаров с шагом 12 внутри и между, разделитель +/// 1px, боковые поля 16. Разделитель в макете — чёрный 4%, ближайший токен +/// Line/Generic Subtle (5%). +/// +/// Строки — [PersonalizationSuggestionRow], теги — [PersonalizationTag]. +class PersonalizationSearchSuggestions extends StatelessWidget { + const PersonalizationSearchSuggestions({ + super.key, + this.tags = const [], + this.categories = const [], + this.products = const [], + this.highlight, + this.showImages = false, + this.onTagTap, + this.onCategoryTap, + this.onProductTap, + this.iconBuilder, + }); + + final List tags; + final List categories; + final List products; + + /// Подстрока запроса, выделяемая в подсказках полужирным. + final String? highlight; + + /// Показывать ли картинки у строк: в макете есть оба варианта. + final bool showImages; + final ValueChanged? onTagTap; + final ValueChanged? onCategoryTap; + final ValueChanged? onProductTap; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + const double side = 16; + const double gap = 12; + + Widget block(List items, PersonalizationSuggestionKind kind, + ValueChanged? onTap) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: side), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (int i = 0; i < items.length; i++) ...[ + if (i > 0) const SizedBox(height: gap), + PersonalizationSuggestionRow( + kind: kind, + title: items[i].title, + subtitle: items[i].subtitle, + image: items[i].image, + showImage: showImages, + highlight: highlight, + onTap: onTap == null ? null : () => onTap(items[i]), + iconBuilder: iconBuilder, + ), + ], + ], + ), + ); + } + + final sections = [ + if (tags.isNotEmpty) + SingleChildScrollView( + scrollDirection: Axis.horizontal, + padding: const EdgeInsets.symmetric(horizontal: side), + child: Row( + children: [ + for (int i = 0; i < tags.length; i++) ...[ + if (i > 0) const SizedBox(width: 8), + // Tag сам по себе не кликабелен — нажатие ловит обёртка. + GestureDetector( + onTap: onTagTap == null ? null : () => onTagTap!(tags[i]), + child: PersonalizationTag(label: tags[i], view: PersonalizationTagView.primary), + ), + ], + ], + ), + ), + if (categories.isNotEmpty) block(categories, PersonalizationSuggestionKind.category, onCategoryTap), + // Разделитель нужен только между двумя непустыми блоками. + if (categories.isNotEmpty && products.isNotEmpty) + ColoredBox(color: colors.lineGenericSubtle, child: const SizedBox(height: 1, width: double.infinity)), + if (products.isNotEmpty) block(products, PersonalizationSuggestionKind.product, onProductTap), + ]; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < sections.length; i++) ...[ + if (i > 0) const SizedBox(height: gap), + sections[i], + ], + ], + ); + } +} diff --git a/lib/src/ui/components/personalization_suggestion_row.dart b/lib/src/ui/components/personalization_suggestion_row.dart new file mode 100644 index 0000000..48b3af2 --- /dev/null +++ b/lib/src/ui/components/personalization_suggestion_row.dart @@ -0,0 +1,128 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; + +/// Вид строки подсказки. +enum PersonalizationSuggestionKind { product, category } + +/// Строка подсказки поиска: товар или категория. +/// +/// Источник: Figma Mobile SDK UI Kit, секция Card — Product (151:4003) и Category +/// (151:4011), у обоих варианты Image и Text. Строка с картинкой 40x40 и двумя +/// строками текста (у товара цена, у категории родительская категория), либо одна +/// строка текста. У категории справа шеврон. Шаг между картинкой и текстом 10 — +/// значения нет в шкале отступов, взято из макета как есть. +/// +/// [highlight] выделяет совпадение с запросом полужирным, как в макете подсказок. +class PersonalizationSuggestionRow extends StatelessWidget { + const PersonalizationSuggestionRow({ + super.key, + this.kind = PersonalizationSuggestionKind.product, + required this.title, + this.subtitle, + this.image, + this.showImage = false, + this.highlight, + this.onTap, + this.iconBuilder, + }); + + final PersonalizationSuggestionKind kind; + final String title; + + /// Цена у товара, родительская категория у категории. Видна только с картинкой. + final String? subtitle; + final ImageProvider? image; + final bool showImage; + + /// Подстрока запроса, которую надо выделить в [title]. + final String? highlight; + final VoidCallback? onTap; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? iconBuilder; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final category = kind == PersonalizationSuggestionKind.category; + + TextStyle style(FontWeight weight, Color color) => TextStyle( + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.05, + fontWeight: weight, + color: color, + ); + final regular = style(FontWeight.w400, colors.textPrimary); + final bold = style(FontWeight.w600, colors.textPrimary); + + return GestureDetector( + onTap: onTap, + behavior: HitTestBehavior.opaque, + child: Row( + crossAxisAlignment: category ? CrossAxisAlignment.center : CrossAxisAlignment.start, + children: [ + if (showImage) ...[ + SizedBox( + width: 40, + height: 40, + child: ColoredBox( + color: colors.backgroundCard, + child: image == null ? null : Image(image: image!, fit: BoxFit.cover), + ), + ), + const SizedBox(width: 10), + ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text.rich(_highlighted(regular, bold), maxLines: 1, overflow: TextOverflow.ellipsis), + if (showImage && subtitle != null && subtitle!.isNotEmpty) + // У товара это цена полужирным, у категории — родитель серым. + Text( + subtitle!, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: category ? style(FontWeight.w400, colors.textHint) : bold, + ), + ], + ), + ), + if (category) ...[ + const SizedBox(width: 10), + SizedBox( + width: 24, + height: 24, + child: iconBuilder?.call(context, PersonalizationIcons.angleLargeRight, 24, colors.textHint), + ), + ], + ], + ), + ); + } + + TextSpan _highlighted(TextStyle regular, TextStyle bold) { + final query = highlight ?? ''; + final index = query.isEmpty ? -1 : title.toLowerCase().indexOf(query.toLowerCase()); + if (index < 0) return TextSpan(text: title, style: regular); + return TextSpan( + style: regular, + children: [ + TextSpan(text: title.substring(0, index)), + TextSpan(text: title.substring(index, index + query.length), style: bold), + TextSpan(text: title.substring(index + query.length)), + ], + ); + } +} diff --git a/lib/src/ui/personalization_icons.dart b/lib/src/ui/personalization_icons.dart index 359889f..2e3f699 100644 --- a/lib/src/ui/personalization_icons.dart +++ b/lib/src/ui/personalization_icons.dart @@ -11,6 +11,7 @@ abstract final class PersonalizationIcons { static const String angleLargeRight = 'packages/rees46_sdk/assets/icons/angle-large-right.svg'; static const String angleUp = 'packages/rees46_sdk/assets/icons/angle-up.svg'; static const String arrowLeft = 'packages/rees46_sdk/assets/icons/arrow-left.svg'; + static const String arrowRotateCw = 'packages/rees46_sdk/assets/icons/arrow-rotate-cw.svg'; static const String arrowsUpDown = 'packages/rees46_sdk/assets/icons/arrows-up-down.svg'; static const String copy = 'packages/rees46_sdk/assets/icons/copy.svg'; static const String crossLarge = 'packages/rees46_sdk/assets/icons/cross-large.svg'; @@ -29,6 +30,7 @@ abstract final class PersonalizationIcons { angleLargeRight, angleUp, arrowLeft, + arrowRotateCw, arrowsUpDown, copy, crossLarge, From 0ce2708664100a75d725188e417f24341a3daec8 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 15 Sep 2026 10:59:25 +0400 Subject: [PATCH 07/79] feat(ui): keep the design system out of the package barrel until release The UI kit is not used by the SDK yet and its surface may still move, so it should not become public API just by landing on master. The src/ui exports are gone from lib/rees46_sdk.dart and gathered in lib/src/ui/personalization_ui.dart instead. Anything under src/ is an implementation detail by Dart convention, and the analyzer says so to whoever imports it; the example app does exactly that with an `// ignore: implementation_imports` on the import. Before the release the barrel is exported from rees46_sdk.dart and the kit becomes ordinary public API. --- lib/rees46_sdk.dart | 32 ------------------- lib/src/ui/personalization_ui.dart | 50 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 lib/src/ui/personalization_ui.dart diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index efbaef9..6cd497a 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -19,35 +19,3 @@ export 'src/sdk_init_config.dart'; export 'src/tracking/purchase_line_item.dart'; export 'src/tracking/tracking_api.dart'; export 'src/tracking/tracking_models.dart'; -export 'src/ui/personalization_typography.dart'; -export 'src/ui/personalization_spacing.dart'; -export 'src/ui/personalization_radius.dart'; -export 'src/ui/personalization_elevation.dart'; -export 'src/ui/personalization_icons.dart'; -export 'src/ui/personalization_colors.dart'; -export 'src/ui/personalization_theme.dart'; -export 'src/ui/components/personalization_badge.dart'; -export 'src/ui/components/personalization_tag.dart'; -export 'src/ui/components/personalization_checkbox.dart'; -export 'src/ui/components/personalization_checkbox_with_label.dart'; -export 'src/ui/components/personalization_loader.dart'; -export 'src/ui/components/personalization_empty_state.dart'; -export 'src/ui/components/personalization_button.dart'; -export 'src/ui/components/personalization_button_group.dart'; -export 'src/ui/components/personalization_input_field.dart'; -export 'src/ui/components/personalization_title.dart'; -export 'src/ui/components/personalization_accordion.dart'; -export 'src/ui/components/personalization_list_label.dart'; -export 'src/ui/components/personalization_dots.dart'; -export 'src/ui/components/personalization_count.dart'; -export 'src/ui/components/personalization_rating.dart'; -export 'src/ui/components/personalization_search_results_title.dart'; -export 'src/ui/components/personalization_product_image.dart'; -export 'src/ui/components/personalization_favorites_badge.dart'; -export 'src/ui/components/personalization_product_card.dart'; -export 'src/ui/components/personalization_product.dart'; -export 'src/ui/components/personalization_products_list.dart'; -export 'src/ui/components/personalization_recommender_block.dart'; -export 'src/ui/components/personalization_suggestion_row.dart'; -export 'src/ui/components/personalization_search_suggestions.dart'; -export 'src/ui/components/personalization_catalog.dart'; diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart new file mode 100644 index 0000000..26697e1 --- /dev/null +++ b/lib/src/ui/personalization_ui.dart @@ -0,0 +1,50 @@ +/// UI-кит дизайн-системы: токены, тема и все собранные на них компоненты. +/// +/// Намеренно не экспортируется из `package:rees46_sdk/rees46_sdk.dart`. Кит ещё +/// собирается и ничем в SDK не используется, поэтому до релиза, который его +/// выпустит, он остаётся вне публичной поверхности. Пока единственный вход — +/// прямой импорт этого файла; анализатор помечает его как implementation +/// import, и это ожидаемо: +/// +/// ```dart +/// // ignore: implementation_imports +/// import 'package:rees46_sdk/src/ui/personalization_ui.dart'; +/// ``` +/// +/// Перед релизом эти экспорты переезжают в барель пакета, и кит становится +/// обычным публичным API. +library; + +export 'personalization_typography.dart'; +export 'personalization_spacing.dart'; +export 'personalization_radius.dart'; +export 'personalization_elevation.dart'; +export 'personalization_icons.dart'; +export 'personalization_colors.dart'; +export 'personalization_theme.dart'; + +export 'components/personalization_badge.dart'; +export 'components/personalization_tag.dart'; +export 'components/personalization_checkbox.dart'; +export 'components/personalization_checkbox_with_label.dart'; +export 'components/personalization_loader.dart'; +export 'components/personalization_empty_state.dart'; +export 'components/personalization_button.dart'; +export 'components/personalization_button_group.dart'; +export 'components/personalization_input_field.dart'; +export 'components/personalization_title.dart'; +export 'components/personalization_accordion.dart'; +export 'components/personalization_list_label.dart'; +export 'components/personalization_dots.dart'; +export 'components/personalization_count.dart'; +export 'components/personalization_rating.dart'; +export 'components/personalization_search_results_title.dart'; +export 'components/personalization_product_image.dart'; +export 'components/personalization_favorites_badge.dart'; +export 'components/personalization_product_card.dart'; +export 'components/personalization_product.dart'; +export 'components/personalization_products_list.dart'; +export 'components/personalization_recommender_block.dart'; +export 'components/personalization_suggestion_row.dart'; +export 'components/personalization_search_suggestions.dart'; +export 'components/personalization_catalog.dart'; From f4338257cc56047132db3ce1f4b023bd8484932b Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 15 Sep 2026 14:46:36 +0400 Subject: [PATCH 08/79] fix(ui): ship the icon assets from the package root so they bundle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The icons lived in lib/assets/icons while pubspec.yaml declared assets/icons/. For a package's own assets the path is relative to the package root — the "lib/ is implied" rule applies only to the packages//... form an application writes — so the tool could not find the directory and no icon reached the app bundle. Every PersonalizationIcons key resolved to a missing asset at runtime. The files move to assets/icons; the keys already read packages/rees46_sdk/assets/icons/.svg and stay as they are. --- {lib/assets => assets}/icons/angle-down.svg | 0 {lib/assets => assets}/icons/angle-large-right.svg | 0 {lib/assets => assets}/icons/angle-up.svg | 0 {lib/assets => assets}/icons/arrow-left.svg | 0 {lib/assets => assets}/icons/arrow-rotate-cw.svg | 0 {lib/assets => assets}/icons/arrows-up-down.svg | 0 {lib/assets => assets}/icons/copy.svg | 0 {lib/assets => assets}/icons/cross-large.svg | 0 {lib/assets => assets}/icons/cross.svg | 0 {lib/assets => assets}/icons/equalizer-horizontal.svg | 0 {lib/assets => assets}/icons/grid-2x2-fill.svg | 0 {lib/assets => assets}/icons/grid-2x2.svg | 0 {lib/assets => assets}/icons/list-fill.svg | 0 {lib/assets => assets}/icons/list.svg | 0 {lib/assets => assets}/icons/magnifier.svg | 0 {lib/assets => assets}/icons/spacing-md.svg | 0 {lib/assets => assets}/icons/star-fill.svg | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename {lib/assets => assets}/icons/angle-down.svg (100%) rename {lib/assets => assets}/icons/angle-large-right.svg (100%) rename {lib/assets => assets}/icons/angle-up.svg (100%) rename {lib/assets => assets}/icons/arrow-left.svg (100%) rename {lib/assets => assets}/icons/arrow-rotate-cw.svg (100%) rename {lib/assets => assets}/icons/arrows-up-down.svg (100%) rename {lib/assets => assets}/icons/copy.svg (100%) rename {lib/assets => assets}/icons/cross-large.svg (100%) rename {lib/assets => assets}/icons/cross.svg (100%) rename {lib/assets => assets}/icons/equalizer-horizontal.svg (100%) rename {lib/assets => assets}/icons/grid-2x2-fill.svg (100%) rename {lib/assets => assets}/icons/grid-2x2.svg (100%) rename {lib/assets => assets}/icons/list-fill.svg (100%) rename {lib/assets => assets}/icons/list.svg (100%) rename {lib/assets => assets}/icons/magnifier.svg (100%) rename {lib/assets => assets}/icons/spacing-md.svg (100%) rename {lib/assets => assets}/icons/star-fill.svg (100%) diff --git a/lib/assets/icons/angle-down.svg b/assets/icons/angle-down.svg similarity index 100% rename from lib/assets/icons/angle-down.svg rename to assets/icons/angle-down.svg diff --git a/lib/assets/icons/angle-large-right.svg b/assets/icons/angle-large-right.svg similarity index 100% rename from lib/assets/icons/angle-large-right.svg rename to assets/icons/angle-large-right.svg diff --git a/lib/assets/icons/angle-up.svg b/assets/icons/angle-up.svg similarity index 100% rename from lib/assets/icons/angle-up.svg rename to assets/icons/angle-up.svg diff --git a/lib/assets/icons/arrow-left.svg b/assets/icons/arrow-left.svg similarity index 100% rename from lib/assets/icons/arrow-left.svg rename to assets/icons/arrow-left.svg diff --git a/lib/assets/icons/arrow-rotate-cw.svg b/assets/icons/arrow-rotate-cw.svg similarity index 100% rename from lib/assets/icons/arrow-rotate-cw.svg rename to assets/icons/arrow-rotate-cw.svg diff --git a/lib/assets/icons/arrows-up-down.svg b/assets/icons/arrows-up-down.svg similarity index 100% rename from lib/assets/icons/arrows-up-down.svg rename to assets/icons/arrows-up-down.svg diff --git a/lib/assets/icons/copy.svg b/assets/icons/copy.svg similarity index 100% rename from lib/assets/icons/copy.svg rename to assets/icons/copy.svg diff --git a/lib/assets/icons/cross-large.svg b/assets/icons/cross-large.svg similarity index 100% rename from lib/assets/icons/cross-large.svg rename to assets/icons/cross-large.svg diff --git a/lib/assets/icons/cross.svg b/assets/icons/cross.svg similarity index 100% rename from lib/assets/icons/cross.svg rename to assets/icons/cross.svg diff --git a/lib/assets/icons/equalizer-horizontal.svg b/assets/icons/equalizer-horizontal.svg similarity index 100% rename from lib/assets/icons/equalizer-horizontal.svg rename to assets/icons/equalizer-horizontal.svg diff --git a/lib/assets/icons/grid-2x2-fill.svg b/assets/icons/grid-2x2-fill.svg similarity index 100% rename from lib/assets/icons/grid-2x2-fill.svg rename to assets/icons/grid-2x2-fill.svg diff --git a/lib/assets/icons/grid-2x2.svg b/assets/icons/grid-2x2.svg similarity index 100% rename from lib/assets/icons/grid-2x2.svg rename to assets/icons/grid-2x2.svg diff --git a/lib/assets/icons/list-fill.svg b/assets/icons/list-fill.svg similarity index 100% rename from lib/assets/icons/list-fill.svg rename to assets/icons/list-fill.svg diff --git a/lib/assets/icons/list.svg b/assets/icons/list.svg similarity index 100% rename from lib/assets/icons/list.svg rename to assets/icons/list.svg diff --git a/lib/assets/icons/magnifier.svg b/assets/icons/magnifier.svg similarity index 100% rename from lib/assets/icons/magnifier.svg rename to assets/icons/magnifier.svg diff --git a/lib/assets/icons/spacing-md.svg b/assets/icons/spacing-md.svg similarity index 100% rename from lib/assets/icons/spacing-md.svg rename to assets/icons/spacing-md.svg diff --git a/lib/assets/icons/star-fill.svg b/assets/icons/star-fill.svg similarity index 100% rename from lib/assets/icons/star-fill.svg rename to assets/icons/star-fill.svg From 57103467f8495b91f00d555b7a5c9db5b0642617 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 15 Sep 2026 14:46:36 +0400 Subject: [PATCH 09/79] feat(example): UI Kit screen shows the design system's components and blocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A "UI Kit" route, reachable from the app bar and a button on the main page, with two tabs. "Components" walks through every primitive in the sizes, views and states the design file defines; "Blocks" shows the compositions built from them — product cards, the three recommender layouts, search suggestions and the catalogue with its header slot, grid/list switch, count and load-more flow. The kit stays out of the package barrel until its release, so the example imports it directly and silences the implementation-import lint on that line. The kit does not draw SVG itself: the example adds flutter_svg and hands every icon through the components' iconBuilder. Product data is static and images are plain NetworkImage providers. --- example/lib/main.dart | 18 ++ example/lib/ui_kit_pane.dart | 605 +++++++++++++++++++++++++++++++++++ example/pubspec.lock | 68 +++- example/pubspec.yaml | 3 + 4 files changed, 692 insertions(+), 2 deletions(-) create mode 100644 example/lib/ui_kit_pane.dart diff --git a/example/lib/main.dart b/example/lib/main.dart index 0a28a95..ae4b247 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:rees46_sdk/rees46_sdk.dart'; import 'multi_instance_pane.dart'; +import 'ui_kit_pane.dart'; void main() => runApp(const App()); @@ -724,6 +725,14 @@ class _InitPageState extends State { appBar: AppBar( title: const Text('REES46 SDK init demo'), actions: [ + IconButton( + key: const Key('open-ui-kit'), + tooltip: 'UI Kit', + icon: const Icon(Icons.widgets_outlined), + onPressed: () => Navigator.of(context).push( + MaterialPageRoute(builder: (_) => const UiKitPane()), + ), + ), IconButton( key: const Key('open-multi-instance'), tooltip: 'Multi-instance (two shops)', @@ -762,6 +771,15 @@ class _InitPageState extends State { label: const Text('Open multi-instance demo (two shops)'), ), const SizedBox(height: 12), + FilledButton.tonalIcon( + key: const Key('open-ui-kit-button'), + onPressed: () => Navigator.of(context).push( + MaterialPageRoute(builder: (_) => const UiKitPane()), + ), + icon: const Icon(Icons.widgets_outlined), + label: const Text('Open UI Kit (components and blocks)'), + ), + const SizedBox(height: 12), _PushTokenCard( token: _storedPushToken, updatedAt: _tokenUpdatedAt, diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart new file mode 100644 index 0000000..e02129a --- /dev/null +++ b/example/lib/ui_kit_pane.dart @@ -0,0 +1,605 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +// The kit stays out of the package barrel until its release; the example reaches +// it directly, which the analyzer flags as an implementation import on purpose. +// ignore: implementation_imports +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +/// "UI Kit" screen — the design system, one exhibit per component. +/// +/// "Components" walks through the primitives in every size, view and state the +/// design file defines; "Blocks" shows the compositions built from them +/// (product cards, recommender layouts, search suggestions, the catalogue). +/// Mirror of the Android `UiKitPane` / iOS `UIKitShowcaseViewController` / +/// React Native `UiKitPane`. +/// +/// The kit does not draw SVG itself: every icon comes back through an +/// `iconBuilder`, rendered here with flutter_svg. Product data is static and +/// images are plain [ImageProvider]s — the kit does not fetch or format +/// anything. +class UiKitPane extends StatelessWidget { + const UiKitPane({super.key}); + + @override + Widget build(BuildContext context) { + return DefaultTabController( + length: 2, + child: Scaffold( + appBar: AppBar( + title: const Text('UI Kit'), + bottom: const TabBar( + tabs: [ + Tab(text: 'Components'), + Tab(text: 'Blocks'), + ], + ), + ), + body: TabBarView( + children: [ + _Showcase(exhibits: _componentExhibits), + _Showcase(exhibits: _blockExhibits), + ], + ), + ), + ); + } +} + +class _Exhibit { + const _Exhibit(this.title, this.build); + + final String title; + final WidgetBuilder build; +} + +class _Showcase extends StatelessWidget { + const _Showcase({required this.exhibits}); + + final List<_Exhibit> exhibits; + + @override + Widget build(BuildContext context) { + final caption = Theme.of(context).textTheme.bodySmall?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + ); + return ListView.separated( + padding: const EdgeInsets.fromLTRB(16, 16, 16, 40), + itemCount: exhibits.length, + separatorBuilder: (_, _) => const SizedBox(height: 24), + itemBuilder: (context, index) { + final exhibit = exhibits[index]; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(exhibit.title, style: caption), + const SizedBox(height: 8), + exhibit.build(context), + ], + ); + }, + ); + } +} + +// --- Exhibits --------------------------------------------------------------- + +final List<_Exhibit> _componentExhibits = [ + _Exhibit('Button — LG / MD / SM, primary · secondary · ghost', (context) { + return _Column( + children: [ + for (final size in PersonalizationButtonSize.values) + _ScrollRow( + children: [ + PersonalizationButton( + label: 'Primary', + size: size, + view: PersonalizationButtonView.primary, + onPressed: () {}, + ), + PersonalizationButton( + label: 'Secondary', + size: size, + view: PersonalizationButtonView.secondary, + onPressed: () {}, + ), + PersonalizationButton( + label: 'Ghost', + size: size, + view: PersonalizationButtonView.ghost, + onPressed: () {}, + ), + ], + ), + ], + ); + }), + _Exhibit('Button — icons and disabled', (context) { + return _ScrollRow( + children: [ + PersonalizationButton( + label: 'Filters', + size: PersonalizationButtonSize.md, + iconStart: PersonalizationIcons.equalizerHorizontal, + iconBuilder: _icon, + onPressed: () {}, + ), + PersonalizationButton( + label: 'Sort', + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + iconEnd: PersonalizationIcons.arrowsUpDown, + iconBuilder: _icon, + onPressed: () {}, + ), + PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.copy, + iconBuilder: _icon, + onPressed: () {}, + ), + const PersonalizationButton( + label: 'Disabled', + size: PersonalizationButtonSize.md, + ), + ], + ); + }), + _Exhibit('Button Group — MD and SM', (context) { + return const _Row( + children: [ + _ButtonGroupExhibit(size: PersonalizationButtonGroupSize.md), + _ButtonGroupExhibit(size: PersonalizationButtonGroupSize.sm), + ], + ); + }), + _Exhibit('Input Field — search LG, input MD, select SM, disabled', (context) { + return _Column( + children: [ + PersonalizationInputField( + size: PersonalizationInputFieldSize.lg, + type: PersonalizationInputFieldType.search, + placeholder: 'Search', + iconBuilder: _icon, + ), + PersonalizationInputField( + size: PersonalizationInputFieldSize.md, + type: PersonalizationInputFieldType.input, + controller: TextEditingController(text: 'Running shoes'), + iconBuilder: _icon, + ), + PersonalizationInputField( + size: PersonalizationInputFieldSize.sm, + type: PersonalizationInputFieldType.select, + controller: TextEditingController(text: 'Size 42'), + iconBuilder: _icon, + onSelectTap: () {}, + ), + PersonalizationInputField( + size: PersonalizationInputFieldSize.md, + type: PersonalizationInputFieldType.input, + placeholder: 'Disabled', + enabled: false, + iconBuilder: _icon, + ), + ], + ); + }), + _Exhibit('Title — plain, with trailing action, with leading back', (context) { + return _Column( + children: [ + const PersonalizationTitle(title: 'Recommended for you'), + PersonalizationTitle( + title: 'Recently viewed', + trailing: PersonalizationButton( + label: 'Show all', + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.ghost, + iconEnd: PersonalizationIcons.angleLargeRight, + iconBuilder: _icon, + onPressed: () {}, + ), + ), + PersonalizationTitle( + title: 'Sneakers', + leading: PersonalizationButton( + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.arrowLeft, + iconBuilder: _icon, + onPressed: () {}, + ), + ), + ], + ); + }), + _Exhibit('Search Results Title', (context) => const _SearchResultsTitleExhibit()), + _Exhibit('Accordion — collapsed with count, expanded', (context) { + return _Column( + children: [ + PersonalizationAccordion(label: 'Brand', count: 12, iconBuilder: _icon), + PersonalizationAccordion(label: 'Size', expanded: true, iconBuilder: _icon), + ], + ); + }), + _Exhibit('List Label', (context) => const PersonalizationListLabel(label: 'Popular categories')), + _Exhibit('Badge — warning LG / MD / SM, danger', (context) { + return const _Row( + children: [ + PersonalizationBadge(label: 'New', size: PersonalizationBadgeSize.lg), + PersonalizationBadge(label: 'New', size: PersonalizationBadgeSize.md), + PersonalizationBadge(label: 'New', size: PersonalizationBadgeSize.sm), + PersonalizationBadge( + label: '-15%', + size: PersonalizationBadgeSize.md, + view: PersonalizationBadgeView.danger, + ), + ], + ); + }), + _Exhibit('Tag — primary with remove, secondary', (context) { + return _Row( + children: [ + PersonalizationTag(label: 'Nike', onRemove: () {}, removeIconBuilder: _removeIcon), + PersonalizationTag( + label: 'Size 42', + view: PersonalizationTagView.secondary, + onRemove: () {}, + removeIconBuilder: _removeIcon, + ), + const PersonalizationTag(label: 'Running', view: PersonalizationTagView.secondary), + ], + ); + }), + _Exhibit('Checkbox — unchecked, checked, indeterminate, disabled; with label', (context) { + return const _Column( + children: [ + _Row( + children: [ + PersonalizationCheckbox(state: PersonalizationCheckboxState.unchecked), + PersonalizationCheckbox(state: PersonalizationCheckboxState.checked), + PersonalizationCheckbox(state: PersonalizationCheckboxState.indeterminate), + PersonalizationCheckbox(state: PersonalizationCheckboxState.checked, disabled: true), + ], + ), + PersonalizationCheckboxWithLabel( + label: 'In stock only', + state: PersonalizationCheckboxState.checked, + ), + ], + ); + }), + _Exhibit('Dots, Count, Rating', (context) { + return _Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const PersonalizationDots(count: 5, selectedIndex: 1), + const PersonalizationCount(prefix: 'Showing', shown: 12, separator: 'of', total: 128), + PersonalizationRating(value: '4.7', reviews: 128, iconBuilder: _icon), + ], + ); + }), + _Exhibit('Loader, Favorites Badge', (context) { + return _Row( + children: [ + const PersonalizationLoader(), + PersonalizationFavoritesBadge(iconBuilder: _icon), + ], + ); + }), + _Exhibit('Product Image — 1:1, 4:3, 3:4', (context) { + return _Row( + children: [ + for (final (index, aspect) in PersonalizationProductImageAspect.values.indexed) + SizedBox( + width: 104, + child: PersonalizationProductImage(aspect: aspect, image: _products[index].image), + ), + ], + ); + }), + _Exhibit('Empty State', (context) => const PersonalizationEmptyState(message: 'No results for your request.')), + _Exhibit('Icons — the full set, 24 dp', (context) { + final color = PersonalizationTheme.of(context).colors.textPrimary; + return _ScrollRow( + children: [ + for (final asset in PersonalizationIcons.all) _icon(context, asset, 24, color), + ], + ); + }), +]; + +final List<_Exhibit> _blockExhibits = [ + _Exhibit('Product Card — carousel, grid, list', (context) { + return _Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(width: 220, child: _card(PersonalizationProductCardType.carousel, _products[0])), + SizedBox(width: 161, child: _card(PersonalizationProductCardType.grid, _products[1])), + _card(PersonalizationProductCardType.list, _products[2]), + ], + ); + }), + _Exhibit('Recommender Block — carousel', (context) { + return _recommender(PersonalizationProductsLayout.carousel, 'Recommended for you', _products); + }), + _Exhibit('Recommender Block — grid', (context) { + return _recommender(PersonalizationProductsLayout.grid, 'Similar products', _products.take(4).toList()); + }), + _Exhibit('Recommender Block — list', (context) { + return _recommender(PersonalizationProductsLayout.list, 'Recently viewed', _products.take(3).toList()); + }), + _Exhibit('Search Suggestions', (context) { + return PersonalizationSearchSuggestions( + highlight: 'run', + showImages: true, + tags: const ['running shoes', 'running jacket', 'run belt'], + categories: const [ + PersonalizationSuggestion(id: 'c1', title: 'Running shoes', subtitle: 'Shoes'), + PersonalizationSuggestion(id: 'c2', title: 'Running apparel', subtitle: 'Clothing'), + ], + products: [ + for (final p in _products.take(3)) + PersonalizationSuggestion(id: p.id, title: p.name, subtitle: p.price, image: p.image), + ], + onTagTap: (_) {}, + onCategoryTap: (_) {}, + onProductTap: (_) {}, + iconBuilder: _icon, + ); + }), + _Exhibit('Catalog — header, grid ⇄ list, count, load more', (context) => const _CatalogExhibit()), +]; + +// --- Stateful exhibits ------------------------------------------------------ + +class _ButtonGroupExhibit extends StatefulWidget { + const _ButtonGroupExhibit({required this.size}); + + final PersonalizationButtonGroupSize size; + + @override + State<_ButtonGroupExhibit> createState() => _ButtonGroupExhibitState(); +} + +class _ButtonGroupExhibitState extends State<_ButtonGroupExhibit> { + int _selected = 0; + + @override + Widget build(BuildContext context) { + return PersonalizationButtonGroup( + size: widget.size, + selectedIndex: _selected, + onSelected: (index) => setState(() => _selected = index), + iconBuilder: _icon, + items: const [ + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.grid2x2, + activeIcon: PersonalizationIcons.grid2x2Fill, + ), + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.list, + activeIcon: PersonalizationIcons.listFill, + ), + ], + ); + } +} + +class _SearchResultsTitleExhibit extends StatefulWidget { + const _SearchResultsTitleExhibit({this.onViewChanged}); + + final ValueChanged? onViewChanged; + + @override + State<_SearchResultsTitleExhibit> createState() => _SearchResultsTitleExhibitState(); +} + +class _SearchResultsTitleExhibitState extends State<_SearchResultsTitleExhibit> { + int _view = 0; + + @override + Widget build(BuildContext context) { + return PersonalizationSearchResultsTitle( + title: 'Sneakers', + selectedViewIndex: _view, + onViewChanged: (index) { + setState(() => _view = index); + widget.onViewChanged?.call(index); + }, + onBack: () {}, + onFilters: () {}, + onSort: () {}, + results: const PersonalizationSearchResults(prefix: 'Found', count: 128, suffix: 'products'), + filters: [ + PersonalizationSearchFilter(label: 'Nike', onRemove: () {}), + PersonalizationSearchFilter(label: 'Size 42', onRemove: () {}), + ], + iconBuilder: _icon, + ); + } +} + +/// The catalogue as a host would wire it: the results title in the header slot +/// drives the grid/list switch, "load more" appends a page after a short +/// simulated delay. +class _CatalogExhibit extends StatefulWidget { + const _CatalogExhibit(); + + @override + State<_CatalogExhibit> createState() => _CatalogExhibitState(); +} + +class _CatalogExhibitState extends State<_CatalogExhibit> { + PersonalizationProductsLayout _layout = PersonalizationProductsLayout.grid; + List _shown = _products.take(4).toList(); + bool _loading = false; + + Future _loadMore() async { + setState(() => _loading = true); + await Future.delayed(const Duration(milliseconds: 800)); + if (!mounted) return; + setState(() { + final page = _products.skip(_shown.length % _products.length).take(4); + _shown = [ + ..._shown, + for (final p in page) p.copyWith(id: '${p.id}-${_shown.length}'), + ]; + _loading = false; + }); + } + + @override + Widget build(BuildContext context) { + return PersonalizationCatalog( + header: _SearchResultsTitleExhibit( + onViewChanged: (index) => setState(() { + _layout = index == 0 ? PersonalizationProductsLayout.grid : PersonalizationProductsLayout.list; + }), + ), + layout: _layout, + products: _shown, + loading: _loading, + count: PersonalizationCatalogCount( + prefix: 'Showing', + shown: _shown.length, + separator: 'of', + total: _totalProducts, + ), + loadMoreText: 'Load more', + onLoadMore: _loadMore, + onProductAction: (_) {}, + iconBuilder: _icon, + ); + } +} + +// --- Layout helpers --------------------------------------------------------- + +class _Row extends StatelessWidget { + const _Row({required this.children}); + + final List children; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + for (final (index, child) in children.indexed) ...[ + if (index > 0) const SizedBox(width: 8), + child, + ], + ], + ); + } +} + +class _ScrollRow extends StatelessWidget { + const _ScrollRow({required this.children}); + + final List children; + + @override + Widget build(BuildContext context) { + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: _Row(children: children), + ); + } +} + +class _Column extends StatelessWidget { + const _Column({required this.children, this.crossAxisAlignment = CrossAxisAlignment.stretch}); + + final List children; + final CrossAxisAlignment crossAxisAlignment; + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: crossAxisAlignment, + children: [ + for (final (index, child) in children.indexed) ...[ + if (index > 0) const SizedBox(height: 12), + child, + ], + ], + ); + } +} + +/// The kit hands over the asset and the colour it wants; the host picks the renderer. +Widget _icon(BuildContext context, String asset, double size, Color color) { + return SvgPicture.asset( + asset, + width: size, + height: size, + colorFilter: ColorFilter.mode(color, BlendMode.srcIn), + ); +} + +Widget _removeIcon(BuildContext context, String asset) { + return _icon(context, asset, 16, PersonalizationTheme.of(context).colors.textPrimary); +} + +Widget _card(PersonalizationProductCardType type, PersonalizationProduct product) { + return PersonalizationProductCard( + type: type, + image: product.image, + brand: product.brand, + name: product.name, + rating: product.rating, + price: product.price, + oldPrice: product.oldPrice, + discount: product.discount, + actionText: product.actionText, + onAction: () {}, + iconBuilder: _icon, + ); +} + +Widget _recommender(PersonalizationProductsLayout layout, String title, List products) { + return PersonalizationRecommenderBlock( + layout: layout, + title: title, + showAllText: 'Show all', + onShowAll: () {}, + products: products, + onProductAction: (_) {}, + iconBuilder: _icon, + ); +} + +// --- Fixtures --------------------------------------------------------------- + +const int _totalProducts = 128; + +ImageProvider _image(String seed) => NetworkImage('https://picsum.photos/seed/$seed/600/600'); + +/// Static products for the exhibits. Strings arrive formatted — that is the kit's contract. +final List _products = [ + PersonalizationProduct(id: '1', name: 'Air Zoom Pegasus 41 running shoes', price: r'$140', image: _image('pegasus'), brand: 'Nike', rating: const PersonalizationProductRating(value: '4.7', reviews: 128), oldPrice: r'$165', discount: '-15%', actionText: 'Add to cart'), + PersonalizationProduct(id: '2', name: 'Wireless over-ear headphones', price: r'$299', image: _image('headphones'), brand: 'Sony', rating: const PersonalizationProductRating(value: '4.8', reviews: 2140), actionText: 'Add to cart'), + PersonalizationProduct(id: '3', name: 'Everyday backpack 20 L', price: r'$89', image: _image('backpack'), brand: 'Peak Design', rating: const PersonalizationProductRating(value: '4.6', reviews: 412), oldPrice: r'$110', discount: '-19%', actionText: 'Add to cart'), + PersonalizationProduct(id: '4', name: 'Trail running jacket', price: r'$175', image: _image('jacket'), brand: 'Salomon', rating: const PersonalizationProductRating(value: '4.5', reviews: 77), actionText: 'Add to cart'), + PersonalizationProduct(id: '5', name: 'Polarized sunglasses', price: r'$120', image: _image('sunglasses'), brand: 'Oakley', rating: const PersonalizationProductRating(value: '4.4', reviews: 305), oldPrice: r'$150', discount: '-20%', actionText: 'Add to cart'), + PersonalizationProduct(id: '6', name: 'Insulated bottle 750 ml', price: r'$35', image: _image('bottle'), brand: 'Hydro Flask', rating: const PersonalizationProductRating(value: '4.9', reviews: 980), actionText: 'Add to cart'), + PersonalizationProduct(id: '7', name: 'GPS running watch', price: r'$449', image: _image('watch'), brand: 'Garmin', rating: const PersonalizationProductRating(value: '4.7', reviews: 1532), actionText: 'Add to cart'), + PersonalizationProduct(id: '8', name: 'Court sneakers', price: r'$95', image: _image('sneakers'), brand: 'Adidas', rating: const PersonalizationProductRating(value: '4.3', reviews: 64), oldPrice: r'$120', discount: '-21%', actionText: 'Add to cart'), +]; + +extension on PersonalizationProduct { + PersonalizationProduct copyWith({required String id}) { + return PersonalizationProduct( + id: id, + name: name, + price: price, + image: image, + brand: brand, + rating: rating, + oldPrice: oldPrice, + discount: discount, + actionText: actionText, + ); + } +} diff --git a/example/pubspec.lock b/example/pubspec.lock index b21c337..2da1309 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" async: dependency: transitive description: @@ -99,6 +107,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f" + url: "https://pub.dev" + source: hosted + version: "2.3.0" flutter_test: dependency: "direct dev" description: flutter @@ -202,6 +218,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" patrol: dependency: "direct dev" description: @@ -226,6 +250,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.8.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675" + url: "https://pub.dev" + source: hosted + version: "7.0.2" platform: dependency: transitive description: @@ -256,7 +288,7 @@ packages: path: ".." relative: true source: path - version: "0.2.0" + version: "1.0.0" shelf: dependency: transitive description: @@ -334,6 +366,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "9d0e3b9cb16542ad660daee871e726a10d13a93b7b5391677c3160e8f5e83935" + url: "https://pub.dev" + source: hosted + version: "1.2.3" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" + url: "https://pub.dev" + source: hosted + version: "1.1.13" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "4dca4feb77dc3ec7f6e27e49c53241eb8217f55e4f9b12599a27f8903bca5682" + url: "https://pub.dev" + source: hosted + version: "1.3.0" vector_math: dependency: transitive description: @@ -366,6 +422,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" + xml: + dependency: transitive + description: + name: xml + sha256: "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4" + url: "https://pub.dev" + source: hosted + version: "7.0.1" sdks: dart: ">=3.11.1 <4.0.0" - flutter: ">=3.32.0" + flutter: ">=3.38.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index b829cea..0530aff 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -29,6 +29,9 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + # The SDK ships its icons as SVG assets and leaves rendering to the host. + flutter_svg: ^2.2.0 + dev_dependencies: integration_test: sdk: flutter From 6cb4a4d128195ea0c4a54c8973ae58f76656d518 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 00:27:51 +0400 Subject: [PATCH 10/79] feat(ui): instant search and filters screens, text link The search suggestions panel was built from the sketch in the Card section; the InstantSearchField page holds the real screens, and they differ: a search field with a Cancel link on top, labelled sections, recent searches with a Clear link and removable tags that wrap onto new lines with a "more" tag at the end, and plain suggestion tags while typing. PersonalizationInstantSearch replaces PersonalizationSearchSuggestions with that layout; matches in the rows are bolded from the field's text. PersonalizationFilters is the Search Results/Filters screen: a title with a close button, range sections made of two input fields and option sections made of checkboxes behind a "show more" accordion, with reset and apply buttons at the bottom. The state of the checkboxes, the fields and the expanded sections lives in the widget; the host gets the changes through callbacks and the final sections on apply. PersonalizationLink is the text link both screens use; the design file has no symbol for it, the style comes from the screens. The input field gains onSubmitted with the search key on the keyboard. --- .../components/personalization_filters.dart | 402 ++++++++++++++++++ .../personalization_input_field.dart | 9 + .../personalization_instant_search.dart | 317 ++++++++++++++ .../ui/components/personalization_link.dart | 50 +++ .../personalization_search_suggestions.dart | 136 ------ lib/src/ui/personalization_ui.dart | 4 +- 6 files changed, 781 insertions(+), 137 deletions(-) create mode 100644 lib/src/ui/components/personalization_filters.dart create mode 100644 lib/src/ui/components/personalization_instant_search.dart create mode 100644 lib/src/ui/components/personalization_link.dart delete mode 100644 lib/src/ui/components/personalization_search_suggestions.dart diff --git a/lib/src/ui/components/personalization_filters.dart b/lib/src/ui/components/personalization_filters.dart new file mode 100644 index 0000000..4175312 --- /dev/null +++ b/lib/src/ui/components/personalization_filters.dart @@ -0,0 +1,402 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; +import '../personalization_typography.dart'; +import 'personalization_accordion.dart'; +import 'personalization_button.dart'; +import 'personalization_checkbox.dart'; +import 'personalization_checkbox_with_label.dart'; +import 'personalization_input_field.dart'; +import 'personalization_title.dart'; + +/// Вариант в секции чекбоксов фильтров. +@immutable +class PersonalizationFilterOption { + const PersonalizationFilterOption({ + required this.id, + required this.label, + this.checked = false, + }); + + final String id; + final String label; + final bool checked; + + PersonalizationFilterOption copyWith({bool? checked}) => + PersonalizationFilterOption( + id: id, + label: label, + checked: checked ?? this.checked, + ); +} + +/// Секция экрана фильтров: диапазон или список чекбоксов. +@immutable +sealed class PersonalizationFilterSection { + const PersonalizationFilterSection({required this.id, required this.title}); + + final String id; + final String title; +} + +/// Два поля «от — до». [select] — поля типа Select, список открывает хост. +class PersonalizationFilterRange extends PersonalizationFilterSection { + const PersonalizationFilterRange({ + required super.id, + required super.title, + required this.fromLabel, + required this.toLabel, + this.from, + this.to, + this.select = false, + }); + + final String fromLabel; + final String toLabel; + final String? from; + final String? to; + final bool select; + + PersonalizationFilterRange copyWith({String? from, String? to}) => + PersonalizationFilterRange( + id: id, + title: title, + fromLabel: fromLabel, + toLabel: toLabel, + from: from ?? this.from, + to: to ?? this.to, + select: select, + ); +} + +/// Список чекбоксов; сверх [collapsedCount] прячется за аккордеон. +class PersonalizationFilterOptions extends PersonalizationFilterSection { + const PersonalizationFilterOptions({ + required super.id, + required super.title, + required this.options, + this.collapsedCount = 5, + this.showMoreText, + this.showLessText, + }); + + final List options; + final int collapsedCount; + final String? showMoreText; + final String? showLessText; + + PersonalizationFilterOptions copyWith({ + List? options, + }) => PersonalizationFilterOptions( + id: id, + title: title, + options: options ?? this.options, + collapsedCount: collapsedCount, + showMoreText: showMoreText, + showLessText: showLessText, + ); +} + +/// Экран фильтров выдачи: заголовок с крестиком, секции и две кнопки внизу. +/// +/// Источник: Figma Mobile SDK UI Kit, страница SearchResultsScreen — Search Results/Filters +/// (203:8083) и /Filters Dark Theme (241:10831). Заголовок — [PersonalizationTitle] c +/// ghost-кнопкой cross-large (Title/Filters, 204:8340). Секции двух видов: диапазон +/// «From — to» из двух [PersonalizationInputField] md и список +/// [PersonalizationCheckboxWithLabel] с [PersonalizationAccordion] «показать ещё». +/// Внизу [PersonalizationButton] md: secondary «Reset» и primary «Apply» поровну. +/// Шаг между секциями 16, внутри секции 12, заголовок секции — LG/Emphasized 18/28. +/// Фон экрана — Background/Generic. +/// +/// Состояние чекбоксов, полей и раскрытия секций живёт здесь; хост получает изменения +/// колбэками и на «Apply» — итоговый список секций. +class PersonalizationFilters extends StatefulWidget { + const PersonalizationFilters({ + super.key, + required this.title, + this.onClose, + this.sections = const [], + this.resetText, + this.applyText, + this.onReset, + this.onApply, + this.onOptionToggle, + this.onRangeChanged, + this.onRangeSelectTap, + this.iconBuilder, + }); + + final String title; + final VoidCallback? onClose; + final List sections; + final String? resetText; + final String? applyText; + final VoidCallback? onReset; + final ValueChanged>? onApply; + + /// Изменился чекбокс: секция, вариант, новое значение. + final void Function(String sectionId, String optionId, bool checked)? + onOptionToggle; + + /// Изменилось поле диапазона: секция, «от», «до». + final void Function(String sectionId, String from, String to)? onRangeChanged; + + /// Нажато поле диапазона типа Select: секция и какое из двух (`true` — «от»). + final void Function(String sectionId, bool isFrom)? onRangeSelectTap; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => _PersonalizationFiltersState(); +} + +class _PersonalizationFiltersState extends State { + late List _sections = widget.sections; + final Set _expanded = {}; + final Map _from = + {}; + final Map _to = + {}; + + @override + void didUpdateWidget(PersonalizationFilters oldWidget) { + super.didUpdateWidget(oldWidget); + if (!identical(oldWidget.sections, widget.sections)) { + _sections = widget.sections; + for (final controller in _from.values.followedBy(_to.values)) { + controller.dispose(); + } + _from.clear(); + _to.clear(); + } + } + + @override + void dispose() { + for (final controller in _from.values.followedBy(_to.values)) { + controller.dispose(); + } + super.dispose(); + } + + TextEditingController _fieldController( + Map pool, + String id, + String? value, + ) => pool.putIfAbsent(id, () => TextEditingController(text: value)); + + void _update( + String sectionId, + PersonalizationFilterSection Function(PersonalizationFilterSection) change, + ) { + setState(() { + _sections = [ + for (final section in _sections) + section.id == sectionId ? change(section) : section, + ]; + }); + } + + Widget _label( + BuildContext context, + String text, + TextStyle base, + FontWeight weight, + ) { + final theme = PersonalizationTheme.of(context); + return Text( + text, + style: base.copyWith( + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + color: theme.colors.textPrimary, + ), + ); + } + + Widget _range(BuildContext context, PersonalizationFilterRange section) { + Widget field(bool isFrom) { + final controller = _fieldController( + isFrom ? _from : _to, + section.id, + isFrom ? section.from : section.to, + ); + return Expanded( + child: PersonalizationInputField( + controller: controller, + size: PersonalizationInputFieldSize.md, + type: section.select + ? PersonalizationInputFieldType.select + : PersonalizationInputFieldType.input, + onChanged: (text) { + _update( + section.id, + (s) => (s as PersonalizationFilterRange).copyWith( + from: isFrom ? text : null, + to: isFrom ? null : text, + ), + ); + widget.onRangeChanged?.call( + section.id, + _from[section.id]?.text ?? '', + _to[section.id]?.text ?? '', + ); + }, + onSelectTap: widget.onRangeSelectTap == null + ? null + : () => widget.onRangeSelectTap!(section.id, isFrom), + iconBuilder: widget.iconBuilder, + ), + ); + } + + return Row( + children: [ + _label( + context, + section.fromLabel, + PersonalizationTypography.baseDefault, + FontWeight.w400, + ), + const SizedBox(width: 12), + field(true), + const SizedBox(width: 12), + _label( + context, + section.toLabel, + PersonalizationTypography.baseDefault, + FontWeight.w400, + ), + const SizedBox(width: 12), + field(false), + ], + ); + } + + Widget _options(BuildContext context, PersonalizationFilterOptions section) { + final bool collapsible = + section.options.length > section.collapsedCount && + (section.showMoreText ?? '').isNotEmpty; + final bool open = _expanded.contains(section.id); + final visible = collapsible && !open + ? section.options.take(section.collapsedCount) + : section.options; + final rows = [ + for (final option in visible) + PersonalizationCheckboxWithLabel( + label: option.label, + state: option.checked + ? PersonalizationCheckboxState.checked + : PersonalizationCheckboxState.unchecked, + onChanged: (next) { + final checked = next == PersonalizationCheckboxState.checked; + _update(section.id, (s) { + final current = s as PersonalizationFilterOptions; + return current.copyWith( + options: [ + for (final item in current.options) + item.id == option.id + ? item.copyWith(checked: checked) + : item, + ], + ); + }); + widget.onOptionToggle?.call(section.id, option.id, checked); + }, + ), + if (collapsible) + PersonalizationAccordion( + label: open + ? (section.showLessText ?? section.showMoreText!) + : section.showMoreText!, + count: open ? null : section.options.length - section.collapsedCount, + expanded: open, + onToggle: (next) => setState( + () => + next ? _expanded.add(section.id) : _expanded.remove(section.id), + ), + iconBuilder: widget.iconBuilder, + ), + ]; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < rows.length; i++) ...[ + if (i > 0) const SizedBox(height: 12), + rows[i], + ], + ], + ); + } + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + const double sectionGap = 16; + return ColoredBox( + color: colors.backgroundGeneric, + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationTitle( + title: widget.title, + trailing: PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.crossLarge, + iconBuilder: widget.iconBuilder, + onPressed: widget.onClose, + ), + ), + for (final section in _sections) ...[ + const SizedBox(height: sectionGap), + _label( + context, + section.title, + PersonalizationTypography.lgEmphasized, + FontWeight.w600, + ), + const SizedBox(height: 12), + switch (section) { + PersonalizationFilterRange() => _range(context, section), + PersonalizationFilterOptions() => _options(context, section), + }, + ], + const SizedBox(height: sectionGap * 2), + Row( + children: [ + Expanded( + child: PersonalizationButton( + label: widget.resetText, + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + onPressed: widget.onReset, + ), + ), + const SizedBox(width: sectionGap), + Expanded( + child: PersonalizationButton( + label: widget.applyText, + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.primary, + onPressed: widget.onApply == null + ? null + : () => widget.onApply!(_sections), + ), + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_input_field.dart b/lib/src/ui/components/personalization_input_field.dart index 67ed9b1..539655e 100644 --- a/lib/src/ui/components/personalization_input_field.dart +++ b/lib/src/ui/components/personalization_input_field.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart' show InputDecoration, Material, MaterialType, TextField; +import 'package:flutter/services.dart' show TextInputAction; import 'package:flutter/widgets.dart'; import '../personalization_colors.dart'; @@ -41,6 +42,7 @@ class PersonalizationInputField extends StatefulWidget { this.type = PersonalizationInputFieldType.search, this.enabled = true, this.onChanged, + this.onSubmitted, this.onClear, this.onSelectTap, this.iconBuilder, @@ -53,6 +55,9 @@ class PersonalizationInputField extends StatefulWidget { final bool enabled; final ValueChanged? onChanged; + /// Кнопка «искать» на клавиатуре у типа Search, «готово» у остальных. + final ValueChanged? onSubmitted; + /// Нажатие на крестик у типа Search. Поле очищается в любом случае. final VoidCallback? onClear; @@ -191,6 +196,10 @@ class _PersonalizationInputFieldState extends State { focusNode: _focusNode, enabled: widget.enabled, onChanged: widget.onChanged, + onSubmitted: widget.onSubmitted, + textInputAction: widget.type == PersonalizationInputFieldType.search + ? TextInputAction.search + : TextInputAction.done, style: style, decoration: InputDecoration.collapsed( hintText: widget.placeholder, diff --git a/lib/src/ui/components/personalization_instant_search.dart b/lib/src/ui/components/personalization_instant_search.dart new file mode 100644 index 0000000..ad71396 --- /dev/null +++ b/lib/src/ui/components/personalization_instant_search.dart @@ -0,0 +1,317 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import 'personalization_input_field.dart'; +import 'personalization_link.dart'; +import 'personalization_list_label.dart'; +import 'personalization_suggestion_row.dart'; +import 'personalization_tag.dart'; + +/// Подсказка поиска. +@immutable +class PersonalizationSuggestion { + const PersonalizationSuggestion({ + required this.id, + required this.title, + this.subtitle, + this.image, + }); + + final String id; + final String title; + + /// Цена у товара, родительская категория у категории. + final String? subtitle; + final ImageProvider? image; +} + +/// Экран мгновенного поиска: поле ввода с «Cancel», недавние запросы, подсказки, +/// категории и товары. +/// +/// Источник: Figma Mobile SDK UI Kit, страница InstantSearchField — Instant Search/Text +/// (151:3976), /Input (310:10207), /With Images (310:9829), /Clear Recent Searches +/// (310:10016). Поле — [PersonalizationInputField] типа search размера md, ссылки — +/// [PersonalizationLink], подписи блоков — [PersonalizationListLabel], теги — +/// [PersonalizationTag] с переносом по строкам, строки — [PersonalizationSuggestionRow]. +/// +/// Недавние запросы — теги с крестиком, в конце синий тег «ещё»; подсказки при вводе — +/// такие же теги без крестика. Перед категориями и перед товарами разделитель 1px. +/// Совпадение с запросом в строках выделяется полужирным само. +/// +/// Внимание: шаг колонки в макете 13 — такого значения в шкале нет, взят LG (12). +/// Разделитель в макете чёрный 4%, ближайший токен Line/Generic Subtle (5%). +class PersonalizationInstantSearch extends StatefulWidget { + const PersonalizationInstantSearch({ + super.key, + this.controller, + this.placeholder, + this.cancelText, + this.onCancel, + this.onQueryChanged, + this.onSubmit, + this.recentLabel, + this.clearText, + this.onClearRecent, + this.recentSearches = const [], + this.moreText, + this.onMoreRecent, + this.onRecentTap, + this.onRecentRemove, + this.suggestions = const [], + this.onSuggestionTap, + this.categoriesLabel, + this.categories = const [], + this.onCategoryTap, + this.productsLabel, + this.products = const [], + this.onProductTap, + this.showImages = false, + this.iconBuilder, + }); + + /// Контроллер поля; не задан — виджет заводит свой. + final TextEditingController? controller; + final String? placeholder; + + /// Подпись ссылки справа от поля. `null` — без ссылки. + final String? cancelText; + final VoidCallback? onCancel; + final ValueChanged? onQueryChanged; + final ValueChanged? onSubmit; + + /// Подпись над недавними запросами. `null` — блок без подписи и без «Clear». + final String? recentLabel; + final String? clearText; + final VoidCallback? onClearRecent; + final List recentSearches; + + /// Подпись синего тега в конце недавних запросов. `null` — без него. + final String? moreText; + final VoidCallback? onMoreRecent; + final ValueChanged? onRecentTap; + final ValueChanged? onRecentRemove; + + final List suggestions; + final ValueChanged? onSuggestionTap; + + final String? categoriesLabel; + final List categories; + final ValueChanged? onCategoryTap; + final String? productsLabel; + final List products; + final ValueChanged? onProductTap; + + /// Показывать ли картинки у строк: в макете есть оба варианта. + final bool showImages; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => + _PersonalizationInstantSearchState(); +} + +class _PersonalizationInstantSearchState + extends State { + TextEditingController? _ownController; + + TextEditingController get _controller => + widget.controller ?? (_ownController ??= TextEditingController()); + + @override + void initState() { + super.initState(); + _controller.addListener(_onText); + } + + @override + void didUpdateWidget(PersonalizationInstantSearch oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.controller != widget.controller) { + (oldWidget.controller ?? _ownController)?.removeListener(_onText); + _controller.addListener(_onText); + } + } + + @override + void dispose() { + _controller.removeListener(_onText); + _ownController?.dispose(); + super.dispose(); + } + + // Совпадение выделяется по тексту поля, поэтому строки перестраиваются на каждый символ. + void _onText() => setState(() {}); + + Widget _removeIcon(BuildContext context, String asset) { + final color = PersonalizationTheme.of(context).colors.textPrimary; + return widget.iconBuilder?.call(context, asset, 16, color) ?? + const SizedBox(width: 16, height: 16); + } + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + const double gap = 12; + final highlight = _controller.text; + + final Widget separator = ColoredBox( + color: colors.lineGenericSubtle, + child: const SizedBox(height: 1, width: double.infinity), + ); + + Widget rows( + List items, + PersonalizationSuggestionKind kind, + ValueChanged? onTap, + ) { + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (int i = 0; i < items.length; i++) ...[ + if (i > 0) const SizedBox(height: gap), + PersonalizationSuggestionRow( + kind: kind, + title: items[i].title, + subtitle: items[i].subtitle, + image: items[i].image, + showImage: widget.showImages, + highlight: highlight, + onTap: onTap == null ? null : () => onTap(items[i]), + iconBuilder: widget.iconBuilder, + ), + ], + ], + ); + } + + final bool hasRecent = widget.recentSearches.isNotEmpty; + final sections = [ + Row( + children: [ + Expanded( + child: PersonalizationInputField( + controller: _controller, + placeholder: widget.placeholder, + size: PersonalizationInputFieldSize.md, + type: PersonalizationInputFieldType.search, + onChanged: widget.onQueryChanged, + onSubmitted: widget.onSubmit, + iconBuilder: widget.iconBuilder, + ), + ), + if (widget.cancelText != null && + widget.cancelText!.isNotEmpty) ...[ + const SizedBox(width: 16), + PersonalizationLink( + label: widget.cancelText!, + onTap: widget.onCancel, + ), + ], + ], + ), + if (hasRecent && + widget.recentLabel != null && + widget.recentLabel!.isNotEmpty) + Row( + children: [ + Expanded( + child: PersonalizationListLabel(label: widget.recentLabel!), + ), + if (widget.clearText != null && + widget.clearText!.isNotEmpty) ...[ + const SizedBox(width: gap), + PersonalizationLink( + label: widget.clearText!, + onTap: widget.onClearRecent, + ), + ], + ], + ), + if (hasRecent) + Wrap( + spacing: 8, + runSpacing: 8, + children: [ + for (final item in widget.recentSearches) + // Tag сам по себе не кликабелен — нажатие ловит обёртка, крестик — сам тег. + GestureDetector( + onTap: widget.onRecentTap == null + ? null + : () => widget.onRecentTap!(item), + child: PersonalizationTag( + label: item, + view: PersonalizationTagView.secondary, + onRemove: () => widget.onRecentRemove?.call(item), + removeIconBuilder: _removeIcon, + ), + ), + if (widget.moreText != null && widget.moreText!.isNotEmpty) + GestureDetector( + onTap: widget.onMoreRecent, + child: PersonalizationTag( + label: widget.moreText!, + view: PersonalizationTagView.primary, + ), + ), + ], + ), + if (widget.suggestions.isNotEmpty) + Wrap( + spacing: 8, + runSpacing: 8, + children: [ + for (final item in widget.suggestions) + GestureDetector( + onTap: widget.onSuggestionTap == null + ? null + : () => widget.onSuggestionTap!(item), + child: PersonalizationTag( + label: item, + view: PersonalizationTagView.secondary, + ), + ), + ], + ), + if (widget.categories.isNotEmpty) separator, + if (widget.categories.isNotEmpty && + widget.categoriesLabel != null && + widget.categoriesLabel!.isNotEmpty) + PersonalizationListLabel(label: widget.categoriesLabel!), + if (widget.categories.isNotEmpty) + rows( + widget.categories, + PersonalizationSuggestionKind.category, + widget.onCategoryTap, + ), + if (widget.products.isNotEmpty) separator, + if (widget.products.isNotEmpty && + widget.productsLabel != null && + widget.productsLabel!.isNotEmpty) + PersonalizationListLabel(label: widget.productsLabel!), + if (widget.products.isNotEmpty) + rows( + widget.products, + PersonalizationSuggestionKind.product, + widget.onProductTap, + ), + ]; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < sections.length; i++) ...[ + if (i > 0) const SizedBox(height: gap), + sections[i], + ], + ], + ); + } +} diff --git a/lib/src/ui/components/personalization_link.dart b/lib/src/ui/components/personalization_link.dart new file mode 100644 index 0000000..ceff6a1 --- /dev/null +++ b/lib/src/ui/components/personalization_link.dart @@ -0,0 +1,50 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import '../personalization_typography.dart'; + +/// Текстовая ссылка: «Cancel» у поля поиска, «Clear» у недавних запросов. +/// +/// В секции Components такого символа нет — стиль снят с экранов Instant Search +/// (страница InstantSearchField, 151:3976 и 310:9829): кегль base 16/24, +/// начертание 600, цвет Text/Link, без подложки и отступов. Нажатого состояния +/// в макете нет, поэтому ссылка только слегка гаснет под пальцем. +class PersonalizationLink extends StatefulWidget { + const PersonalizationLink({super.key, required this.label, this.onTap}); + + final String label; + final VoidCallback? onTap; + + @override + State createState() => _PersonalizationLinkState(); +} + +class _PersonalizationLinkState extends State { + bool _pressed = false; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: widget.onTap, + onTapDown: (_) => setState(() => _pressed = true), + onTapUp: (_) => setState(() => _pressed = false), + onTapCancel: () => setState(() => _pressed = false), + child: Opacity( + opacity: _pressed ? _pressedOpacity : 1, + child: Text( + widget.label, + maxLines: 1, + style: PersonalizationTypography.baseEmphasized.copyWith( + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, + color: theme.colors.textLink, + ), + ), + ), + ); + } + + static const double _pressedOpacity = 0.6; +} diff --git a/lib/src/ui/components/personalization_search_suggestions.dart b/lib/src/ui/components/personalization_search_suggestions.dart deleted file mode 100644 index 1a36096..0000000 --- a/lib/src/ui/components/personalization_search_suggestions.dart +++ /dev/null @@ -1,136 +0,0 @@ -import 'package:flutter/widgets.dart'; - -import '../personalization_theme.dart'; -import 'personalization_suggestion_row.dart'; -import 'personalization_tag.dart'; - -/// Подсказка поиска. -@immutable -class PersonalizationSuggestion { - const PersonalizationSuggestion({ - required this.id, - required this.title, - this.subtitle, - this.image, - }); - - final String id; - final String title; - - /// Цена у товара, родительская категория у категории. - final String? subtitle; - final ImageProvider? image; -} - -/// Панель подсказок поиска: теги-подсказки, категории, товары. -/// -/// Источник: Figma Mobile SDK UI Kit, секция Card, фрейм Search (151:3880). -/// Экран там нарисован наброском — шапка вручную, а не из InputField, шрифт -/// SF Pro, — поэтому сюда взято только то, что читается однозначно: ряд тегов -/// с шагом 8, блоки категорий и товаров с шагом 12 внутри и между, разделитель -/// 1px, боковые поля 16. Разделитель в макете — чёрный 4%, ближайший токен -/// Line/Generic Subtle (5%). -/// -/// Строки — [PersonalizationSuggestionRow], теги — [PersonalizationTag]. -class PersonalizationSearchSuggestions extends StatelessWidget { - const PersonalizationSearchSuggestions({ - super.key, - this.tags = const [], - this.categories = const [], - this.products = const [], - this.highlight, - this.showImages = false, - this.onTagTap, - this.onCategoryTap, - this.onProductTap, - this.iconBuilder, - }); - - final List tags; - final List categories; - final List products; - - /// Подстрока запроса, выделяемая в подсказках полужирным. - final String? highlight; - - /// Показывать ли картинки у строк: в макете есть оба варианта. - final bool showImages; - final ValueChanged? onTagTap; - final ValueChanged? onCategoryTap; - final ValueChanged? onProductTap; - - final Widget Function( - BuildContext context, - String asset, - double size, - Color color, - )? iconBuilder; - - @override - Widget build(BuildContext context) { - final colors = PersonalizationTheme.of(context).colors; - const double side = 16; - const double gap = 12; - - Widget block(List items, PersonalizationSuggestionKind kind, - ValueChanged? onTap) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: side), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - for (int i = 0; i < items.length; i++) ...[ - if (i > 0) const SizedBox(height: gap), - PersonalizationSuggestionRow( - kind: kind, - title: items[i].title, - subtitle: items[i].subtitle, - image: items[i].image, - showImage: showImages, - highlight: highlight, - onTap: onTap == null ? null : () => onTap(items[i]), - iconBuilder: iconBuilder, - ), - ], - ], - ), - ); - } - - final sections = [ - if (tags.isNotEmpty) - SingleChildScrollView( - scrollDirection: Axis.horizontal, - padding: const EdgeInsets.symmetric(horizontal: side), - child: Row( - children: [ - for (int i = 0; i < tags.length; i++) ...[ - if (i > 0) const SizedBox(width: 8), - // Tag сам по себе не кликабелен — нажатие ловит обёртка. - GestureDetector( - onTap: onTagTap == null ? null : () => onTagTap!(tags[i]), - child: PersonalizationTag(label: tags[i], view: PersonalizationTagView.primary), - ), - ], - ], - ), - ), - if (categories.isNotEmpty) block(categories, PersonalizationSuggestionKind.category, onCategoryTap), - // Разделитель нужен только между двумя непустыми блоками. - if (categories.isNotEmpty && products.isNotEmpty) - ColoredBox(color: colors.lineGenericSubtle, child: const SizedBox(height: 1, width: double.infinity)), - if (products.isNotEmpty) block(products, PersonalizationSuggestionKind.product, onProductTap), - ]; - - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - for (int i = 0; i < sections.length; i++) ...[ - if (i > 0) const SizedBox(height: gap), - sections[i], - ], - ], - ); - } -} diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index 26697e1..bbd8259 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -33,6 +33,7 @@ export 'components/personalization_button.dart'; export 'components/personalization_button_group.dart'; export 'components/personalization_input_field.dart'; export 'components/personalization_title.dart'; +export 'components/personalization_link.dart'; export 'components/personalization_accordion.dart'; export 'components/personalization_list_label.dart'; export 'components/personalization_dots.dart'; @@ -46,5 +47,6 @@ export 'components/personalization_product.dart'; export 'components/personalization_products_list.dart'; export 'components/personalization_recommender_block.dart'; export 'components/personalization_suggestion_row.dart'; -export 'components/personalization_search_suggestions.dart'; +export 'components/personalization_instant_search.dart'; +export 'components/personalization_filters.dart'; export 'components/personalization_catalog.dart'; From a35f35141e02a2aa3597a211624c634ae78f277c Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 00:27:51 +0400 Subject: [PATCH 11/79] feat(ui): product card follows the image aspect, carousel old price 16/24 The ProductCard page draws the card with 4:3, 1:1 and 3:4 images and lets the card grow with the image, in the carousel and in the list. The card now takes imageAspect, the list row is as tall as the larger of the image and the text column instead of a fixed 120x120, and the products list, recommender block and catalogue pass the aspect through to their cards. The old price in the carousel card is 16/24 on the ProductCard and Product Carousel pages while the master component says 14/20; the pages win, the mismatch is noted for the designer. --- .../components/personalization_catalog.dart | 7 +++ .../personalization_product_card.dart | 43 +++++++++++++------ .../personalization_products_list.dart | 6 +++ .../personalization_recommender_block.dart | 7 +++ 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart index 16f20c3..f4d5d02 100644 --- a/lib/src/ui/components/personalization_catalog.dart +++ b/lib/src/ui/components/personalization_catalog.dart @@ -5,6 +5,8 @@ import 'personalization_button.dart'; import 'personalization_count.dart'; import 'personalization_loader.dart'; import 'personalization_product.dart'; +import 'personalization_product_card.dart'; +import 'personalization_product_image.dart'; import 'personalization_products_list.dart'; /// Счётчик каталога «показано N из M». Слова — параметры. @@ -38,6 +40,7 @@ class PersonalizationCatalog extends StatelessWidget { this.header, this.layout = PersonalizationProductsLayout.grid, required this.products, + this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, this.loading = false, this.count, @@ -49,6 +52,9 @@ class PersonalizationCatalog extends StatelessWidget { final Widget? header; final PersonalizationProductsLayout layout; final List products; + + /// Пропорция картинок карточек, см. [PersonalizationProductCard.imageAspect]. + final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; final bool loading; final PersonalizationCatalogCount? count; @@ -71,6 +77,7 @@ class PersonalizationCatalog extends StatelessWidget { PersonalizationProductsList( layout: layout, products: products, + imageAspect: imageAspect, onProductAction: onProductAction, iconBuilder: iconBuilder, ), diff --git a/lib/src/ui/components/personalization_product_card.dart b/lib/src/ui/components/personalization_product_card.dart index fb440b3..0329be8 100644 --- a/lib/src/ui/components/personalization_product_card.dart +++ b/lib/src/ui/components/personalization_product_card.dart @@ -21,9 +21,13 @@ class PersonalizationProductRating { /// Карточка товара. /// /// Источник: Figma Mobile SDK UI Kit, секция Card, фрейм Product (126:2263): -/// carousel — колонка 220 с картинкой 1:1, grid — колонка на всю ширину ячейки, -/// list — строка с картинкой 120 и ценой с кнопкой внизу справа. -/// У трёх типов разная типографика цены и названия, поэтому она задана в таблице. +/// carousel — колонка 220, grid — колонка на всю ширину ячейки, list — строка с картинкой +/// шириной 120 и ценой с кнопкой внизу справа. Пропорция картинки — [imageAspect]: на +/// странице ProductCard (88:69) карточка нарисована с 4:3, 1:1 и 3:4, и её высота идёт +/// за картинкой. +/// У трёх типов разная типографика названия, цены и старой цены, поэтому она задана +/// в таблице. Старая цена карусели — 16/24 по страницам ProductCard и Product Carousel; +/// мастер-компонент Product там же даёт 14/20 — расхождение в макете, взяты страницы. /// /// Собрана из готовых блоков: [PersonalizationProductImage], [PersonalizationRating], /// [PersonalizationBadge] (скидка, вид danger), [PersonalizationButton]. @@ -32,6 +36,7 @@ class PersonalizationProductCard extends StatelessWidget { super.key, this.type = PersonalizationProductCardType.carousel, this.image, + this.imageAspect = PersonalizationProductImageAspect.square, this.brand, required this.name, this.rating, @@ -45,6 +50,9 @@ class PersonalizationProductCard extends StatelessWidget { final PersonalizationProductCardType type; final ImageProvider? image; + + /// Пропорция картинки; высота карточки идёт за ней. + final PersonalizationProductImageAspect imageAspect; final String? brand; final String name; final PersonalizationProductRating? rating; @@ -113,7 +121,8 @@ class PersonalizationProductCard extends StatelessWidget { ? null : Text( oldPrice!, - style: style(14, 20, 0.05, FontWeight.w400, colors.textHint) + style: style(metrics.oldPriceSize, metrics.oldPriceLineHeight, metrics.oldPriceLetterSpacing, + FontWeight.w400, colors.textHint) .copyWith(decoration: TextDecoration.lineThrough), ); final Widget? discountBadge = discount == null @@ -132,14 +141,15 @@ class PersonalizationProductCard extends StatelessWidget { onPressed: onAction, ); - // List: картинка 120 слева, справа колонка — название с рейтингом сверху, цена с кнопкой снизу. + // List: картинка шириной 120 слева, справа колонка — название с рейтингом сверху, + // цена с кнопкой снизу. Высота строки — большее из картинки и текста, поэтому + // IntrinsicHeight: колонка тянется до картинки, а низкая картинка её не сжимает. if (type == PersonalizationProductCardType.list) { - return SizedBox( - height: 120, + return IntrinsicHeight( child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SizedBox(width: 120, child: PersonalizationProductImage(image: image)), + SizedBox(width: 120, child: PersonalizationProductImage(image: image, aspect: imageAspect)), const SizedBox(width: 12), Expanded( child: Column( @@ -191,7 +201,7 @@ class PersonalizationProductCard extends StatelessWidget { children: [ Stack( children: [ - PersonalizationProductImage(image: image), + PersonalizationProductImage(image: image, aspect: imageAspect), if (discountBadge != null) Positioned(top: metrics.badgeInset, right: metrics.badgeInset, child: discountBadge), ], @@ -224,18 +234,25 @@ class _CardMetrics { required this.nameLetterSpacing, required this.priceSize, required this.priceLineHeight, + required this.oldPriceSize, + required this.oldPriceLineHeight, + required this.oldPriceLetterSpacing, required this.badgeInset, }); - final double nameSize, nameLineHeight, nameLetterSpacing, priceSize, priceLineHeight, badgeInset; + final double nameSize, nameLineHeight, nameLetterSpacing, priceSize, priceLineHeight; + final double oldPriceSize, oldPriceLineHeight, oldPriceLetterSpacing, badgeInset; } const Map _metrics = { PersonalizationProductCardType.carousel: _CardMetrics( - nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 20, priceLineHeight: 32, badgeInset: 8), + nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 20, priceLineHeight: 32, + oldPriceSize: 16, oldPriceLineHeight: 24, oldPriceLetterSpacing: 0, badgeInset: 8), PersonalizationProductCardType.grid: _CardMetrics( - nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 18, priceLineHeight: 28, badgeInset: 4), + nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 18, priceLineHeight: 28, + oldPriceSize: 14, oldPriceLineHeight: 20, oldPriceLetterSpacing: 0.05, badgeInset: 4), PersonalizationProductCardType.list: _CardMetrics( - nameSize: 14, nameLineHeight: 20, nameLetterSpacing: 0.05, priceSize: 16, priceLineHeight: 24, badgeInset: 0), + nameSize: 14, nameLineHeight: 20, nameLetterSpacing: 0.05, priceSize: 16, priceLineHeight: 24, + oldPriceSize: 14, oldPriceLineHeight: 20, oldPriceLetterSpacing: 0.05, badgeInset: 0), }; diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart index 328d74c..8546ae8 100644 --- a/lib/src/ui/components/personalization_products_list.dart +++ b/lib/src/ui/components/personalization_products_list.dart @@ -2,6 +2,7 @@ import 'package:flutter/widgets.dart'; import 'personalization_product.dart'; import 'personalization_product_card.dart'; +import 'personalization_product_image.dart'; /// Раскладка каталога. enum PersonalizationProductsLayout { carousel, grid, list } @@ -21,6 +22,7 @@ class PersonalizationProductsList extends StatefulWidget { super.key, this.layout = PersonalizationProductsLayout.carousel, required this.products, + this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, this.onFirstVisibleChanged, this.iconBuilder, @@ -28,6 +30,9 @@ class PersonalizationProductsList extends StatefulWidget { final PersonalizationProductsLayout layout; final List products; + + /// Пропорция картинок карточек, см. [PersonalizationProductCard.imageAspect]. + final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; final ValueChanged? onFirstVisibleChanged; @@ -77,6 +82,7 @@ class _PersonalizationProductsListState extends State products; + + /// Пропорция картинок карточек, см. [PersonalizationProductCard.imageAspect]. + final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; final Widget Function( @@ -82,6 +88,7 @@ class _PersonalizationRecommenderBlockState extends State setState(() => _page = index) : null, iconBuilder: widget.iconBuilder, From 09f028f5e44c798f047629a5a647071a00a1148e Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 00:27:51 +0400 Subject: [PATCH 12/79] feat(example): instant search states, filters screen, card aspects in the UI Kit screen The Blocks tab replaces the old suggestions exhibit with the three instant search states (recent searches, typing with bold matches, rows with images), adds the filters screen and a row of cards in every image aspect; Components gets the text link. --- example/lib/ui_kit_pane.dart | 168 ++++++++++++++++++++++++++++++----- 1 file changed, 147 insertions(+), 21 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index e02129a..3de8471 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -9,7 +9,7 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; /// /// "Components" walks through the primitives in every size, view and state the /// design file defines; "Blocks" shows the compositions built from them -/// (product cards, recommender layouts, search suggestions, the catalogue). +/// (product cards, recommender layouts, instant search, the catalogue, the filters screen). /// Mirror of the Android `UiKitPane` / iOS `UIKitShowcaseViewController` / /// React Native `UiKitPane`. /// @@ -213,6 +213,12 @@ final List<_Exhibit> _componentExhibits = [ ], ); }), + _Exhibit('Link — text action next to a field or a label', (context) { + return _Row(children: [ + PersonalizationLink(label: 'Cancel', onTap: () {}), + PersonalizationLink(label: 'Clear', onTap: () {}), + ]); + }), _Exhibit('Search Results Title', (context) => const _SearchResultsTitleExhibit()), _Exhibit('Accordion — collapsed with count, expanded', (context) { return _Column( @@ -320,6 +326,26 @@ final List<_Exhibit> _blockExhibits = [ ], ); }), + _Exhibit('Product Card — image 4:3, 1:1, 3:4 (carousel and list)', (context) { + const aspects = [ + PersonalizationProductImageAspect.landscape, + PersonalizationProductImageAspect.square, + PersonalizationProductImageAspect.portrait, + ]; + return _Column( + children: [ + _ScrollRow(children: [ + for (final (index, aspect) in aspects.indexed) + SizedBox( + width: 220, + child: _card(PersonalizationProductCardType.carousel, _products[index + 3], aspect: aspect), + ), + ]), + for (final (index, aspect) in aspects.indexed) + _card(PersonalizationProductCardType.list, _products[index + 3], aspect: aspect), + ], + ); + }), _Exhibit('Recommender Block — carousel', (context) { return _recommender(PersonalizationProductsLayout.carousel, 'Recommended for you', _products); }), @@ -329,26 +355,11 @@ final List<_Exhibit> _blockExhibits = [ _Exhibit('Recommender Block — list', (context) { return _recommender(PersonalizationProductsLayout.list, 'Recently viewed', _products.take(3).toList()); }), - _Exhibit('Search Suggestions', (context) { - return PersonalizationSearchSuggestions( - highlight: 'run', - showImages: true, - tags: const ['running shoes', 'running jacket', 'run belt'], - categories: const [ - PersonalizationSuggestion(id: 'c1', title: 'Running shoes', subtitle: 'Shoes'), - PersonalizationSuggestion(id: 'c2', title: 'Running apparel', subtitle: 'Clothing'), - ], - products: [ - for (final p in _products.take(3)) - PersonalizationSuggestion(id: p.id, title: p.name, subtitle: p.price, image: p.image), - ], - onTagTap: (_) {}, - onCategoryTap: (_) {}, - onProductTap: (_) {}, - iconBuilder: _icon, - ); - }), + _Exhibit('Instant Search — recent searches', (context) => const _InstantSearchExhibit()), + _Exhibit('Instant Search — typing, matches in bold', (context) => const _InstantSearchExhibit(typing: true)), + _Exhibit('Instant Search — with images', (context) => const _InstantSearchExhibit(images: true)), _Exhibit('Catalog — header, grid ⇄ list, count, load more', (context) => const _CatalogExhibit()), + _Exhibit('Filters — range, checkbox lists with show more, reset / apply', (context) => _filters()), ]; // --- Stateful exhibits ------------------------------------------------------ @@ -423,6 +434,77 @@ class _SearchResultsTitleExhibitState extends State<_SearchResultsTitleExhibit> /// The catalogue as a host would wire it: the results title in the header slot /// drives the grid/list switch, "load more" appends a page after a short /// simulated delay. +/// Instant search in its three states: recent searches before typing, suggestions with the +/// query highlighted while typing, and rows with images. The host owns the data; the kit only +/// renders what it is given and reports the taps. +class _InstantSearchExhibit extends StatefulWidget { + const _InstantSearchExhibit({this.typing = false, this.images = false}); + + final bool typing; + final bool images; + + @override + State<_InstantSearchExhibit> createState() => _InstantSearchExhibitState(); +} + +class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { + late final TextEditingController _controller = TextEditingController(text: widget.typing ? 'boots' : ''); + List _recent = ['mens winter boots', 'kids shoes', 'bag', 'accessories', 'black boots']; + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final typing = widget.typing; + return PersonalizationInstantSearch( + controller: _controller, + placeholder: 'want to buy...', + cancelText: 'Cancel', + onCancel: () {}, + showImages: widget.images, + recentLabel: typing ? null : 'Recent searches', + clearText: 'Clear', + onClearRecent: () => setState(() => _recent = []), + recentSearches: typing ? const [] : _recent, + moreText: 'more', + onMoreRecent: () {}, + onRecentRemove: (item) => setState(() => _recent = _recent.where((it) => it != item).toList()), + suggestions: typing ? const ['winter', 'mens', 'kids', 'for outdoor', 'womens', 'low', 'black', 'orange'] : const [], + categoriesLabel: typing ? 'Category' : 'Popular category', + categories: typing + ? const [ + PersonalizationSuggestion(id: 'c1', title: 'Womens boots'), + PersonalizationSuggestion(id: 'c2', title: 'Mens boots'), + PersonalizationSuggestion(id: 'c3', title: 'Kids boots'), + ] + : [ + PersonalizationSuggestion(id: 'c1', title: 'Running shoes', subtitle: 'Shoes', image: _products[0].image), + PersonalizationSuggestion(id: 'c2', title: 'Running apparel', subtitle: 'Clothing', image: _products[1].image), + PersonalizationSuggestion(id: 'c3', title: 'Trail gear', subtitle: 'Outdoor', image: _products[2].image), + ], + productsLabel: typing ? 'Products' : 'Frequently searched', + products: typing + ? const [ + PersonalizationSuggestion(id: 'p1', title: 'winter womens boots'), + PersonalizationSuggestion(id: 'p2', title: 'boots for mens'), + PersonalizationSuggestion(id: 'p3', title: 'winter boots for mens'), + PersonalizationSuggestion(id: 'p4', title: 'kids winter boots'), + ] + : [ + for (final p in _products.take(widget.images ? 3 : 5)) + PersonalizationSuggestion(id: p.id, title: p.name, subtitle: p.price, image: p.image), + ], + onCategoryTap: (_) {}, + onProductTap: (_) {}, + iconBuilder: _icon, + ); + } +} + class _CatalogExhibit extends StatefulWidget { const _CatalogExhibit(); @@ -542,10 +624,54 @@ Widget _removeIcon(BuildContext context, String asset) { return _icon(context, asset, 16, PersonalizationTheme.of(context).colors.textPrimary); } -Widget _card(PersonalizationProductCardType type, PersonalizationProduct product) { +/// The filters screen with the sections from the design file; toggles and ranges update its own state. +Widget _filters() { + const colors = ['All', 'Black', 'White', 'Red', 'Light blue', 'Green', 'Yellow', 'Brown', 'Grey', 'Pink']; + const ratings = ['All', '5 stars', '4+ stars', '3+ stars']; + return PersonalizationFilters( + title: 'Filters', + onClose: () {}, + resetText: 'Reset', + applyText: 'Apply', + onReset: () {}, + onApply: (_) {}, + sections: [ + const PersonalizationFilterRange( + id: 'size', title: 'Size', fromLabel: 'From', toLabel: 'to', from: '42', to: '43', select: true), + PersonalizationFilterOptions( + id: 'colors', + title: 'Colors', + options: [ + for (final (index, label) in colors.indexed) + PersonalizationFilterOption(id: label.toLowerCase(), label: label, checked: index == 1), + ], + showMoreText: 'Show more', + showLessText: 'Show less', + ), + const PersonalizationFilterRange( + id: 'price', title: 'Price (USD)', fromLabel: 'From', toLabel: 'to', from: '50', to: '500'), + PersonalizationFilterOptions( + id: 'rating', + title: 'Rating', + options: [ + for (final (index, label) in ratings.indexed) + PersonalizationFilterOption(id: label, label: label, checked: index == 1), + ], + ), + ], + iconBuilder: _icon, + ); +} + +Widget _card( + PersonalizationProductCardType type, + PersonalizationProduct product, { + PersonalizationProductImageAspect aspect = PersonalizationProductImageAspect.square, +}) { return PersonalizationProductCard( type: type, image: product.image, + imageAspect: aspect, brand: product.brand, name: product.name, rating: product.rating, From 48e833bdeecf186190c64e9f3a802da0045cee4e Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 19:08:34 +0400 Subject: [PATCH 13/79] feat(ui): empty state in the catalogue The Search Results/Empty State screen keeps the results title and puts the empty state where the grid would be. PersonalizationCatalog now takes an emptyText and builds PersonalizationEmptyState instead of the products list when there are no products, so the host does not have to assemble that screen by hand; the loader, count and load more button stay under the host's control as before. --- .../components/personalization_catalog.dart | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart index f4d5d02..b2c62e2 100644 --- a/lib/src/ui/components/personalization_catalog.dart +++ b/lib/src/ui/components/personalization_catalog.dart @@ -3,6 +3,7 @@ import 'package:flutter/widgets.dart'; import '../personalization_icons.dart'; import 'personalization_button.dart'; import 'personalization_count.dart'; +import 'personalization_empty_state.dart'; import 'personalization_loader.dart'; import 'personalization_product.dart'; import 'personalization_product_card.dart'; @@ -34,6 +35,10 @@ class PersonalizationCatalogCount { /// переключателем вида. Поэтому заголовок здесь — слот, а не вариант. /// Три нижних элемента в макете скрываемые (showLoader, showCount, showLoadMore). /// Шаг блока 12. +/// +/// Пустая выдача — страница SearchResultsScreen, Search Results/Empty State (319:7743): +/// заголовок тот же, вместо плитки [PersonalizationEmptyState]. Показывается, когда +/// задан [emptyText] и товаров нет. class PersonalizationCatalog extends StatelessWidget { const PersonalizationCatalog({ super.key, @@ -42,6 +47,7 @@ class PersonalizationCatalog extends StatelessWidget { required this.products, this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, + this.emptyText, this.loading = false, this.count, this.loadMoreText, @@ -56,6 +62,9 @@ class PersonalizationCatalog extends StatelessWidget { /// Пропорция картинок карточек, см. [PersonalizationProductCard.imageAspect]. final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; + + /// Текст пустой выдачи. `null` — без пустого состояния, плитка остаётся на месте. + final String? emptyText; final bool loading; final PersonalizationCatalogCount? count; @@ -68,19 +77,24 @@ class PersonalizationCatalog extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { + final bool empty = products.isEmpty && (emptyText ?? '').isNotEmpty; final sections = [ ?header, - PersonalizationProductsList( - layout: layout, - products: products, - imageAspect: imageAspect, - onProductAction: onProductAction, - iconBuilder: iconBuilder, - ), + if (empty) + PersonalizationEmptyState(message: emptyText!) + else + PersonalizationProductsList( + layout: layout, + products: products, + imageAspect: imageAspect, + onProductAction: onProductAction, + iconBuilder: iconBuilder, + ), if (loading) const PersonalizationLoader(), if (count != null) PersonalizationCount( From 4d97609e4ec9fd9a1b9603a2e7e9b8eb47b29dbd Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 19:08:34 +0400 Subject: [PATCH 14/79] feat(example): catalogue empty state in the UI Kit pane The Blocks segment gets the search results title over an empty catalogue with "Found 0 products" and the empty state text. --- example/lib/ui_kit_pane.dart | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 3de8471..fd531b8 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -359,6 +359,15 @@ final List<_Exhibit> _blockExhibits = [ _Exhibit('Instant Search — typing, matches in bold', (context) => const _InstantSearchExhibit(typing: true)), _Exhibit('Instant Search — with images', (context) => const _InstantSearchExhibit(images: true)), _Exhibit('Catalog — header, grid ⇄ list, count, load more', (context) => const _CatalogExhibit()), + _Exhibit( + 'Catalog — empty state', + (context) => const PersonalizationCatalog( + header: _SearchResultsTitleExhibit(count: 0), + products: [], + emptyText: 'No results for your request.', + iconBuilder: _icon, + ), + ), _Exhibit('Filters — range, checkbox lists with show more, reset / apply', (context) => _filters()), ]; @@ -398,9 +407,10 @@ class _ButtonGroupExhibitState extends State<_ButtonGroupExhibit> { } class _SearchResultsTitleExhibit extends StatefulWidget { - const _SearchResultsTitleExhibit({this.onViewChanged}); + const _SearchResultsTitleExhibit({this.onViewChanged, this.count = 128}); final ValueChanged? onViewChanged; + final int count; @override State<_SearchResultsTitleExhibit> createState() => _SearchResultsTitleExhibitState(); @@ -421,7 +431,7 @@ class _SearchResultsTitleExhibitState extends State<_SearchResultsTitleExhibit> onBack: () {}, onFilters: () {}, onSort: () {}, - results: const PersonalizationSearchResults(prefix: 'Found', count: 128, suffix: 'products'), + results: PersonalizationSearchResults(prefix: 'Found', count: widget.count, suffix: 'products'), filters: [ PersonalizationSearchFilter(label: 'Nike', onRemove: () {}), PersonalizationSearchFilter(label: 'Size 42', onRemove: () {}), From 138cfb7827dc73db2dcf3c0f9c7bb11d743995de Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 21:46:48 +0400 Subject: [PATCH 15/79] feat(search): facets, suggested queries, old price and discount through the bridge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The search models carried the intersection of what the two native bridges delivered, which left out what a search screen needs: a product's old price, discount and resized picture, the suggested phrases of an instant search, the facets of a full search (brands, shop filters by name, colours and sizes) and the last queries and popular categories of a blank search. The Dart models now parse all of them, each optional so an older native SDK still parses as before. The iOS bridge serializes those fields from the native models it already has, passes the `filters` facets to the native search and paginates by product offset: the native iOS search takes an offset, so page N with limit L is offset (N - 1) * L — page 2 used to skip two products instead of a page. The Android bridge serializes its data classes with Gson, so the new fields arrive with the next Android release; it now also passes `filters` as the native SearchFilters. SearchParams gains `filters` for the shop facets by name. --- .../Rees46FlutterSdkPlugin.kt | 12 ++ ios/Classes/Rees46FlutterSdkPlugin.swift | 25 ++- lib/src/search/search_params.dart | 8 +- lib/src/search/search_response.dart | 155 ++++++++++++++++-- 4 files changed, 184 insertions(+), 16 deletions(-) diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index cdc81fb..7810710 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -877,6 +877,18 @@ private fun buildSearchParams(paramsJson: String?): NativeSearchParams { ?.let { params.put(NativeSearchParams.Parameter.COLORS, it) } jsonArrayToStringArray(json.optJSONArray("fashion_sizes")) ?.let { params.put(NativeSearchParams.Parameter.FASHION_SIZES, it) } + // Facets by name: {"Material": ["Metal", "Plastic"]}. + json.optJSONObject("filters")?.let { facets -> + val searchFilters = NativeSearchParams.SearchFilters() + var any = false + facets.keys().forEach { name -> + jsonArrayToStringArray(facets.optJSONArray(name))?.let { + searchFilters.put(name, it) + any = true + } + } + if (any) params.put(NativeSearchParams.Parameter.FILTERS, searchFilters) + } return params } diff --git a/ios/Classes/Rees46FlutterSdkPlugin.swift b/ios/Classes/Rees46FlutterSdkPlugin.swift index 53523e7..3e8f936 100644 --- a/ios/Classes/Rees46FlutterSdkPlugin.swift +++ b/ios/Classes/Rees46FlutterSdkPlugin.swift @@ -377,6 +377,8 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { return [ "products": r.products.map { _searchProductToDict($0) }, "suggests": r.suggests.map { ["name": $0.name, "url": $0.url] }, + "last_queries": r.lastQueries.map { ["name": $0.name, "url": $0.url] }, + "popular_categories": r.popularCategories.map { ["name": $0.name, "url": $0.url] }, ] } @@ -456,11 +458,14 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { let priceMax = p?["price_max"] as? Double let colors = p?["colors"] as? [String] let fashionSizes = p?["fashion_sizes"] as? [String] + let filters = p?["filters"] as? [String: Any] + // The native iOS search paginates by product offset, not by page number. + let offset = page.map { limit != nil ? ($0 - 1) * limit! : $0 } sdk.search( query: query, limit: limit, - offset: page, + offset: offset, categoryLimit: categoryLimit, brandLimit: brandLimit, categories: categoriesInt, @@ -471,7 +476,7 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { excludedMerchants: nil, excludedBrands: excludedBrands, brands: brands, - filters: nil, + filters: filters, priceMin: priceMin, priceMax: priceMax, colors: colors, @@ -501,10 +506,23 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { "products": r.products.map { _searchProductToDict($0) }, "categories": r.categories.map { _searchCategoryToDict($0) }, "products_total": r.productsTotal, + "queries": r.queries.map { ["name": $0.name, "url": $0.url] }, ] if let pr = r.priceRange { dict["price_range"] = ["min": pr.min, "max": pr.max] } + if let brands = r.brands { + dict["brands"] = brands + } + if let filters = r.filters { + dict["filters"] = filters.mapValues { ["count": $0.count, "values": $0.values] as [String: Any] } + } + if let industrial = r.industrialFilters { + dict["industrial_filters"] = [ + "colors": industrial.fashionColors.map { ["color": $0.color, "count": $0.count] }, + "fashion_sizes": industrial.fashionSizes.map { ["size": $0.size, "count": $0.count] }, + ] + } if let locs = r.locations { dict["locations"] = locs.map { loc -> [String: Any] in var d: [String: Any] = ["id": loc.id, "name": loc.name] @@ -532,6 +550,9 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { "currency": p.currency, "sales_rate": p.salesRate, "relative_sales_rate": p.relativeSalesRate, + "oldprice": p.oldPrice, + "oldprice_formatted": p.oldPriceFormatted, + "discount": p.discount, ] _ = dict // suppress unused warning; all fields set above return dict diff --git a/lib/src/search/search_params.dart b/lib/src/search/search_params.dart index 3df4467..33e7b36 100644 --- a/lib/src/search/search_params.dart +++ b/lib/src/search/search_params.dart @@ -9,8 +9,11 @@ import 'dart:convert'; /// iOS converts them to integers internally. /// - [page]: maps to Android `PAGE` param and iOS `offset` param. /// +/// [filters] are the shop's own facets by name — `{"Материал корпуса": ["Металл"]}` — +/// as the full search response lists them in `filters`. +/// /// Excluded Android-only params: `extended`, `exclude`, `excludedMerchants`, -/// `noClarification`, `filters` (complex SearchFilters object). +/// `noClarification`. class SearchParams { final int? limit; final int? page; @@ -26,6 +29,7 @@ class SearchParams { final double? priceMax; final List? colors; final List? fashionSizes; + final Map>? filters; const SearchParams({ this.limit, @@ -42,6 +46,7 @@ class SearchParams { this.priceMax, this.colors, this.fashionSizes, + this.filters, }); String toJson() => jsonEncode({ @@ -61,6 +66,7 @@ class SearchParams { if (colors != null && colors!.isNotEmpty) 'colors': colors, if (fashionSizes != null && fashionSizes!.isNotEmpty) 'fashion_sizes': fashionSizes, + if (filters != null && filters!.isNotEmpty) 'filters': filters, }); } diff --git a/lib/src/search/search_response.dart b/lib/src/search/search_response.dart index 652dbb2..57f3cb8 100644 --- a/lib/src/search/search_response.dart +++ b/lib/src/search/search_response.dart @@ -2,9 +2,12 @@ import '../json_number.dart'; /// Response from [PersonalizationSdk.searchFull]. /// -/// Excluded Android-only response fields: brands (`List`), clarification, -/// collections, html, priceMedian, priceRanges, requestsCount, searchQuery. -/// Excluded iOS-only response fields: filters, industrialFilters, redirect, queries. +/// Facets ([brands], [filters], [industrialFilters]) are filled when the native side +/// delivers them; an older native SDK leaves them empty. +/// +/// Excluded Android-only response fields: clarification, collections, html, +/// priceMedian, priceRanges, requestsCount, searchQuery. +/// Excluded iOS-only response fields: redirect, queries. class SearchFullResponse { final List products; final List categories; @@ -12,12 +15,22 @@ class SearchFullResponse { final SearchPriceRange? priceRange; final List? locations; + /// Brand names found in the results (Android carries counts too, iOS only names). + final List brands; + + /// Shop facets keyed by name: value → product count. + final Map filters; + final SearchIndustrialFilters? industrialFilters; + const SearchFullResponse({ required this.products, required this.categories, required this.productsTotal, this.priceRange, this.locations, + this.brands = const [], + this.filters = const {}, + this.industrialFilters, }); factory SearchFullResponse.fromJson(Map json) { @@ -37,6 +50,79 @@ class SearchFullResponse { locations: (json['locations'] as List?) ?.map((e) => SearchLocation.fromJson(e as Map)) .toList(), + brands: _parseBrands(json['brands']), + filters: _parseFilters(json['filters']), + industrialFilters: json['industrial_filters'] is Map + ? SearchIndustrialFilters.fromJson( + Map.from(json['industrial_filters'] as Map), + ) + : null, + ); + } +} + +/// Brands arrive as `[{name, count}]` (Android) or `[name]` (iOS); both become names. +List _parseBrands(dynamic raw) { + if (raw is! List) return const []; + return raw + .map((e) => e is Map ? e['name']?.toString() : e?.toString()) + .whereType() + .where((name) => name.isNotEmpty) + .toList(); +} + +Map _parseFilters(dynamic raw) { + if (raw is! Map) return const {}; + return { + for (final entry in raw.entries) + if (entry.value is Map) + entry.key.toString(): SearchFilter.fromJson( + Map.from(entry.value as Map), + ), + }; +} + +/// One facet of a full search: how many products carry it and the count per value. +class SearchFilter { + final int count; + final Map values; + + const SearchFilter({required this.count, required this.values}); + + factory SearchFilter.fromJson(Map json) { + final values = json['values']; + return SearchFilter( + count: toIntOrNull(json['count']) ?? 0, + values: values is Map + ? { + for (final entry in values.entries) + entry.key.toString(): toIntOrNull(entry.value) ?? 0, + } + : const {}, + ); + } +} + +/// Fashion facets of a full search: colours and sizes with product counts. +class SearchIndustrialFilters { + final List colors; + final List fashionSizes; + + const SearchIndustrialFilters({ + this.colors = const [], + this.fashionSizes = const [], + }); + + factory SearchIndustrialFilters.fromJson(Map json) { + List names(dynamic raw, String key) => raw is List + ? raw + .map((e) => e is Map ? e[key]?.toString() : null) + .whereType() + .toList() + : const []; + return SearchIndustrialFilters( + colors: names(json['colors'], 'color'), + fashionSizes: names(json['fashion_sizes'], 'size'), ); } } @@ -44,10 +130,10 @@ class SearchFullResponse { /// Search product — intersection of Android [com.personalization.api.responses.product.Product] /// and iOS [Product] (from SearchResponse). /// -/// Excluded Android-only fields: _id, imageUrlHandle, urlHandle, picture, categoryIds, +/// Excluded Android-only fields: _id, imageUrlHandle, urlHandle, categoryIds, /// locationIds, categories (product-level category model differs from search-level). -/// Excluded iOS-only fields: barcode, model, deeplinkIos, oldPrice / oldPriceFull -/// (and their formatted variants), discount, isNew, params. +/// Excluded iOS-only fields: barcode, model, deeplinkIos, oldPriceFull (and its +/// formatted variant), isNew, params. class SearchProduct { final String id; final String name; @@ -67,6 +153,17 @@ class SearchProduct { /// JSON key: "image_url_resized" on both platforms. final Map resizedImages; + /// Resized copy of the main image (`picture`), the one to show in lists. + final String? picture; + + /// Price before the discount (`oldprice`), 0 when there is none. + final double oldPrice; + final String? oldPriceFormatted; + + /// Discount in percent (`discount`), 0 when there is none. + final int discount; + final String? discountFormatted; + const SearchProduct({ required this.id, required this.name, @@ -82,6 +179,11 @@ class SearchProduct { required this.salesRate, required this.relativeSalesRate, required this.resizedImages, + this.picture, + this.oldPrice = 0.0, + this.oldPriceFormatted, + this.discount = 0, + this.discountFormatted, }); factory SearchProduct.fromJson(Map json) { @@ -100,6 +202,11 @@ class SearchProduct { salesRate: toIntOrNull(json['sales_rate']) ?? 0, relativeSalesRate: toDoubleOrNull(json['relative_sales_rate']) ?? 0.0, resizedImages: _parseResizedImages(json['image_url_resized']), + picture: json['picture'] as String?, + oldPrice: toDoubleOrNull(json['oldprice']) ?? 0.0, + oldPriceFormatted: json['oldprice_formatted'] as String?, + discount: toIntOrNull(json['discount']) ?? 0, + discountFormatted: json['discount_formatted'] as String?, ); } } @@ -111,19 +218,23 @@ class SearchProduct { /// and [SearchLocation] models. /// /// Excluded Android-only fields: clarification, collections, html, requestsCount, -/// searchQuery, bookAuthor, queries. -/// Excluded iOS-only fields: filters, industrialFilters, redirect, queries, brands. +/// searchQuery, bookAuthor. +/// Excluded iOS-only fields: filters, industrialFilters, redirect, brands. class SearchInstantResponse { final List products; final List categories; final int productsTotal; final List? locations; + /// Phrases suggested for the typed text (`queries`). + final List queries; + const SearchInstantResponse({ required this.products, required this.categories, required this.productsTotal, this.locations, + this.queries = const [], }); factory SearchInstantResponse.fromJson(Map json) { @@ -138,10 +249,19 @@ class SearchInstantResponse { locations: (json['locations'] as List?) ?.map((e) => SearchLocation.fromJson(e as Map)) .toList(), + queries: _parseSuggests(json['queries']), ); } } +List _parseSuggests(dynamic raw) { + if (raw is! List) return const []; + return raw + .whereType() + .map((e) => SearchSuggest.fromJson(Map.from(e))) + .toList(); +} + Map _parseResizedImages(dynamic raw) { if (raw is Map) { return Map.fromEntries( @@ -205,21 +325,30 @@ class SearchPriceRange { /// Contains trending/popular products and search suggestions configured for the shop. /// /// Excluded Android-only fields: html. -/// Excluded iOS-only fields: lastQueries, lastProducts. +/// Excluded iOS-only fields: lastProducts. class SearchBlankResponse { final List products; final List suggests; - const SearchBlankResponse({required this.products, required this.suggests}); + /// The user's latest search phrases as the server remembers them. + final List lastQueries; + final List popularCategories; + + const SearchBlankResponse({ + required this.products, + required this.suggests, + this.lastQueries = const [], + this.popularCategories = const [], + }); factory SearchBlankResponse.fromJson(Map json) { return SearchBlankResponse( products: (json['products'] as List? ?? []) .map((e) => SearchProduct.fromJson(e as Map)) .toList(), - suggests: (json['suggests'] as List? ?? []) - .map((e) => SearchSuggest.fromJson(e as Map)) - .toList(), + suggests: _parseSuggests(json['suggests']), + lastQueries: _parseSuggests(json['last_queries']), + popularCategories: _parseSuggests(json['popular_categories']), ); } } From 971d4cc834204b35bc5c5b1c24b39fed26a6171b Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 21:46:48 +0400 Subject: [PATCH 16/79] feat(ui): card tap, product tap passthrough, title button toggles, rows without images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wiring the components to live data showed that a product card had no tap of its own (only the button), so nothing could open a product — onTap wraps the card in a GestureDetector and is passed through the list, recommender block and catalogue as onProductTap. The results title can hide its filters and sort buttons. Instant search rows without an image no longer draw an empty placeholder next to rows that have one. --- .../components/personalization_catalog.dart | 5 +++ .../personalization_instant_search.dart | 5 ++- .../personalization_product_card.dart | 18 ++++++--- .../personalization_products_list.dart | 5 +++ .../personalization_recommender_block.dart | 5 +++ .../personalization_search_results_title.dart | 40 +++++++++++-------- 6 files changed, 55 insertions(+), 23 deletions(-) diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart index b2c62e2..0dd76b4 100644 --- a/lib/src/ui/components/personalization_catalog.dart +++ b/lib/src/ui/components/personalization_catalog.dart @@ -47,6 +47,7 @@ class PersonalizationCatalog extends StatelessWidget { required this.products, this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, + this.onProductTap, this.emptyText, this.loading = false, this.count, @@ -63,6 +64,9 @@ class PersonalizationCatalog extends StatelessWidget { final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; + /// Нажатие на карточку — открыть товар. + final ValueChanged? onProductTap; + /// Текст пустой выдачи. `null` — без пустого состояния, плитка остаётся на месте. final String? emptyText; final bool loading; @@ -93,6 +97,7 @@ class PersonalizationCatalog extends StatelessWidget { products: products, imageAspect: imageAspect, onProductAction: onProductAction, + onProductTap: onProductTap, iconBuilder: iconBuilder, ), if (loading) const PersonalizationLoader(), diff --git a/lib/src/ui/components/personalization_instant_search.dart b/lib/src/ui/components/personalization_instant_search.dart index ad71396..27f31f2 100644 --- a/lib/src/ui/components/personalization_instant_search.dart +++ b/lib/src/ui/components/personalization_instant_search.dart @@ -101,7 +101,7 @@ class PersonalizationInstantSearch extends StatefulWidget { final List products; final ValueChanged? onProductTap; - /// Показывать ли картинки у строк: в макете есть оба варианта. + /// Показывать ли картинки у строк: в макете есть оба варианта. Строка без картинки идёт без плейсхолдера. final bool showImages; final Widget Function( @@ -181,7 +181,8 @@ class _PersonalizationInstantSearchState title: items[i].title, subtitle: items[i].subtitle, image: items[i].image, - showImage: widget.showImages, + // Строка без картинки идёт без плейсхолдера. + showImage: widget.showImages && items[i].image != null, highlight: highlight, onTap: onTap == null ? null : () => onTap(items[i]), iconBuilder: widget.iconBuilder, diff --git a/lib/src/ui/components/personalization_product_card.dart b/lib/src/ui/components/personalization_product_card.dart index 0329be8..d55dc06 100644 --- a/lib/src/ui/components/personalization_product_card.dart +++ b/lib/src/ui/components/personalization_product_card.dart @@ -45,6 +45,7 @@ class PersonalizationProductCard extends StatelessWidget { this.discount, this.actionText, this.onAction, + this.onTap, this.iconBuilder, }); @@ -68,6 +69,9 @@ class PersonalizationProductCard extends StatelessWidget { final String? actionText; final VoidCallback? onAction; + /// Нажатие на карточку целиком (не на кнопку) — открыть товар. + final VoidCallback? onTap; + final Widget Function( BuildContext context, String asset, @@ -145,7 +149,7 @@ class PersonalizationProductCard extends StatelessWidget { // цена с кнопкой снизу. Высота строки — большее из картинки и текста, поэтому // IntrinsicHeight: колонка тянется до картинки, а низкая картинка её не сжимает. if (type == PersonalizationProductCardType.list) { - return IntrinsicHeight( + return _tappable(IntrinsicHeight( child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -190,7 +194,7 @@ class PersonalizationProductCard extends StatelessWidget { ), ], ), - ); + )); } // Carousel и Grid: картинка, название, рейтинг, цена, кнопка — колонкой с шагом 8. @@ -221,10 +225,14 @@ class PersonalizationProductCard extends StatelessWidget { if (action != null) ...[const SizedBox(height: 8), action], ], ); - return type == PersonalizationProductCardType.carousel - ? SizedBox(width: 220, child: column) - : column; + return _tappable( + type == PersonalizationProductCardType.carousel ? SizedBox(width: 220, child: column) : column, + ); } + + Widget _tappable(Widget child) => onTap == null + ? child + : GestureDetector(behavior: HitTestBehavior.opaque, onTap: onTap, child: child); } class _CardMetrics { diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart index 8546ae8..943d29a 100644 --- a/lib/src/ui/components/personalization_products_list.dart +++ b/lib/src/ui/components/personalization_products_list.dart @@ -24,6 +24,7 @@ class PersonalizationProductsList extends StatefulWidget { required this.products, this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, + this.onProductTap, this.onFirstVisibleChanged, this.iconBuilder, }); @@ -34,6 +35,9 @@ class PersonalizationProductsList extends StatefulWidget { /// Пропорция картинок карточек, см. [PersonalizationProductCard.imageAspect]. final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; + + /// Нажатие на карточку — открыть товар. + final ValueChanged? onProductTap; final ValueChanged? onFirstVisibleChanged; final Widget Function( @@ -91,6 +95,7 @@ class _PersonalizationProductsListState extends State widget.onProductAction!(product), + onTap: widget.onProductTap == null ? null : () => widget.onProductTap!(product), iconBuilder: widget.iconBuilder, ); } diff --git a/lib/src/ui/components/personalization_recommender_block.dart b/lib/src/ui/components/personalization_recommender_block.dart index 558ccb8..da1a029 100644 --- a/lib/src/ui/components/personalization_recommender_block.dart +++ b/lib/src/ui/components/personalization_recommender_block.dart @@ -29,6 +29,7 @@ class PersonalizationRecommenderBlock extends StatefulWidget { required this.products, this.imageAspect = PersonalizationProductImageAspect.square, this.onProductAction, + this.onProductTap, this.iconBuilder, }); @@ -47,6 +48,9 @@ class PersonalizationRecommenderBlock extends StatefulWidget { final PersonalizationProductImageAspect imageAspect; final ValueChanged? onProductAction; + /// Нажатие на карточку — открыть товар. + final ValueChanged? onProductTap; + final Widget Function( BuildContext context, String asset, @@ -90,6 +94,7 @@ class _PersonalizationRecommenderBlockState extends State setState(() => _page = index) : null, iconBuilder: widget.iconBuilder, ), diff --git a/lib/src/ui/components/personalization_search_results_title.dart b/lib/src/ui/components/personalization_search_results_title.dart index 61cadf7..72dd505 100644 --- a/lib/src/ui/components/personalization_search_results_title.dart +++ b/lib/src/ui/components/personalization_search_results_title.dart @@ -47,6 +47,8 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { this.onViewChanged, this.onFilters, this.onSort, + this.showFiltersButton = true, + this.showSortButton = true, this.results, this.filters = const [], this.iconBuilder, @@ -60,6 +62,10 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { final ValueChanged? onViewChanged; final VoidCallback? onFilters; final VoidCallback? onSort; + + /// Кнопки фильтров и сортировки; в макете они есть всегда, но виджет может их убрать. + final bool showFiltersButton; + final bool showSortButton; final PersonalizationSearchResults? results; final List filters; @@ -119,22 +125,24 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { Row( mainAxisSize: MainAxisSize.min, children: [ - PersonalizationButton( - size: PersonalizationButtonSize.md, - view: PersonalizationButtonView.ghost, - iconStart: PersonalizationIcons.equalizerHorizontal, - iconBuilder: iconBuilder, - onPressed: onFilters, - ), - const SizedBox(width: 4), - PersonalizationButton( - size: PersonalizationButtonSize.md, - view: PersonalizationButtonView.ghost, - iconStart: PersonalizationIcons.arrowsUpDown, - iconBuilder: iconBuilder, - onPressed: onSort, - ), - const SizedBox(width: 12), + if (showFiltersButton) + PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.equalizerHorizontal, + iconBuilder: iconBuilder, + onPressed: onFilters, + ), + if (showFiltersButton && showSortButton) const SizedBox(width: 4), + if (showSortButton) + PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.ghost, + iconStart: PersonalizationIcons.arrowsUpDown, + iconBuilder: iconBuilder, + onPressed: onSort, + ), + if (showFiltersButton || showSortButton) const SizedBox(width: 12), Text(results!.prefix, style: regular), const SizedBox(width: 4), Text('${results!.count}', style: strong), From c0f50a7a7959340703bf23ff07f7bbde1c6720f6 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 21:46:49 +0400 Subject: [PATCH 17/79] feat(ui): instant search field and search results screen bound to the SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two widgets that own their state and loading, as the Figma guides for InstantSearchField and SearchResultsScreen describe them — the Flutter counterparts of the native ones, exported from the kit barrel. PersonalizationInstantSearchField owns the input: below minChars it shows the locally kept recent searches (per shop, in shared_preferences — a new dependency — with clear and per-item removal as in the design) and the products and popular categories of searchBlank; while typing it debounces searchInstant and shows the suggested phrases as tags, categories with their parent's name and products with prices. Stale responses are dropped. Submitting adds to the history and hands the phrase to the host; tapping a product or category stores the instant_search attribution source and hands the object over. PersonalizationSearchResultsScreen owns the query: it pages searchFull with a load more button or infinite scroll, tracks the search event once per query, builds the filters screen from the response's facets (price range, brands, colours and sizes, and every shop facet with more than one value), shows the applied values as removable tags and sends them back as request parameters. The filters screen opens as an overlay inside the widget; sorting stays with the host because the design file has no picker. Both take an explicit sdk handle or resolve one with REES46.getInstance by an optional shopId, with the single registered shop as the default; an unregistered shop leaves the widget empty with a debugPrint instead of throwing from build. --- lib/src/ui/personalization_ui.dart | 5 + .../personalization_instant_search_field.dart | 372 ++++++++++ ...personalization_search_results_screen.dart | 658 ++++++++++++++++++ lib/src/ui/widgets/search_support.dart | 115 +++ pubspec.yaml | 2 + 5 files changed, 1152 insertions(+) create mode 100644 lib/src/ui/widgets/personalization_instant_search_field.dart create mode 100644 lib/src/ui/widgets/personalization_search_results_screen.dart create mode 100644 lib/src/ui/widgets/search_support.dart diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index bbd8259..1a25b1b 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -50,3 +50,8 @@ export 'components/personalization_suggestion_row.dart'; export 'components/personalization_instant_search.dart'; export 'components/personalization_filters.dart'; export 'components/personalization_catalog.dart'; + +// Виджеты с данными SDK: сами резолвят инстанс по shopId, ходят в поиск и держат состояние. +export 'widgets/search_support.dart' show PersonalizationSearchCategory; +export 'widgets/personalization_instant_search_field.dart'; +export 'widgets/personalization_search_results_screen.dart'; diff --git a/lib/src/ui/widgets/personalization_instant_search_field.dart b/lib/src/ui/widgets/personalization_instant_search_field.dart new file mode 100644 index 0000000..e6b7949 --- /dev/null +++ b/lib/src/ui/widgets/personalization_instant_search_field.dart @@ -0,0 +1,372 @@ +import 'dart:async'; + +import 'package:flutter/widgets.dart'; + +import '../../multi_instance/rees46.dart'; +import '../../personalization_sdk.dart'; +import '../../search/search_params.dart'; +import '../../search/search_response.dart'; +import '../../tracking/tracking_models.dart'; +import '../components/personalization_instant_search.dart'; +import 'search_support.dart'; + +/// Мгновенный поиск с данными SDK: поле ввода, недавние запросы, подсказки, категории и +/// товары — виджет сам ходит в `searchInstant` / `searchBlank` и держит состояние. +/// +/// Паттерн InstantSearchField из Figma (страница 1:29): «компонент владеет вводом», +/// источник — `searchInstant(query)`. Визуальный слой — [PersonalizationInstantSearch]. +/// +/// Инстанс SDK: [sdk] явно, иначе [shopId] выбирает магазин при нескольких +/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). Если магазин +/// не зарегистрирован, виджет остаётся пустым и пишет об этом в лог, а не роняет экран. +/// +/// Пока запрос короче [minChars] показывается пустое состояние: история запросов +/// (локальная, по магазину, в SharedPreferences), а из `searchBlank` — товары и +/// популярные категории; популярные фразы (`suggests`) подставляются тегами, только если +/// истории ещё нет. При вводе после [debounce] уходит `searchInstant`: фразы из `queries` +/// — тегами, категории и товары — строками. Ответ на устаревший запрос отбрасывается. +/// +/// Нажатие на товар или категорию запоминает источник `instant_search` в трекинге и +/// отдаёт объект хосту; отправка кладёт фразу в историю и вызывает [onSubmit] — экран +/// полной выдачи открывает хост, событие `search` трекает +/// `PersonalizationSearchResultsScreen`. +class PersonalizationInstantSearchField extends StatefulWidget { + const PersonalizationInstantSearchField({ + super.key, + this.sdk, + this.shopId, + this.debounce = const Duration(milliseconds: 300), + this.minChars = 2, + this.productsLimit = 5, + this.categoriesLimit = 3, + this.suggestionsLimit = 8, + this.recentLimit = 10, + this.recentCollapsed = 5, + this.showRecent = true, + this.showSuggestions = true, + this.showCategories = true, + this.showProducts = true, + this.showImages = true, + this.locations, + this.placeholder, + this.cancelText, + this.recentLabel, + this.clearText, + this.moreText, + this.categoriesLabel, + this.productsLabel, + this.onSubmit, + this.onCancel, + this.onProductTap, + this.onCategoryTap, + this.onError, + this.iconBuilder, + }); + + /// Явный инстанс; иначе резолв по [shopId]. + final PersonalizationSdk? sdk; + + /// Магазин при нескольких зарегистрированных; без него — единственный. + final String? shopId; + + final Duration debounce; + final int minChars; + final int productsLimit; + final int categoriesLimit; + final int suggestionsLimit; + final int recentLimit; + + /// Сколько недавних запросов видно до тега «ещё». + final int recentCollapsed; + + final bool showRecent; + final bool showSuggestions; + final bool showCategories; + final bool showProducts; + final bool showImages; + + /// Список id локаций через запятую. + final String? locations; + + final String? placeholder; + final String? cancelText; + final String? recentLabel; + final String? clearText; + + /// Подпись тега «ещё»; показывается, когда история длиннее [recentCollapsed]. + final String? moreText; + final String? categoriesLabel; + final String? productsLabel; + + final ValueChanged? onSubmit; + final VoidCallback? onCancel; + final ValueChanged? onProductTap; + final ValueChanged? onCategoryTap; + final ValueChanged? onError; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => + _PersonalizationInstantSearchFieldState(); +} + +class _PersonalizationInstantSearchFieldState + extends State { + final TextEditingController _controller = TextEditingController(); + PersonalizationSdk? _sdk; + RecentSearches? _recent; + List _recentItems = const []; + bool _recentExpanded = false; + SearchBlankResponse? _blank; + SearchInstantResponse? _instant; + int _seq = 0; + Timer? _debounce; + + @override + void initState() { + super.initState(); + _resolve(); + } + + @override + void didUpdateWidget(PersonalizationInstantSearchField oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.sdk != widget.sdk || oldWidget.shopId != widget.shopId) { + _resolve(); + } + } + + @override + void dispose() { + _debounce?.cancel(); + _controller.dispose(); + super.dispose(); + } + + void _resolve() { + PersonalizationSdk? sdk = widget.sdk; + if (sdk == null) { + try { + sdk = REES46.getInstance(widget.shopId); + } catch (error) { + debugPrint( + 'PersonalizationInstantSearchField: cannot resolve an SDK for ' + 'shopId=${widget.shopId} — $error', + ); + widget.onError?.call(error); + } + } + _sdk = sdk; + if (sdk == null) return; + _recent = RecentSearches( + shopKey: sdk.shopId ?? widget.shopId ?? 'default', + limit: widget.recentLimit, + ); + _recent!.load().then((items) { + if (mounted) setState(() => _recentItems = items); + }); + _loadBlank(sdk); + } + + Future _loadBlank(PersonalizationSdk sdk) async { + try { + final response = await sdk.searchBlank(); + // Пустое состояние не привязано к запросу: пригодится, когда поле очистят. + if (!mounted) return; + setState(() => _blank = response); + } catch (error) { + if (mounted) widget.onError?.call(error); + } + } + + bool get _typing => _controller.text.trim().length >= widget.minChars; + + void _typed(String text) { + _debounce?.cancel(); + if (text.trim().length < widget.minChars) { + _seq++; + setState(() => _instant = null); + return; + } + _debounce = Timer(widget.debounce, () => _runInstant(text.trim())); + } + + Future _runInstant(String text) async { + final sdk = _sdk; + if (sdk == null) return; + final seq = ++_seq; + try { + final response = await sdk.searchInstant( + text, + params: widget.locations == null + ? null + : SearchInstantParams(locations: widget.locations), + ); + if (!mounted || seq != _seq) return; + setState(() => _instant = response); + } catch (error) { + if (mounted && seq == _seq) widget.onError?.call(error); + } + } + + Future _submit(String text) async { + final trimmed = text.trim(); + if (trimmed.isEmpty) return; + _recentExpanded = false; + final recent = _recent; + if (recent != null) { + final items = await recent.add(trimmed); + if (mounted) setState(() => _recentItems = items); + } + widget.onSubmit?.call(trimmed); + } + + void _rememberSource() { + final text = _controller.text.trim(); + if (text.isEmpty) return; + _sdk?.tracking.setSource( + TrackingSource(type: TrackingSourceType.instantSearch, code: text), + ); + } + + @override + Widget build(BuildContext context) { + final typing = _typing; + final blank = _blank; + final instant = _instant; + + final recentItems = !typing && widget.showRecent + ? _recentItems + : const []; + final collapsed = + !_recentExpanded && recentItems.length > widget.recentCollapsed; + final recentShown = collapsed + ? recentItems.take(widget.recentCollapsed).toList() + : recentItems; + + // Популярные фразы сервера заменяют пустую историю. + List suggestions; + if (typing) { + suggestions = widget.showSuggestions + ? (instant?.queries ?? const []) + .map((item) => item.name) + .take(widget.suggestionsLimit) + .toList() + : const []; + } else { + suggestions = widget.showSuggestions && recentItems.isEmpty + ? (blank?.suggests ?? const []) + .map((item) => item.name) + .take(widget.suggestionsLimit) + .toList() + : const []; + } + + final categories = []; + final categoryTargets = {}; + if (widget.showCategories) { + if (typing) { + final all = instant?.categories ?? const []; + for (final category in all.take(widget.categoriesLimit)) { + categories.add( + PersonalizationSuggestion( + id: category.id, + title: category.name, + subtitle: parentName(category, all), + ), + ); + categoryTargets[category.id] = PersonalizationSearchCategory( + id: category.id, + name: category.name, + url: category.url, + ); + } + } else { + final popular = blank?.popularCategories ?? const []; + for (final item in popular.take(widget.categoriesLimit)) { + final id = item.url.isNotEmpty ? item.url : item.name; + categories.add(PersonalizationSuggestion(id: id, title: item.name)); + categoryTargets[id] = PersonalizationSearchCategory( + id: null, + name: item.name, + url: item.url.isEmpty ? null : item.url, + ); + } + } + } + + final products = []; + final productTargets = {}; + if (widget.showProducts) { + final source = typing ? instant?.products : blank?.products; + for (final product in (source ?? const []).take( + widget.productsLimit, + )) { + final card = toCardProduct(product, null); + products.add( + PersonalizationSuggestion( + id: card.id, + title: card.name, + subtitle: card.price, + image: widget.showImages ? card.image : null, + ), + ); + productTargets[card.id] = product; + } + } + + return PersonalizationInstantSearch( + controller: _controller, + placeholder: widget.placeholder, + cancelText: widget.cancelText, + onCancel: widget.onCancel, + onQueryChanged: _typed, + onSubmit: _submit, + recentLabel: widget.recentLabel, + clearText: widget.clearText, + onClearRecent: () => _recent?.clear().then((items) { + if (mounted) setState(() => _recentItems = items); + }), + recentSearches: recentShown, + moreText: collapsed ? widget.moreText : null, + onMoreRecent: () => setState(() => _recentExpanded = true), + onRecentTap: (item) { + _controller.text = item; + _submit(item); + }, + onRecentRemove: (item) => _recent?.remove(item).then((items) { + if (mounted) setState(() => _recentItems = items); + }), + suggestions: suggestions, + onSuggestionTap: (item) { + _controller.text = item; + _submit(item); + }, + categoriesLabel: widget.categoriesLabel, + categories: categories, + onCategoryTap: (suggestion) { + final target = categoryTargets[suggestion.id]; + if (target == null) return; + _rememberSource(); + widget.onCategoryTap?.call(target); + }, + productsLabel: widget.productsLabel, + products: products, + onProductTap: (suggestion) { + final target = productTargets[suggestion.id]; + if (target == null) return; + _rememberSource(); + widget.onProductTap?.call(target); + }, + showImages: widget.showImages, + iconBuilder: widget.iconBuilder, + ); + } +} diff --git a/lib/src/ui/widgets/personalization_search_results_screen.dart b/lib/src/ui/widgets/personalization_search_results_screen.dart new file mode 100644 index 0000000..cc248b1 --- /dev/null +++ b/lib/src/ui/widgets/personalization_search_results_screen.dart @@ -0,0 +1,658 @@ +import 'package:flutter/widgets.dart'; + +import '../../multi_instance/rees46.dart'; +import '../../personalization_sdk.dart'; +import '../../search/search_params.dart'; +import '../../search/search_response.dart'; +import '../../tracking/tracking_models.dart'; +import '../components/personalization_catalog.dart'; +import '../components/personalization_filters.dart'; +import '../components/personalization_product.dart'; +import '../components/personalization_product_image.dart'; +import '../components/personalization_products_list.dart'; +import '../components/personalization_search_results_title.dart'; +import '../personalization_theme.dart'; +import 'search_support.dart'; + +/// Значения фильтров, ушедшие в запрос. +@immutable +class PersonalizationSearchApplied { + const PersonalizationSearchApplied({ + this.brands = const {}, + this.priceMin, + this.priceMax, + this.colors = const {}, + this.sizes = const {}, + this.facets = const >{}, + }); + + final Set brands; + final String? priceMin; + final String? priceMax; + final Set colors; + final Set sizes; + final Map> facets; + + bool get isEmpty => + brands.isEmpty && + (priceMin ?? '').isEmpty && + (priceMax ?? '').isEmpty && + colors.isEmpty && + sizes.isEmpty && + facets.values.every((values) => values.isEmpty); + + PersonalizationSearchApplied copyWith({ + Set? brands, + String? Function()? priceMin, + String? Function()? priceMax, + Set? colors, + Set? sizes, + Map>? facets, + }) => PersonalizationSearchApplied( + brands: brands ?? this.brands, + priceMin: priceMin == null ? this.priceMin : priceMin(), + priceMax: priceMax == null ? this.priceMax : priceMax(), + colors: colors ?? this.colors, + sizes: sizes ?? this.sizes, + facets: facets ?? this.facets, + ); +} + +/// Экран полной выдачи с данными SDK: заголовок с числом найденного, плитка ⇄ список, +/// теги применённых фильтров, счётчик, «загрузить ещё» или бесконечная прокрутка, +/// пустое состояние и экран фильтров — виджет сам ходит в `searchFull` и держит состояние. +/// +/// Паттерн SearchResultsScreen из Figma (страница 1:30), источник — `searchFull(query)`. +/// Визуальный слой — [PersonalizationSearchResultsTitle] в заголовке +/// [PersonalizationCatalog]; фильтры — [PersonalizationFilters] поверх выдачи внутри этого +/// же виджета, так что экран занимает весь отведённый ему экран хоста. +/// +/// Инстанс SDK: [sdk] явно, иначе [shopId] или единственный зарегистрированный +/// (`REES46.getInstance`). +/// +/// Фасеты строятся из ответа: диапазон цены (`price_range`), бренды, цвета и размеры +/// (`industrial_filters`) и произвольные фасеты магазина (`filters`), из которых +/// показываются только те, где больше одного значения. Применённые значения идут тегами в +/// заголовок и параметрами в следующий запрос. Заголовок произвольного фасета — его имя +/// через [facetTitle]. +/// +/// Сортировки: кнопка в заголовке отдаёт [onSortTap] хосту (пикер в макете не нарисован), +/// выбранное хост кладёт в [sortBy] / [sortDir]. Каждый новый запрос трекается событием +/// `search`; нажатие на карточку запоминает источник `full_search` и отдаёт товар через +/// [onProductTap], кнопка карточки — через [onProductAction]. +class PersonalizationSearchResultsScreen extends StatefulWidget { + const PersonalizationSearchResultsScreen({ + super.key, + this.sdk, + this.shopId, + required this.query, + this.titleText, + this.pageSize = 20, + this.sortBy, + this.sortDir, + this.locations, + this.infiniteScroll = false, + this.showFilters = true, + this.showSort = true, + this.facets, + this.productActionText, + this.layout = PersonalizationProductsLayout.grid, + this.imageAspect = PersonalizationProductImageAspect.square, + this.onBack, + this.onSortTap, + this.onProductTap, + this.onProductAction, + this.onError, + this.foundPrefix = 'Found', + this.foundSuffix = 'products', + this.countPrefix = 'Showing', + this.countSeparator = 'of', + this.loadMoreText = 'Load more', + this.emptyText = 'No results for your request.', + this.filtersTitle = 'Filters', + this.resetText = 'Reset', + this.applyText = 'Apply', + this.showMoreText = 'Show more', + this.showLessText = 'Show less', + this.priceTitle = 'Price', + this.fromLabel = 'From', + this.toLabel = 'to', + this.brandsTitle = 'Brand', + this.colorsTitle = 'Color', + this.sizesTitle = 'Size', + this.facetTitle, + this.iconBuilder, + }); + + final PersonalizationSdk? sdk; + final String? shopId; + + /// Поисковая фраза; смена перезапрашивает первую страницу. + final String query; + + /// Заголовок экрана; `null` — сама фраза. + final String? titleText; + final int pageSize; + + /// `popular`, `price`, `discount`, `sales_rate`, `date`; `null` — релевантность. + final String? sortBy; + + /// `asc` / `desc`. + final String? sortDir; + + /// Список id локаций через запятую. + final String? locations; + + /// Бесконечная прокрутка вместо кнопки «загрузить ещё». + final bool infiniteScroll; + final bool showFilters; + final bool showSort; + + /// Какие фасеты из `filters` показывать; `null` — все с более чем одним значением. + final Set? facets; + + /// Подпись кнопки на карточке; `null` — без кнопки. + final String? productActionText; + final PersonalizationProductsLayout layout; + final PersonalizationProductImageAspect imageAspect; + + final VoidCallback? onBack; + final VoidCallback? onSortTap; + final ValueChanged? onProductTap; + final ValueChanged? onProductAction; + final ValueChanged? onError; + + final String foundPrefix; + final String foundSuffix; + final String countPrefix; + final String countSeparator; + final String? loadMoreText; + final String? emptyText; + final String filtersTitle; + final String? resetText; + final String? applyText; + final String? showMoreText; + final String? showLessText; + final String priceTitle; + final String fromLabel; + final String toLabel; + final String brandsTitle; + final String colorsTitle; + final String sizesTitle; + + /// Заголовок произвольного фасета по его имени в ответе. + final String Function(String name)? facetTitle; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => + _PersonalizationSearchResultsScreenState(); +} + +class _PersonalizationSearchResultsScreenState + extends State { + static const String _sectionPrice = 'price'; + static const String _sectionBrands = 'brands'; + static const String _sectionColors = 'colors'; + static const String _sectionSizes = 'sizes'; + static const String _sectionFacet = 'facet:'; + + PersonalizationSdk? _sdk; + late PersonalizationProductsLayout _layout = widget.layout; + List _products = const []; + int _total = 0; + int _page = 0; + bool _loading = false; + SearchFullResponse? _facetSource; + PersonalizationSearchApplied _applied = const PersonalizationSearchApplied(); + bool _filtersOpen = false; + int _seq = 0; + final ScrollController _scroll = ScrollController(); + + @override + void initState() { + super.initState(); + _scroll.addListener(_onScroll); + _resolve(); + } + + @override + void didUpdateWidget(PersonalizationSearchResultsScreen oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.sdk != widget.sdk || oldWidget.shopId != widget.shopId) { + _resolve(); + } else if (oldWidget.query != widget.query || + oldWidget.sortBy != widget.sortBy || + oldWidget.sortDir != widget.sortDir) { + _reload(); + } + } + + @override + void dispose() { + _scroll.dispose(); + super.dispose(); + } + + void _resolve() { + PersonalizationSdk? sdk = widget.sdk; + if (sdk == null) { + try { + sdk = REES46.getInstance(widget.shopId); + } catch (error) { + debugPrint( + 'PersonalizationSearchResultsScreen: cannot resolve an SDK for ' + 'shopId=${widget.shopId} — $error', + ); + widget.onError?.call(error); + } + } + _sdk = sdk; + _reload(); + } + + String get _text => widget.query.trim(); + + /// Первая страница заново. + void _reload() { + setState(() { + _products = const []; + _total = 0; + _page = 0; + }); + final sdk = _sdk; + if (sdk == null || _text.isEmpty) { + _seq++; + return; + } + sdk.tracking.search(_text); + _request(sdk, 1); + } + + /// Следующая страница, если она есть и запрос не в полёте. + void _loadMore() { + final sdk = _sdk; + if (sdk == null || + _text.isEmpty || + _loading || + _products.length >= _total) { + return; + } + _request(sdk, _page + 1); + } + + void _onScroll() { + if (!widget.infiniteScroll || !_scroll.hasClients) return; + final position = _scroll.position; + if (position.pixels >= + position.maxScrollExtent - position.viewportDimension / 2) { + _loadMore(); + } + } + + Future _request(PersonalizationSdk sdk, int nextPage) async { + final seq = ++_seq; + setState(() => _loading = true); + final applied = _applied; + final params = SearchParams( + page: nextPage, + limit: widget.pageSize, + sortBy: widget.sortBy, + sortDir: widget.sortDir, + locations: widget.locations, + brands: applied.brands.isEmpty ? null : applied.brands.join(','), + priceMin: double.tryParse((applied.priceMin ?? '').trim()), + priceMax: double.tryParse((applied.priceMax ?? '').trim()), + colors: applied.colors.isEmpty ? null : applied.colors.toList(), + fashionSizes: applied.sizes.isEmpty ? null : applied.sizes.toList(), + filters: >{ + for (final entry in applied.facets.entries) + if (entry.value.isNotEmpty) entry.key: entry.value.toList(), + }, + ); + try { + final response = await sdk.searchFull(_text, params: params); + if (!mounted || seq != _seq) return; + setState(() { + _loading = false; + _page = nextPage; + _total = response.productsTotal; + _products = nextPage == 1 + ? response.products + : [..._products, ...response.products]; + if (nextPage == 1) _facetSource = response; + }); + } catch (error) { + if (!mounted || seq != _seq) return; + setState(() => _loading = false); + widget.onError?.call(error); + } + } + + void _apply(PersonalizationSearchApplied next) { + setState(() { + _applied = next; + _filtersOpen = false; + }); + _reload(); + } + + void _productTapped(SearchProduct product) { + if (_text.isNotEmpty) { + _sdk?.tracking.setSource( + TrackingSource(type: TrackingSourceType.fullSearch, code: _text), + ); + } + widget.onProductTap?.call(product); + } + + SearchProduct? _find(String id) { + for (final product in _products) { + if (product.id == id) return product; + } + return null; + } + + // --- Фасеты ⇄ секции экрана фильтров ------------------------------------------------------ + + String _facetTitle(String name) { + final custom = widget.facetTitle; + if (custom != null) return custom(name); + final spaced = name.replaceAll('_', ' '); + return spaced.isEmpty + ? spaced + : spaced[0].toUpperCase() + spaced.substring(1); + } + + List _options( + Iterable values, + Set checked, + ) { + final seen = {}; + return [ + for (final value in [...values, ...checked]) + if (seen.add(value)) + PersonalizationFilterOption( + id: value, + label: value, + checked: checked.contains(value), + ), + ]; + } + + List _buildSections() { + final source = _facetSource; + final applied = _applied; + final sections = []; + if (source?.priceRange != null || + applied.priceMin != null || + applied.priceMax != null) { + sections.add( + PersonalizationFilterRange( + id: _sectionPrice, + title: widget.priceTitle, + fromLabel: widget.fromLabel, + toLabel: widget.toLabel, + from: applied.priceMin, + to: applied.priceMax, + ), + ); + } + final brands = source?.brands ?? const []; + if (brands.isNotEmpty || applied.brands.isNotEmpty) { + sections.add( + PersonalizationFilterOptions( + id: _sectionBrands, + title: widget.brandsTitle, + options: _options(brands, applied.brands), + showMoreText: widget.showMoreText, + showLessText: widget.showLessText, + ), + ); + } + final colors = source?.industrialFilters?.colors ?? const []; + if (colors.isNotEmpty || applied.colors.isNotEmpty) { + sections.add( + PersonalizationFilterOptions( + id: _sectionColors, + title: widget.colorsTitle, + options: _options(colors, applied.colors), + showMoreText: widget.showMoreText, + showLessText: widget.showLessText, + ), + ); + } + final sizes = source?.industrialFilters?.fashionSizes ?? const []; + if (sizes.isNotEmpty || applied.sizes.isNotEmpty) { + sections.add( + PersonalizationFilterOptions( + id: _sectionSizes, + title: widget.sizesTitle, + options: _options(sizes, applied.sizes), + showMoreText: widget.showMoreText, + showLessText: widget.showLessText, + ), + ); + } + final wanted = widget.facets; + final filters = source?.filters ?? const {}; + for (final name in filters.keys.toList()..sort()) { + final values = filters[name]!.values.keys.toList()..sort(); + final checked = applied.facets[name] ?? const {}; + final visible = wanted == null + ? values.length > 1 + : wanted.contains(name); + if (!visible && checked.isEmpty) continue; + sections.add( + PersonalizationFilterOptions( + id: '$_sectionFacet$name', + title: _facetTitle(name), + options: _options(values, checked), + showMoreText: widget.showMoreText, + showLessText: widget.showLessText, + ), + ); + } + return sections; + } + + PersonalizationSearchApplied _fromSections( + List sections, + ) { + var next = const PersonalizationSearchApplied(); + final facets = >{}; + for (final section in sections) { + switch (section) { + case PersonalizationFilterRange(): + if (section.id != _sectionPrice) break; + String? clean(String? value) { + final trimmed = (value ?? '').trim(); + return trimmed.isEmpty ? null : trimmed; + } + next = next.copyWith( + priceMin: () => clean(section.from), + priceMax: () => clean(section.to), + ); + case PersonalizationFilterOptions(): + final checked = { + for (final option in section.options) + if (option.checked) option.id, + }; + if (section.id == _sectionBrands) { + next = next.copyWith(brands: checked); + } else if (section.id == _sectionColors) { + next = next.copyWith(colors: checked); + } else if (section.id == _sectionSizes) { + next = next.copyWith(sizes: checked); + } else if (section.id.startsWith(_sectionFacet)) { + facets[section.id.substring(_sectionFacet.length)] = checked; + } + } + } + return next.copyWith(facets: facets); + } + + List _appliedTags() { + final applied = _applied; + final tags = []; + for (final brand in applied.brands.toList()..sort()) { + tags.add( + PersonalizationSearchFilter( + label: brand, + onRemove: () => _apply( + applied.copyWith(brands: applied.brands.difference({brand})), + ), + ), + ); + } + final priceMin = (applied.priceMin ?? '').trim(); + final priceMax = (applied.priceMax ?? '').trim(); + if (priceMin.isNotEmpty || priceMax.isNotEmpty) { + final label = [priceMin, priceMax].where((v) => v.isNotEmpty).join(' – '); + tags.add( + PersonalizationSearchFilter( + label: '${widget.priceTitle} $label', + onRemove: () => _apply( + applied.copyWith(priceMin: () => null, priceMax: () => null), + ), + ), + ); + } + for (final color in applied.colors.toList()..sort()) { + tags.add( + PersonalizationSearchFilter( + label: color, + onRemove: () => _apply( + applied.copyWith(colors: applied.colors.difference({color})), + ), + ), + ); + } + for (final size in applied.sizes.toList()..sort()) { + tags.add( + PersonalizationSearchFilter( + label: size, + onRemove: () => + _apply(applied.copyWith(sizes: applied.sizes.difference({size}))), + ), + ); + } + for (final name in applied.facets.keys.toList()..sort()) { + for (final value in applied.facets[name]!.toList()..sort()) { + tags.add( + PersonalizationSearchFilter( + label: value, + onRemove: () => _apply( + applied.copyWith( + facets: >{ + ...applied.facets, + name: applied.facets[name]!.difference({value}), + }, + ), + ), + ), + ); + } + } + return tags; + } + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + final hasMore = _products.isNotEmpty && _products.length < _total; + + final header = PersonalizationSearchResultsTitle( + title: widget.titleText ?? widget.query, + selectedViewIndex: _layout == PersonalizationProductsLayout.grid ? 0 : 1, + onViewChanged: (index) => setState(() { + _layout = index == 0 + ? PersonalizationProductsLayout.grid + : PersonalizationProductsLayout.list; + }), + onBack: widget.onBack, + onFilters: () => setState(() => _filtersOpen = true), + onSort: widget.onSortTap, + showFiltersButton: widget.showFilters, + showSortButton: widget.showSort, + results: PersonalizationSearchResults( + prefix: widget.foundPrefix, + count: _total, + suffix: widget.foundSuffix, + ), + filters: _appliedTags(), + iconBuilder: widget.iconBuilder, + ); + + final catalog = PersonalizationCatalog( + header: header, + layout: _layout, + products: [ + for (final product in _products) + toCardProduct(product, widget.productActionText), + ], + imageAspect: widget.imageAspect, + emptyText: widget.emptyText, + loading: _loading, + count: _products.isEmpty + ? null + : PersonalizationCatalogCount( + prefix: widget.countPrefix, + shown: _products.length, + separator: widget.countSeparator, + total: _total, + ), + loadMoreText: hasMore && !widget.infiniteScroll + ? widget.loadMoreText + : null, + onLoadMore: _loadMore, + onProductTap: (card) { + final product = _find(card.id); + if (product != null) _productTapped(product); + }, + onProductAction: (card) { + final product = _find(card.id); + if (product != null) widget.onProductAction?.call(product); + }, + iconBuilder: widget.iconBuilder, + ); + + return ColoredBox( + color: colors.backgroundGeneric, + child: Stack( + fit: StackFit.expand, + children: [ + SingleChildScrollView( + controller: _scroll, + padding: const EdgeInsets.all(16), + child: catalog, + ), + if (_filtersOpen) + ColoredBox( + color: colors.backgroundGeneric, + child: SingleChildScrollView( + padding: const EdgeInsets.all(16), + child: PersonalizationFilters( + title: widget.filtersTitle, + sections: _buildSections(), + resetText: widget.resetText, + applyText: widget.applyText, + onClose: () => setState(() => _filtersOpen = false), + onReset: () => _apply(const PersonalizationSearchApplied()), + onApply: (sections) => _apply(_fromSections(sections)), + iconBuilder: widget.iconBuilder, + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/src/ui/widgets/search_support.dart b/lib/src/ui/widgets/search_support.dart new file mode 100644 index 0000000..32be5d9 --- /dev/null +++ b/lib/src/ui/widgets/search_support.dart @@ -0,0 +1,115 @@ +import 'package:flutter/widgets.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +import '../../search/search_response.dart'; +import '../components/personalization_product.dart'; + +/// Категория, на которую можно перейти из поиска: из подсказок instant-поиска (есть id) +/// или из популярных категорий пустого запроса (только имя и ссылка). +@immutable +class PersonalizationSearchCategory { + const PersonalizationSearchCategory({ + required this.id, + required this.name, + required this.url, + }); + + final String? id; + final String name; + final String? url; +} + +/// Недавние запросы пользователя — локальная история виджета поиска, по магазину. +/// +/// Сервер тоже помнит последние запросы (`last_queries` в `search/blank`), но не умеет +/// забывать по одному, а в макете у каждого тега крестик и есть «Clear». Поэтому история +/// живёт в SharedPreferences под ключом с id магазина. +class RecentSearches { + RecentSearches({required String shopKey, required this.limit}) + : _key = 'personalization.ui.recentSearches.$shopKey'; + + final String _key; + final int limit; + + Future> load() async { + final preferences = await SharedPreferences.getInstance(); + return preferences.getStringList(_key) ?? const []; + } + + /// Кладёт запрос в начало, убирая дубль, и режет по лимиту. + Future> add(String query) async { + final trimmed = query.trim(); + final items = await load(); + if (trimmed.isEmpty) return items; + final next = [ + trimmed, + ...items.where((item) => item.toLowerCase() != trimmed.toLowerCase()), + ]; + return _save(next.take(limit).toList()); + } + + Future> remove(String query) async => + _save((await load()).where((item) => item != query).toList()); + + Future> clear() => _save(const []); + + Future> _save(List items) async { + final preferences = await SharedPreferences.getInstance(); + await preferences.setStringList(_key, items); + return items; + } +} + +/// Товар ответа поиска → данные карточки кита. Строки берутся уже отформатированными +/// сервером (`price_formatted`, `oldprice_formatted`, `discount_formatted`); картинка — +/// `picture` (уменьшенная копия), иначе оригинал. +PersonalizationProduct toCardProduct( + SearchProduct product, + String? actionText, +) { + final hasOldPrice = + product.oldPrice > product.price && + (product.oldPriceFormatted ?? '').isNotEmpty; + String? discount; + if (hasOldPrice) { + final formatted = product.discountFormatted; + if (formatted != null && formatted.isNotEmpty) { + discount = formatted; + } else if (product.discount > 0) { + discount = '${product.discount}%'; + } + } + final priceText = product.priceFormatted ?? ''; + return PersonalizationProduct( + id: product.id, + name: product.name, + price: priceText.isNotEmpty + ? priceText + : '${product.price} ${product.currency}'.trim(), + image: imageFor(product), + brand: product.brand.isEmpty ? null : product.brand, + oldPrice: hasOldPrice ? product.oldPriceFormatted : null, + discount: discount == null + ? null + : (discount.startsWith('-') ? discount : '-$discount'), + actionText: actionText, + ); +} + +/// Картинка товара для карточки: уменьшенная копия, иначе оригинал, иначе ничего. +ImageProvider? imageFor(SearchProduct product) { + final url = (product.picture ?? '').isNotEmpty + ? product.picture! + : product.imageUrl; + return url.isEmpty ? null : NetworkImage(url); +} + +/// Имя родительской категории: в ответе родитель — это id, имя ищем среди пришедших. +String? parentName(SearchCategory category, List all) { + final parentId = category.parentId; + if (parentId == null || parentId.isEmpty) return null; + for (final item in all) { + if (item.id == parentId) return item.name; + } + return null; +} diff --git a/pubspec.yaml b/pubspec.yaml index be3a3aa..d5d4e3c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,6 +13,8 @@ dependencies: flutter: sdk: flutter plugin_platform_interface: ^2.0.2 + # История поисковых запросов виджета мгновенного поиска. + shared_preferences: ^2.3.0 dev_dependencies: flutter_test: From 99a776dac09dfbf6d50f62c1f510978e014d5005 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 21:46:49 +0400 Subject: [PATCH 18/79] feat(example): search tab running the live search widgets The UI Kit screen gets a Search tab: the instant search field against the demo shop, and the results screen it opens on submit, with back returning to the field. Taps on products and categories only show a snackbar; the sort button cycles relevance, price ascending and descending in place of the picker the design file does not have. --- example/ios/Podfile.lock | 7 + example/lib/main.dart | 4 +- example/lib/ui_kit_pane.dart | 508 +++++++++++++++++++++++++++++------ example/pubspec.lock | 101 +++++++ 4 files changed, 533 insertions(+), 87 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 9db4988..6729fd7 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -11,12 +11,16 @@ PODS: - rees46_sdk (0.0.1): - Flutter - REES46 (= 3.33.0) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS DEPENDENCIES: - Flutter (from `Flutter`) - integration_test (from `.symlinks/plugins/integration_test/ios`) - patrol (from `.symlinks/plugins/patrol/darwin`) - rees46_sdk (from `.symlinks/plugins/rees46_sdk/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) SPEC REPOS: trunk: @@ -32,6 +36,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/patrol/darwin" rees46_sdk: :path: ".symlinks/plugins/rees46_sdk/ios" + shared_preferences_foundation: + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 @@ -40,6 +46,7 @@ SPEC CHECKSUMS: patrol: cea8074f183a2a4232d0ebd10569ae05149ada42 REES46: 92331668908a711e67515f368a9b00ed775fcffc rees46_sdk: 8ad2e581dcb34d936af65c5c7af8c9c4c84f5255 + shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb PODFILE CHECKSUM: b6e248ac4c1eff5807c8b044b39b8bc326af3f5f diff --git a/example/lib/main.dart b/example/lib/main.dart index ae4b247..26d325d 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -730,7 +730,7 @@ class _InitPageState extends State { tooltip: 'UI Kit', icon: const Icon(Icons.widgets_outlined), onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => const UiKitPane()), + MaterialPageRoute(builder: (_) => const UiKitPane(shopId: _shopId)), ), ), IconButton( @@ -774,7 +774,7 @@ class _InitPageState extends State { FilledButton.tonalIcon( key: const Key('open-ui-kit-button'), onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => const UiKitPane()), + MaterialPageRoute(builder: (_) => const UiKitPane(shopId: _shopId)), ), icon: const Icon(Icons.widgets_outlined), label: const Text('Open UI Kit (components and blocks)'), diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index fd531b8..bea1294 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -9,7 +9,9 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; /// /// "Components" walks through the primitives in every size, view and state the /// design file defines; "Blocks" shows the compositions built from them -/// (product cards, recommender layouts, instant search, the catalogue, the filters screen). +/// (product cards, recommender layouts, instant search, the catalogue, the filters screen); +/// "Search" runs the two data-bound search widgets against the demo shop: the +/// instant search field, and the results screen it opens on submit. /// Mirror of the Android `UiKitPane` / iOS `UIKitShowcaseViewController` / /// React Native `UiKitPane`. /// @@ -18,12 +20,15 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; /// images are plain [ImageProvider]s — the kit does not fetch or format /// anything. class UiKitPane extends StatelessWidget { - const UiKitPane({super.key}); + const UiKitPane({super.key, required this.shopId}); + + /// Shop the Search tab's widgets resolve their SDK instance by. + final String shopId; @override Widget build(BuildContext context) { return DefaultTabController( - length: 2, + length: 3, child: Scaffold( appBar: AppBar( title: const Text('UI Kit'), @@ -31,6 +36,7 @@ class UiKitPane extends StatelessWidget { tabs: [ Tab(text: 'Components'), Tab(text: 'Blocks'), + Tab(text: 'Search'), ], ), ), @@ -38,6 +44,7 @@ class UiKitPane extends StatelessWidget { children: [ _Showcase(exhibits: _componentExhibits), _Showcase(exhibits: _blockExhibits), + _SearchFlow(shopId: shopId), ], ), ), @@ -45,6 +52,79 @@ class UiKitPane extends StatelessWidget { } } +/// The search flow as a host would wire it: the instant search field resolves the SDK by +/// shopId and searches on its own; submitting a phrase swaps it for the results screen, +/// whose back button returns. Taps on products and categories only show a snackbar — +/// navigation is the host's. +class _SearchFlow extends StatefulWidget { + const _SearchFlow({required this.shopId}); + + final String shopId; + + @override + State<_SearchFlow> createState() => _SearchFlowState(); +} + +class _SearchFlowState extends State<_SearchFlow> { + String? _query; + String? _sortBy; + String? _sortDir; + + void _say(String message) => ScaffoldMessenger.of( + context, + ).showSnackBar(SnackBar(content: Text(message))); + + @override + Widget build(BuildContext context) { + final query = _query; + if (query == null) { + return SingleChildScrollView( + padding: const EdgeInsets.all(16), + keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag, + child: PersonalizationInstantSearchField( + shopId: widget.shopId, + placeholder: 'Search', + cancelText: 'Cancel', + recentLabel: 'Recent searches', + clearText: 'Clear', + moreText: 'more', + categoriesLabel: 'Categories', + productsLabel: 'Products', + onSubmit: (text) => setState(() => _query = text), + onProductTap: (product) => _say('Product: ${product.name}'), + onCategoryTap: (category) => _say('Category: ${category.name}'), + onError: (error) => _say('Search error: $error'), + iconBuilder: _icon, + ), + ); + } + return PersonalizationSearchResultsScreen( + shopId: widget.shopId, + query: query, + sortBy: _sortBy, + sortDir: _sortDir, + productActionText: 'Add to cart', + onBack: () => setState(() => _query = null), + onProductTap: (product) => _say('Product: ${product.name}'), + onProductAction: (product) => _say('Add to cart: ${product.name}'), + // No sort picker in the design file: cycle relevance → price ↑ → price ↓ on tap. + onSortTap: () => setState(() { + if (_sortBy == null) { + _sortBy = 'price'; + _sortDir = 'asc'; + } else if (_sortDir == 'asc') { + _sortDir = 'desc'; + } else { + _sortBy = null; + _sortDir = null; + } + }), + onError: (error) => _say('Search error: $error'), + iconBuilder: _icon, + ); + } +} + class _Exhibit { const _Exhibit(this.title, this.build); @@ -60,8 +140,8 @@ class _Showcase extends StatelessWidget { @override Widget build(BuildContext context) { final caption = Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ); + color: Theme.of(context).colorScheme.onSurfaceVariant, + ); return ListView.separated( padding: const EdgeInsets.fromLTRB(16, 16, 16, 40), itemCount: exhibits.length, @@ -214,21 +294,33 @@ final List<_Exhibit> _componentExhibits = [ ); }), _Exhibit('Link — text action next to a field or a label', (context) { - return _Row(children: [ - PersonalizationLink(label: 'Cancel', onTap: () {}), - PersonalizationLink(label: 'Clear', onTap: () {}), - ]); + return _Row( + children: [ + PersonalizationLink(label: 'Cancel', onTap: () {}), + PersonalizationLink(label: 'Clear', onTap: () {}), + ], + ); }), - _Exhibit('Search Results Title', (context) => const _SearchResultsTitleExhibit()), + _Exhibit( + 'Search Results Title', + (context) => const _SearchResultsTitleExhibit(), + ), _Exhibit('Accordion — collapsed with count, expanded', (context) { return _Column( children: [ PersonalizationAccordion(label: 'Brand', count: 12, iconBuilder: _icon), - PersonalizationAccordion(label: 'Size', expanded: true, iconBuilder: _icon), + PersonalizationAccordion( + label: 'Size', + expanded: true, + iconBuilder: _icon, + ), ], ); }), - _Exhibit('List Label', (context) => const PersonalizationListLabel(label: 'Popular categories')), + _Exhibit( + 'List Label', + (context) => const PersonalizationListLabel(label: 'Popular categories'), + ), _Exhibit('Badge — warning LG / MD / SM, danger', (context) { return const _Row( children: [ @@ -246,41 +338,65 @@ final List<_Exhibit> _componentExhibits = [ _Exhibit('Tag — primary with remove, secondary', (context) { return _Row( children: [ - PersonalizationTag(label: 'Nike', onRemove: () {}, removeIconBuilder: _removeIcon), + PersonalizationTag( + label: 'Nike', + onRemove: () {}, + removeIconBuilder: _removeIcon, + ), PersonalizationTag( label: 'Size 42', view: PersonalizationTagView.secondary, onRemove: () {}, removeIconBuilder: _removeIcon, ), - const PersonalizationTag(label: 'Running', view: PersonalizationTagView.secondary), - ], - ); - }), - _Exhibit('Checkbox — unchecked, checked, indeterminate, disabled; with label', (context) { - return const _Column( - children: [ - _Row( - children: [ - PersonalizationCheckbox(state: PersonalizationCheckboxState.unchecked), - PersonalizationCheckbox(state: PersonalizationCheckboxState.checked), - PersonalizationCheckbox(state: PersonalizationCheckboxState.indeterminate), - PersonalizationCheckbox(state: PersonalizationCheckboxState.checked, disabled: true), - ], - ), - PersonalizationCheckboxWithLabel( - label: 'In stock only', - state: PersonalizationCheckboxState.checked, + const PersonalizationTag( + label: 'Running', + view: PersonalizationTagView.secondary, ), ], ); }), + _Exhibit( + 'Checkbox — unchecked, checked, indeterminate, disabled; with label', + (context) { + return const _Column( + children: [ + _Row( + children: [ + PersonalizationCheckbox( + state: PersonalizationCheckboxState.unchecked, + ), + PersonalizationCheckbox( + state: PersonalizationCheckboxState.checked, + ), + PersonalizationCheckbox( + state: PersonalizationCheckboxState.indeterminate, + ), + PersonalizationCheckbox( + state: PersonalizationCheckboxState.checked, + disabled: true, + ), + ], + ), + PersonalizationCheckboxWithLabel( + label: 'In stock only', + state: PersonalizationCheckboxState.checked, + ), + ], + ); + }, + ), _Exhibit('Dots, Count, Rating', (context) { return _Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ const PersonalizationDots(count: 5, selectedIndex: 1), - const PersonalizationCount(prefix: 'Showing', shown: 12, separator: 'of', total: 128), + const PersonalizationCount( + prefix: 'Showing', + shown: 12, + separator: 'of', + total: 128, + ), PersonalizationRating(value: '4.7', reviews: 128, iconBuilder: _icon), ], ); @@ -296,20 +412,30 @@ final List<_Exhibit> _componentExhibits = [ _Exhibit('Product Image — 1:1, 4:3, 3:4', (context) { return _Row( children: [ - for (final (index, aspect) in PersonalizationProductImageAspect.values.indexed) + for (final (index, aspect) + in PersonalizationProductImageAspect.values.indexed) SizedBox( width: 104, - child: PersonalizationProductImage(aspect: aspect, image: _products[index].image), + child: PersonalizationProductImage( + aspect: aspect, + image: _products[index].image, + ), ), ], ); }), - _Exhibit('Empty State', (context) => const PersonalizationEmptyState(message: 'No results for your request.')), + _Exhibit( + 'Empty State', + (context) => const PersonalizationEmptyState( + message: 'No results for your request.', + ), + ), _Exhibit('Icons — the full set, 24 dp', (context) { final color = PersonalizationTheme.of(context).colors.textPrimary; return _ScrollRow( children: [ - for (final asset in PersonalizationIcons.all) _icon(context, asset, 24, color), + for (final asset in PersonalizationIcons.all) + _icon(context, asset, 24, color), ], ); }), @@ -320,8 +446,14 @@ final List<_Exhibit> _blockExhibits = [ return _Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox(width: 220, child: _card(PersonalizationProductCardType.carousel, _products[0])), - SizedBox(width: 161, child: _card(PersonalizationProductCardType.grid, _products[1])), + SizedBox( + width: 220, + child: _card(PersonalizationProductCardType.carousel, _products[0]), + ), + SizedBox( + width: 161, + child: _card(PersonalizationProductCardType.grid, _products[1]), + ), _card(PersonalizationProductCardType.list, _products[2]), ], ); @@ -334,31 +466,65 @@ final List<_Exhibit> _blockExhibits = [ ]; return _Column( children: [ - _ScrollRow(children: [ - for (final (index, aspect) in aspects.indexed) - SizedBox( - width: 220, - child: _card(PersonalizationProductCardType.carousel, _products[index + 3], aspect: aspect), - ), - ]), + _ScrollRow( + children: [ + for (final (index, aspect) in aspects.indexed) + SizedBox( + width: 220, + child: _card( + PersonalizationProductCardType.carousel, + _products[index + 3], + aspect: aspect, + ), + ), + ], + ), for (final (index, aspect) in aspects.indexed) - _card(PersonalizationProductCardType.list, _products[index + 3], aspect: aspect), + _card( + PersonalizationProductCardType.list, + _products[index + 3], + aspect: aspect, + ), ], ); }), _Exhibit('Recommender Block — carousel', (context) { - return _recommender(PersonalizationProductsLayout.carousel, 'Recommended for you', _products); + return _recommender( + PersonalizationProductsLayout.carousel, + 'Recommended for you', + _products, + ); }), _Exhibit('Recommender Block — grid', (context) { - return _recommender(PersonalizationProductsLayout.grid, 'Similar products', _products.take(4).toList()); + return _recommender( + PersonalizationProductsLayout.grid, + 'Similar products', + _products.take(4).toList(), + ); }), _Exhibit('Recommender Block — list', (context) { - return _recommender(PersonalizationProductsLayout.list, 'Recently viewed', _products.take(3).toList()); + return _recommender( + PersonalizationProductsLayout.list, + 'Recently viewed', + _products.take(3).toList(), + ); }), - _Exhibit('Instant Search — recent searches', (context) => const _InstantSearchExhibit()), - _Exhibit('Instant Search — typing, matches in bold', (context) => const _InstantSearchExhibit(typing: true)), - _Exhibit('Instant Search — with images', (context) => const _InstantSearchExhibit(images: true)), - _Exhibit('Catalog — header, grid ⇄ list, count, load more', (context) => const _CatalogExhibit()), + _Exhibit( + 'Instant Search — recent searches', + (context) => const _InstantSearchExhibit(), + ), + _Exhibit( + 'Instant Search — typing, matches in bold', + (context) => const _InstantSearchExhibit(typing: true), + ), + _Exhibit( + 'Instant Search — with images', + (context) => const _InstantSearchExhibit(images: true), + ), + _Exhibit( + 'Catalog — header, grid ⇄ list, count, load more', + (context) => const _CatalogExhibit(), + ), _Exhibit( 'Catalog — empty state', (context) => const PersonalizationCatalog( @@ -368,7 +534,10 @@ final List<_Exhibit> _blockExhibits = [ iconBuilder: _icon, ), ), - _Exhibit('Filters — range, checkbox lists with show more, reset / apply', (context) => _filters()), + _Exhibit( + 'Filters — range, checkbox lists with show more, reset / apply', + (context) => _filters(), + ), ]; // --- Stateful exhibits ------------------------------------------------------ @@ -413,10 +582,12 @@ class _SearchResultsTitleExhibit extends StatefulWidget { final int count; @override - State<_SearchResultsTitleExhibit> createState() => _SearchResultsTitleExhibitState(); + State<_SearchResultsTitleExhibit> createState() => + _SearchResultsTitleExhibitState(); } -class _SearchResultsTitleExhibitState extends State<_SearchResultsTitleExhibit> { +class _SearchResultsTitleExhibitState + extends State<_SearchResultsTitleExhibit> { int _view = 0; @override @@ -431,7 +602,11 @@ class _SearchResultsTitleExhibitState extends State<_SearchResultsTitleExhibit> onBack: () {}, onFilters: () {}, onSort: () {}, - results: PersonalizationSearchResults(prefix: 'Found', count: widget.count, suffix: 'products'), + results: PersonalizationSearchResults( + prefix: 'Found', + count: widget.count, + suffix: 'products', + ), filters: [ PersonalizationSearchFilter(label: 'Nike', onRemove: () {}), PersonalizationSearchFilter(label: 'Size 42', onRemove: () {}), @@ -458,8 +633,16 @@ class _InstantSearchExhibit extends StatefulWidget { } class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { - late final TextEditingController _controller = TextEditingController(text: widget.typing ? 'boots' : ''); - List _recent = ['mens winter boots', 'kids shoes', 'bag', 'accessories', 'black boots']; + late final TextEditingController _controller = TextEditingController( + text: widget.typing ? 'boots' : '', + ); + List _recent = [ + 'mens winter boots', + 'kids shoes', + 'bag', + 'accessories', + 'black boots', + ]; @override void dispose() { @@ -482,8 +665,20 @@ class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { recentSearches: typing ? const [] : _recent, moreText: 'more', onMoreRecent: () {}, - onRecentRemove: (item) => setState(() => _recent = _recent.where((it) => it != item).toList()), - suggestions: typing ? const ['winter', 'mens', 'kids', 'for outdoor', 'womens', 'low', 'black', 'orange'] : const [], + onRecentRemove: (item) => + setState(() => _recent = _recent.where((it) => it != item).toList()), + suggestions: typing + ? const [ + 'winter', + 'mens', + 'kids', + 'for outdoor', + 'womens', + 'low', + 'black', + 'orange', + ] + : const [], categoriesLabel: typing ? 'Category' : 'Popular category', categories: typing ? const [ @@ -492,21 +687,44 @@ class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { PersonalizationSuggestion(id: 'c3', title: 'Kids boots'), ] : [ - PersonalizationSuggestion(id: 'c1', title: 'Running shoes', subtitle: 'Shoes', image: _products[0].image), - PersonalizationSuggestion(id: 'c2', title: 'Running apparel', subtitle: 'Clothing', image: _products[1].image), - PersonalizationSuggestion(id: 'c3', title: 'Trail gear', subtitle: 'Outdoor', image: _products[2].image), + PersonalizationSuggestion( + id: 'c1', + title: 'Running shoes', + subtitle: 'Shoes', + image: _products[0].image, + ), + PersonalizationSuggestion( + id: 'c2', + title: 'Running apparel', + subtitle: 'Clothing', + image: _products[1].image, + ), + PersonalizationSuggestion( + id: 'c3', + title: 'Trail gear', + subtitle: 'Outdoor', + image: _products[2].image, + ), ], productsLabel: typing ? 'Products' : 'Frequently searched', products: typing ? const [ PersonalizationSuggestion(id: 'p1', title: 'winter womens boots'), PersonalizationSuggestion(id: 'p2', title: 'boots for mens'), - PersonalizationSuggestion(id: 'p3', title: 'winter boots for mens'), + PersonalizationSuggestion( + id: 'p3', + title: 'winter boots for mens', + ), PersonalizationSuggestion(id: 'p4', title: 'kids winter boots'), ] : [ for (final p in _products.take(widget.images ? 3 : 5)) - PersonalizationSuggestion(id: p.id, title: p.name, subtitle: p.price, image: p.image), + PersonalizationSuggestion( + id: p.id, + title: p.name, + subtitle: p.price, + image: p.image, + ), ], onCategoryTap: (_) {}, onProductTap: (_) {}, @@ -546,7 +764,9 @@ class _CatalogExhibitState extends State<_CatalogExhibit> { return PersonalizationCatalog( header: _SearchResultsTitleExhibit( onViewChanged: (index) => setState(() { - _layout = index == 0 ? PersonalizationProductsLayout.grid : PersonalizationProductsLayout.list; + _layout = index == 0 + ? PersonalizationProductsLayout.grid + : PersonalizationProductsLayout.list; }), ), layout: _layout, @@ -601,7 +821,10 @@ class _ScrollRow extends StatelessWidget { } class _Column extends StatelessWidget { - const _Column({required this.children, this.crossAxisAlignment = CrossAxisAlignment.stretch}); + const _Column({ + required this.children, + this.crossAxisAlignment = CrossAxisAlignment.stretch, + }); final List children; final CrossAxisAlignment crossAxisAlignment; @@ -631,12 +854,28 @@ Widget _icon(BuildContext context, String asset, double size, Color color) { } Widget _removeIcon(BuildContext context, String asset) { - return _icon(context, asset, 16, PersonalizationTheme.of(context).colors.textPrimary); + return _icon( + context, + asset, + 16, + PersonalizationTheme.of(context).colors.textPrimary, + ); } /// The filters screen with the sections from the design file; toggles and ranges update its own state. Widget _filters() { - const colors = ['All', 'Black', 'White', 'Red', 'Light blue', 'Green', 'Yellow', 'Brown', 'Grey', 'Pink']; + const colors = [ + 'All', + 'Black', + 'White', + 'Red', + 'Light blue', + 'Green', + 'Yellow', + 'Brown', + 'Grey', + 'Pink', + ]; const ratings = ['All', '5 stars', '4+ stars', '3+ stars']; return PersonalizationFilters( title: 'Filters', @@ -647,25 +886,46 @@ Widget _filters() { onApply: (_) {}, sections: [ const PersonalizationFilterRange( - id: 'size', title: 'Size', fromLabel: 'From', toLabel: 'to', from: '42', to: '43', select: true), + id: 'size', + title: 'Size', + fromLabel: 'From', + toLabel: 'to', + from: '42', + to: '43', + select: true, + ), PersonalizationFilterOptions( id: 'colors', title: 'Colors', options: [ for (final (index, label) in colors.indexed) - PersonalizationFilterOption(id: label.toLowerCase(), label: label, checked: index == 1), + PersonalizationFilterOption( + id: label.toLowerCase(), + label: label, + checked: index == 1, + ), ], showMoreText: 'Show more', showLessText: 'Show less', ), const PersonalizationFilterRange( - id: 'price', title: 'Price (USD)', fromLabel: 'From', toLabel: 'to', from: '50', to: '500'), + id: 'price', + title: 'Price (USD)', + fromLabel: 'From', + toLabel: 'to', + from: '50', + to: '500', + ), PersonalizationFilterOptions( id: 'rating', title: 'Rating', options: [ for (final (index, label) in ratings.indexed) - PersonalizationFilterOption(id: label, label: label, checked: index == 1), + PersonalizationFilterOption( + id: label, + label: label, + checked: index == 1, + ), ], ), ], @@ -676,7 +936,8 @@ Widget _filters() { Widget _card( PersonalizationProductCardType type, PersonalizationProduct product, { - PersonalizationProductImageAspect aspect = PersonalizationProductImageAspect.square, + PersonalizationProductImageAspect aspect = + PersonalizationProductImageAspect.square, }) { return PersonalizationProductCard( type: type, @@ -694,7 +955,11 @@ Widget _card( ); } -Widget _recommender(PersonalizationProductsLayout layout, String title, List products) { +Widget _recommender( + PersonalizationProductsLayout layout, + String title, + List products, +) { return PersonalizationRecommenderBlock( layout: layout, title: title, @@ -710,18 +975,91 @@ Widget _recommender(PersonalizationProductsLayout layout, String title, List NetworkImage('https://picsum.photos/seed/$seed/600/600'); +ImageProvider _image(String seed) => + NetworkImage('https://picsum.photos/seed/$seed/600/600'); /// Static products for the exhibits. Strings arrive formatted — that is the kit's contract. final List _products = [ - PersonalizationProduct(id: '1', name: 'Air Zoom Pegasus 41 running shoes', price: r'$140', image: _image('pegasus'), brand: 'Nike', rating: const PersonalizationProductRating(value: '4.7', reviews: 128), oldPrice: r'$165', discount: '-15%', actionText: 'Add to cart'), - PersonalizationProduct(id: '2', name: 'Wireless over-ear headphones', price: r'$299', image: _image('headphones'), brand: 'Sony', rating: const PersonalizationProductRating(value: '4.8', reviews: 2140), actionText: 'Add to cart'), - PersonalizationProduct(id: '3', name: 'Everyday backpack 20 L', price: r'$89', image: _image('backpack'), brand: 'Peak Design', rating: const PersonalizationProductRating(value: '4.6', reviews: 412), oldPrice: r'$110', discount: '-19%', actionText: 'Add to cart'), - PersonalizationProduct(id: '4', name: 'Trail running jacket', price: r'$175', image: _image('jacket'), brand: 'Salomon', rating: const PersonalizationProductRating(value: '4.5', reviews: 77), actionText: 'Add to cart'), - PersonalizationProduct(id: '5', name: 'Polarized sunglasses', price: r'$120', image: _image('sunglasses'), brand: 'Oakley', rating: const PersonalizationProductRating(value: '4.4', reviews: 305), oldPrice: r'$150', discount: '-20%', actionText: 'Add to cart'), - PersonalizationProduct(id: '6', name: 'Insulated bottle 750 ml', price: r'$35', image: _image('bottle'), brand: 'Hydro Flask', rating: const PersonalizationProductRating(value: '4.9', reviews: 980), actionText: 'Add to cart'), - PersonalizationProduct(id: '7', name: 'GPS running watch', price: r'$449', image: _image('watch'), brand: 'Garmin', rating: const PersonalizationProductRating(value: '4.7', reviews: 1532), actionText: 'Add to cart'), - PersonalizationProduct(id: '8', name: 'Court sneakers', price: r'$95', image: _image('sneakers'), brand: 'Adidas', rating: const PersonalizationProductRating(value: '4.3', reviews: 64), oldPrice: r'$120', discount: '-21%', actionText: 'Add to cart'), + PersonalizationProduct( + id: '1', + name: 'Air Zoom Pegasus 41 running shoes', + price: r'$140', + image: _image('pegasus'), + brand: 'Nike', + rating: const PersonalizationProductRating(value: '4.7', reviews: 128), + oldPrice: r'$165', + discount: '-15%', + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '2', + name: 'Wireless over-ear headphones', + price: r'$299', + image: _image('headphones'), + brand: 'Sony', + rating: const PersonalizationProductRating(value: '4.8', reviews: 2140), + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '3', + name: 'Everyday backpack 20 L', + price: r'$89', + image: _image('backpack'), + brand: 'Peak Design', + rating: const PersonalizationProductRating(value: '4.6', reviews: 412), + oldPrice: r'$110', + discount: '-19%', + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '4', + name: 'Trail running jacket', + price: r'$175', + image: _image('jacket'), + brand: 'Salomon', + rating: const PersonalizationProductRating(value: '4.5', reviews: 77), + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '5', + name: 'Polarized sunglasses', + price: r'$120', + image: _image('sunglasses'), + brand: 'Oakley', + rating: const PersonalizationProductRating(value: '4.4', reviews: 305), + oldPrice: r'$150', + discount: '-20%', + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '6', + name: 'Insulated bottle 750 ml', + price: r'$35', + image: _image('bottle'), + brand: 'Hydro Flask', + rating: const PersonalizationProductRating(value: '4.9', reviews: 980), + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '7', + name: 'GPS running watch', + price: r'$449', + image: _image('watch'), + brand: 'Garmin', + rating: const PersonalizationProductRating(value: '4.7', reviews: 1532), + actionText: 'Add to cart', + ), + PersonalizationProduct( + id: '8', + name: 'Court sneakers', + price: r'$95', + image: _image('sneakers'), + brand: 'Adidas', + rating: const PersonalizationProductRating(value: '4.3', reviews: 64), + oldPrice: r'$120', + discount: '-21%', + actionText: 'Add to cart', + ), ]; extension on PersonalizationProduct { diff --git a/example/pubspec.lock b/example/pubspec.lock index 2da1309..628d132 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -81,6 +81,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" + url: "https://pub.dev" + source: hosted + version: "2.2.0" file: dependency: transitive description: @@ -120,6 +128,11 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -226,6 +239,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" patrol: dependency: "direct dev" description: @@ -289,6 +326,62 @@ packages: relative: true source: path version: "1.0.0" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf + url: "https://pub.dev" + source: hosted + version: "2.5.5" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53 + url: "https://pub.dev" + source: hosted + version: "2.4.23" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea" + url: "https://pub.dev" + source: hosted + version: "2.5.7" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -422,6 +515,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" xml: dependency: transitive description: From bfd52fa4f7eeddf1b04c19ef1c46e3446fee5bf5 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 22:11:10 +0400 Subject: [PATCH 19/79] fix(android): full search returns the server response whole MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit searchManager.searchFull hands back a data class, and whatever that class does not model is dropped before it reaches Dart — with the released native SDK that is the shop's facets in `filters`, the old price and the discount, so the results screen showed only price and brand filters while the server had sent 88 facets. The bridge is a JSON pipe, so full search now goes through the native SDK's raw search entry point and forwards the response as is; the parameters are the same, built on the legacy params class that entry point takes. Blank and instant search keep the typed managers: their models carry what the widgets read. --- .../Rees46FlutterSdkPlugin.kt | 81 ++++++++++++++++--- 1 file changed, 72 insertions(+), 9 deletions(-) diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index 7810710..1b487e2 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -28,6 +28,7 @@ import com.personalization.api.models.tracking.TrackingSource import com.personalization.api.models.tracking.TrackingSourceType import com.personalization.api.params.ProfileParams import com.personalization.api.params.SearchParams as NativeSearchParams +import com.personalization.SearchParams as LegacySearchParams import com.personalization.sdk.data.models.dto.notification.NotificationData import com.rees46.rees46_flutter_sdk.push.Rees46PushNotifier import com.rees46.rees46_flutter_sdk.push.Rees46ShopStore @@ -325,15 +326,25 @@ class Rees46FlutterSdkPlugin : return } try { - val params = buildSearchParams(paramsJson) - sdk(shopId).searchManager.searchFull( - query = query, - searchParams = params, - onSearchFull = { response -> - callback(Result.success(Gson().toJson(response))) - }, - onError = { code, message -> - callback(Result.failure(FlutterError("search_failed", message ?: "error $code", null))) + // The typed searchManager.searchFull hands back a data class, and whatever that class + // does not model (the shop's facets in `filters`, old price, discount…) is lost before + // it reaches Dart. The bridge is a JSON pipe, so it takes the raw response instead: + // the legacy search entry point returns the server JSON as is. Move to a raw variant of + // the search manager once the native SDK offers one. + val params = buildLegacySearchParams(paramsJson) + @Suppress("DEPRECATION") + sdk(shopId).search( + query, + LegacySearchParams.TYPE.FULL, + params, + object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + callback(Result.success(response?.toString() ?: "{}")) + } + + override fun onError(code: Int, msg: String?) { + callback(Result.failure(FlutterError("search_failed", msg ?: "error $code", null))) + } }, ) } catch (t: Throwable) { @@ -892,6 +903,58 @@ private fun buildSearchParams(paramsJson: String?): NativeSearchParams { return params } +/** + * The same parameters as [buildSearchParams], on the legacy params class the raw search entry + * point takes. Keys come from the current parameter enum — both implement the same interface — + * so the wire names stay identical. + */ +@Suppress("DEPRECATION") +private fun buildLegacySearchParams(paramsJson: String?): LegacySearchParams { + val params = LegacySearchParams() + if (paramsJson.isNullOrBlank()) return params + val json = JSONObject(paramsJson) + json.optInt("limit").takeIf { it > 0 } + ?.let { params.put(NativeSearchParams.Parameter.LIMIT, it) } + json.optInt("page").takeIf { it > 0 } + ?.let { params.put(NativeSearchParams.Parameter.PAGE, it) } + json.optInt("category_limit").takeIf { it > 0 } + ?.let { params.put(NativeSearchParams.Parameter.CATEGORY_LIMIT, it) } + json.optInt("brand_limit").takeIf { it > 0 } + ?.let { params.put(NativeSearchParams.Parameter.BRAND_LIMIT, it) } + json.optString("sort_by").takeIf { it.isNotEmpty() } + ?.let { params.put(NativeSearchParams.Parameter.SORT_BY, it) } + json.optString("sort_dir").takeIf { it.isNotEmpty() } + ?.let { params.put(NativeSearchParams.Parameter.SORT_DIR, it) } + json.optString("locations").takeIf { it.isNotEmpty() } + ?.let { params.put(NativeSearchParams.Parameter.LOCATIONS, it) } + json.optString("brands").takeIf { it.isNotEmpty() } + ?.let { params.put(NativeSearchParams.Parameter.BRANDS, it) } + if (json.has("price_min")) + params.put(NativeSearchParams.Parameter.PRICE_MIN, json.getDouble("price_min").toString()) + if (json.has("price_max")) + params.put(NativeSearchParams.Parameter.PRICE_MAX, json.getDouble("price_max").toString()) + jsonArrayToStringArray(json.optJSONArray("categories")) + ?.let { params.put(NativeSearchParams.Parameter.CATEGORIES, it) } + jsonArrayToStringArray(json.optJSONArray("excluded_brands")) + ?.let { params.put(NativeSearchParams.Parameter.EXCLUDED_BRANDS, it) } + jsonArrayToStringArray(json.optJSONArray("colors")) + ?.let { params.put(NativeSearchParams.Parameter.COLORS, it) } + jsonArrayToStringArray(json.optJSONArray("fashion_sizes")) + ?.let { params.put(NativeSearchParams.Parameter.FASHION_SIZES, it) } + json.optJSONObject("filters")?.let { facets -> + val searchFilters = NativeSearchParams.SearchFilters() + var any = false + facets.keys().forEach { name -> + jsonArrayToStringArray(facets.optJSONArray(name))?.let { + searchFilters.put(name, it) + any = true + } + } + if (any) params.put(NativeSearchParams.Parameter.FILTERS, searchFilters.toString()) + } + return params +} + private fun jsonArrayToStringArray(arr: org.json.JSONArray?): Array? { if (arr == null || arr.length() == 0) return null return Array(arr.length()) { i -> arr.getString(i) } From 7bdd4a342277e4d6d4c628dac8a955d597df957f Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 16 Sep 2026 22:28:23 +0400 Subject: [PATCH 20/79] feat(ui): price bounds as placeholders in the search filters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The full search response carries price_range, but the filters screen only used it to decide whether to show the price section — the From / to fields stayed empty. The range section now takes fromPlaceholder / toPlaceholder, and the results screen fills them with the bounds, so the user sees the limits while the request carries only what they typed: prefilled values would have sent price_min / price_max on every Apply and shown a price tag as if a filter were applied. --- lib/src/ui/components/personalization_filters.dart | 8 ++++++++ .../widgets/personalization_search_results_screen.dart | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/lib/src/ui/components/personalization_filters.dart b/lib/src/ui/components/personalization_filters.dart index 4175312..92707af 100644 --- a/lib/src/ui/components/personalization_filters.dart +++ b/lib/src/ui/components/personalization_filters.dart @@ -41,6 +41,7 @@ sealed class PersonalizationFilterSection { } /// Два поля «от — до». [select] — поля типа Select, список открывает хост. +/// [fromPlaceholder] / [toPlaceholder] — подсказки в пустых полях, например границы диапазона. class PersonalizationFilterRange extends PersonalizationFilterSection { const PersonalizationFilterRange({ required super.id, @@ -50,6 +51,8 @@ class PersonalizationFilterRange extends PersonalizationFilterSection { this.from, this.to, this.select = false, + this.fromPlaceholder, + this.toPlaceholder, }); final String fromLabel; @@ -57,6 +60,8 @@ class PersonalizationFilterRange extends PersonalizationFilterSection { final String? from; final String? to; final bool select; + final String? fromPlaceholder; + final String? toPlaceholder; PersonalizationFilterRange copyWith({String? from, String? to}) => PersonalizationFilterRange( @@ -67,6 +72,8 @@ class PersonalizationFilterRange extends PersonalizationFilterSection { from: from ?? this.from, to: to ?? this.to, select: select, + fromPlaceholder: fromPlaceholder, + toPlaceholder: toPlaceholder, ); } @@ -231,6 +238,7 @@ class _PersonalizationFiltersState extends State { return Expanded( child: PersonalizationInputField( controller: controller, + placeholder: isFrom ? section.fromPlaceholder : section.toPlaceholder, size: PersonalizationInputFieldSize.md, type: section.select ? PersonalizationInputFieldType.select diff --git a/lib/src/ui/widgets/personalization_search_results_screen.dart b/lib/src/ui/widgets/personalization_search_results_screen.dart index cc248b1..e672eaf 100644 --- a/lib/src/ui/widgets/personalization_search_results_screen.dart +++ b/lib/src/ui/widgets/personalization_search_results_screen.dart @@ -394,6 +394,8 @@ class _PersonalizationSearchResultsScreenState if (source?.priceRange != null || applied.priceMin != null || applied.priceMax != null) { + // Границы диапазона — подсказками: в запрос уходит только то, что ввёл пользователь. + final range = source?.priceRange; sections.add( PersonalizationFilterRange( id: _sectionPrice, @@ -402,6 +404,8 @@ class _PersonalizationSearchResultsScreenState toLabel: widget.toLabel, from: applied.priceMin, to: applied.priceMax, + fromPlaceholder: range == null ? null : _bound(range.min), + toPlaceholder: range == null ? null : _bound(range.max), ), ); } @@ -463,6 +467,11 @@ class _PersonalizationSearchResultsScreenState return sections; } + /// Граница цены без хвоста «.0»: сервер отдаёт число, форматированной строки у него нет. + static String _bound(double value) => value == value.floorToDouble() + ? value.toInt().toString() + : value.toString(); + PersonalizationSearchApplied _fromSections( List sections, ) { From c80939a28382e667cd28abd9b201a14183038507 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 18 Sep 2026 22:02:01 +0400 Subject: [PATCH 21/79] style(ui): dart format the card, list, catalogue, theme and the example pane --- example/lib/main.dart | 8 +- .../personalization_product_card.dart | 278 ++++++++++++------ .../personalization_products_list.dart | 39 ++- lib/src/ui/personalization_theme.dart | 73 +++-- 4 files changed, 269 insertions(+), 129 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 26d325d..d8ad638 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -730,7 +730,9 @@ class _InitPageState extends State { tooltip: 'UI Kit', icon: const Icon(Icons.widgets_outlined), onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => const UiKitPane(shopId: _shopId)), + MaterialPageRoute( + builder: (_) => const UiKitPane(shopId: _shopId), + ), ), ), IconButton( @@ -774,7 +776,9 @@ class _InitPageState extends State { FilledButton.tonalIcon( key: const Key('open-ui-kit-button'), onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => const UiKitPane(shopId: _shopId)), + MaterialPageRoute( + builder: (_) => const UiKitPane(shopId: _shopId), + ), ), icon: const Icon(Icons.widgets_outlined), label: const Text('Open UI Kit (components and blocks)'), diff --git a/lib/src/ui/components/personalization_product_card.dart b/lib/src/ui/components/personalization_product_card.dart index d55dc06..ed7656d 100644 --- a/lib/src/ui/components/personalization_product_card.dart +++ b/lib/src/ui/components/personalization_product_card.dart @@ -11,7 +11,10 @@ enum PersonalizationProductCardType { carousel, grid, list } /// Оценка товара для карточки. class PersonalizationProductRating { - const PersonalizationProductRating({required this.value, required this.reviews}); + const PersonalizationProductRating({ + required this.value, + required this.reviews, + }); /// Уже отформатированная оценка: в макете «4,7» с запятой. final String value; @@ -77,7 +80,8 @@ class PersonalizationProductCard extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -85,49 +89,76 @@ class PersonalizationProductCard extends StatelessWidget { final colors = theme.colors; final metrics = _metrics[type]!; - TextStyle style(double fontSize, double lineHeight, double letterSpacing, FontWeight weight, Color color) => - TextStyle( - fontFamily: theme.fontFamily.familyFor(weight), - package: theme.fontFamily.package, - fontSize: fontSize, - height: lineHeight / fontSize, - letterSpacing: letterSpacing, - fontWeight: weight, - color: color, - ); + TextStyle style( + double fontSize, + double lineHeight, + double letterSpacing, + FontWeight weight, + Color color, + ) => TextStyle( + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + fontSize: fontSize, + height: lineHeight / fontSize, + letterSpacing: letterSpacing, + fontWeight: weight, + color: color, + ); Widget nameBlock(double gap) => Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - if (brand != null && brand!.isNotEmpty) ...[ - Text(brand!, style: style(12, 16, 0.05, FontWeight.w400, colors.textSecondary)), - SizedBox(height: gap), - ], - Text( - name, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: style(metrics.nameSize, metrics.nameLineHeight, metrics.nameLetterSpacing, - FontWeight.w400, colors.textPrimary), - ), - ], - ); + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + if (brand != null && brand!.isNotEmpty) ...[ + Text( + brand!, + style: style(12, 16, 0.05, FontWeight.w400, colors.textSecondary), + ), + SizedBox(height: gap), + ], + Text( + name, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: style( + metrics.nameSize, + metrics.nameLineHeight, + metrics.nameLetterSpacing, + FontWeight.w400, + colors.textPrimary, + ), + ), + ], + ); final Widget? ratingRow = rating == null ? null - : PersonalizationRating(value: rating!.value, reviews: rating!.reviews, iconBuilder: iconBuilder); + : PersonalizationRating( + value: rating!.value, + reviews: rating!.reviews, + iconBuilder: iconBuilder, + ); final Widget priceText = Text( price, - style: style(metrics.priceSize, metrics.priceLineHeight, 0, FontWeight.w600, colors.textPrimary), + style: style( + metrics.priceSize, + metrics.priceLineHeight, + 0, + FontWeight.w600, + colors.textPrimary, + ), ); final Widget? oldPriceText = oldPrice == null ? null : Text( oldPrice!, - style: style(metrics.oldPriceSize, metrics.oldPriceLineHeight, metrics.oldPriceLetterSpacing, - FontWeight.w400, colors.textHint) - .copyWith(decoration: TextDecoration.lineThrough), + style: style( + metrics.oldPriceSize, + metrics.oldPriceLineHeight, + metrics.oldPriceLetterSpacing, + FontWeight.w400, + colors.textHint, + ).copyWith(decoration: TextDecoration.lineThrough), ); final Widget? discountBadge = discount == null ? null @@ -149,52 +180,66 @@ class PersonalizationProductCard extends StatelessWidget { // цена с кнопкой снизу. Высота строки — большее из картинки и текста, поэтому // IntrinsicHeight: колонка тянется до картинки, а низкая картинка её не сжимает. if (type == PersonalizationProductCardType.list) { - return _tappable(IntrinsicHeight( - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - SizedBox(width: 120, child: PersonalizationProductImage(image: image, aspect: imageAspect)), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - nameBlock(2), - if (ratingRow != null) ...[const SizedBox(height: 4), ratingRow], - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - children: [ - priceText, - if (discountBadge != null) ...[const SizedBox(width: 8), discountBadge], - ], - ), - ?oldPriceText, + return _tappable( + IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + SizedBox( + width: 120, + child: PersonalizationProductImage( + image: image, + aspect: imageAspect, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + nameBlock(2), + if (ratingRow != null) ...[ + const SizedBox(height: 4), + ratingRow, ], - ), - ?action, - ], - ), - ], + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + children: [ + priceText, + if (discountBadge != null) ...[ + const SizedBox(width: 8), + discountBadge, + ], + ], + ), + ?oldPriceText, + ], + ), + ?action, + ], + ), + ], + ), ), - ), - ], + ], + ), ), - )); + ); } // Carousel и Grid: картинка, название, рейтинг, цена, кнопка — колонкой с шагом 8. @@ -207,32 +252,48 @@ class PersonalizationProductCard extends StatelessWidget { children: [ PersonalizationProductImage(image: image, aspect: imageAspect), if (discountBadge != null) - Positioned(top: metrics.badgeInset, right: metrics.badgeInset, child: discountBadge), + Positioned( + top: metrics.badgeInset, + right: metrics.badgeInset, + child: discountBadge, + ), ], ), const SizedBox(height: 8), nameBlock(2), - if (ratingRow != null) ...[const SizedBox(height: 8), ratingRow], + if (ratingRow != null) ...[ + const SizedBox(height: 8), + ratingRow, + ], const SizedBox(height: 8), Row( crossAxisAlignment: CrossAxisAlignment.baseline, textBaseline: TextBaseline.alphabetic, children: [ priceText, - if (oldPriceText != null) ...[const SizedBox(width: 8), oldPriceText], + if (oldPriceText != null) ...[ + const SizedBox(width: 8), + oldPriceText, + ], ], ), if (action != null) ...[const SizedBox(height: 8), action], ], ); return _tappable( - type == PersonalizationProductCardType.carousel ? SizedBox(width: 220, child: column) : column, + type == PersonalizationProductCardType.carousel + ? SizedBox(width: 220, child: column) + : column, ); } Widget _tappable(Widget child) => onTap == null ? child - : GestureDetector(behavior: HitTestBehavior.opaque, onTap: onTap, child: child); + : GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: onTap, + child: child, + ); } class _CardMetrics { @@ -248,19 +309,50 @@ class _CardMetrics { required this.badgeInset, }); - final double nameSize, nameLineHeight, nameLetterSpacing, priceSize, priceLineHeight; - final double oldPriceSize, oldPriceLineHeight, oldPriceLetterSpacing, badgeInset; + final double nameSize, + nameLineHeight, + nameLetterSpacing, + priceSize, + priceLineHeight; + final double oldPriceSize, + oldPriceLineHeight, + oldPriceLetterSpacing, + badgeInset; } const Map _metrics = { - PersonalizationProductCardType.carousel: _CardMetrics( - nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 20, priceLineHeight: 32, - oldPriceSize: 16, oldPriceLineHeight: 24, oldPriceLetterSpacing: 0, badgeInset: 8), - PersonalizationProductCardType.grid: _CardMetrics( - nameSize: 16, nameLineHeight: 24, nameLetterSpacing: 0, priceSize: 18, priceLineHeight: 28, - oldPriceSize: 14, oldPriceLineHeight: 20, oldPriceLetterSpacing: 0.05, badgeInset: 4), - PersonalizationProductCardType.list: _CardMetrics( - nameSize: 14, nameLineHeight: 20, nameLetterSpacing: 0.05, priceSize: 16, priceLineHeight: 24, - oldPriceSize: 14, oldPriceLineHeight: 20, oldPriceLetterSpacing: 0.05, badgeInset: 0), -}; + PersonalizationProductCardType.carousel: _CardMetrics( + nameSize: 16, + nameLineHeight: 24, + nameLetterSpacing: 0, + priceSize: 20, + priceLineHeight: 32, + oldPriceSize: 16, + oldPriceLineHeight: 24, + oldPriceLetterSpacing: 0, + badgeInset: 8, + ), + PersonalizationProductCardType.grid: _CardMetrics( + nameSize: 16, + nameLineHeight: 24, + nameLetterSpacing: 0, + priceSize: 18, + priceLineHeight: 28, + oldPriceSize: 14, + oldPriceLineHeight: 20, + oldPriceLetterSpacing: 0.05, + badgeInset: 4, + ), + PersonalizationProductCardType.list: _CardMetrics( + nameSize: 14, + nameLineHeight: 20, + nameLetterSpacing: 0.05, + priceSize: 16, + priceLineHeight: 24, + oldPriceSize: 14, + oldPriceLineHeight: 20, + oldPriceLetterSpacing: 0.05, + badgeInset: 0, + ), + }; diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart index 943d29a..4cd2032 100644 --- a/lib/src/ui/components/personalization_products_list.dart +++ b/lib/src/ui/components/personalization_products_list.dart @@ -45,13 +45,16 @@ class PersonalizationProductsList extends StatefulWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override - State createState() => _PersonalizationProductsListState(); + State createState() => + _PersonalizationProductsListState(); } -class _PersonalizationProductsListState extends State { +class _PersonalizationProductsListState + extends State { final ScrollController _controller = ScrollController(); int _lastFirst = -1; @@ -75,14 +78,20 @@ class _PersonalizationProductsListState extends State widget.onProductAction!(product), - onTap: widget.onProductTap == null ? null : () => widget.onProductTap!(product), + onAction: widget.onProductAction == null + ? null + : () => widget.onProductAction!(product), + onTap: widget.onProductTap == null + ? null + : () => widget.onProductTap!(product), iconBuilder: widget.iconBuilder, ); } @@ -126,11 +139,19 @@ class _PersonalizationProductsListState extends State[ - Expanded(child: _card(products[row], PersonalizationProductCardType.grid)), + Expanded( + child: _card( + products[row], + PersonalizationProductCardType.grid, + ), + ), const SizedBox(width: _gap), Expanded( child: row + 1 < products.length - ? _card(products[row + 1], PersonalizationProductCardType.grid) + ? _card( + products[row + 1], + PersonalizationProductCardType.grid, + ) : const SizedBox.shrink(), ), ], diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart index d0d7a60..e15444f 100644 --- a/lib/src/ui/personalization_theme.dart +++ b/lib/src/ui/personalization_theme.dart @@ -9,7 +9,11 @@ import 'personalization_radius.dart'; /// Хост может подставить свой, в том числе из другого пакета. @immutable class PersonalizationFontFamily { - const PersonalizationFontFamily({this.regular, this.emphasized, this.package}); + const PersonalizationFontFamily({ + this.regular, + this.emphasized, + this.package, + }); /// Семейство для FontWeight.w400. `null` — системный. final String? regular; @@ -30,8 +34,22 @@ class PersonalizationFontFamily { /// Ступень шкалы радиусов. Нужна там, где компонент держит метрики в `const` /// таблице и не может обратиться к теме на уровне файла. enum PersonalizationRadiusToken { - xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded, - buttonLg, buttonMd, buttonSm, segmentedMd, segmentedSm, + xs, + sm, + md, + lg, + xl, + xl2, + xl3, + xl4, + xl5, + xl6, + rounded, + buttonLg, + buttonMd, + buttonSm, + segmentedMd, + segmentedSm, } /// Радиусы темы. Значения по умолчанию — шкала из макета. @@ -63,23 +81,23 @@ class PersonalizationRadiusScale { /// Значение ступени из действующей темы. double resolve(PersonalizationRadiusToken token) => switch (token) { - PersonalizationRadiusToken.xs => xs, - PersonalizationRadiusToken.sm => sm, - PersonalizationRadiusToken.md => md, - PersonalizationRadiusToken.lg => lg, - PersonalizationRadiusToken.xl => xl, - PersonalizationRadiusToken.xl2 => xl2, - PersonalizationRadiusToken.xl3 => xl3, - PersonalizationRadiusToken.xl4 => xl4, - PersonalizationRadiusToken.xl5 => xl5, - PersonalizationRadiusToken.xl6 => xl6, - PersonalizationRadiusToken.rounded => rounded, - PersonalizationRadiusToken.buttonLg => buttonLg, - PersonalizationRadiusToken.buttonMd => buttonMd, - PersonalizationRadiusToken.buttonSm => buttonSm, - PersonalizationRadiusToken.segmentedMd => segmentedMd, - PersonalizationRadiusToken.segmentedSm => segmentedSm, - }; + PersonalizationRadiusToken.xs => xs, + PersonalizationRadiusToken.sm => sm, + PersonalizationRadiusToken.md => md, + PersonalizationRadiusToken.lg => lg, + PersonalizationRadiusToken.xl => xl, + PersonalizationRadiusToken.xl2 => xl2, + PersonalizationRadiusToken.xl3 => xl3, + PersonalizationRadiusToken.xl4 => xl4, + PersonalizationRadiusToken.xl5 => xl5, + PersonalizationRadiusToken.xl6 => xl6, + PersonalizationRadiusToken.rounded => rounded, + PersonalizationRadiusToken.buttonLg => buttonLg, + PersonalizationRadiusToken.buttonMd => buttonMd, + PersonalizationRadiusToken.buttonSm => buttonSm, + PersonalizationRadiusToken.segmentedMd => segmentedMd, + PersonalizationRadiusToken.segmentedSm => segmentedSm, + }; PersonalizationRadiusScale lerp(PersonalizationRadiusScale other, double t) => PersonalizationRadiusScale( @@ -141,11 +159,13 @@ class PersonalizationTheme extends ThemeExtension { final PersonalizationRadiusScale radius; final PersonalizationFontFamily fontFamily; - static const PersonalizationTheme light = - PersonalizationTheme(colors: PersonalizationColors.light); + static const PersonalizationTheme light = PersonalizationTheme( + colors: PersonalizationColors.light, + ); - static const PersonalizationTheme dark = - PersonalizationTheme(colors: PersonalizationColors.dark); + static const PersonalizationTheme dark = PersonalizationTheme( + colors: PersonalizationColors.dark, + ); /// Тема из контекста. Расширение не подключено — берётся светлая по умолчанию, /// поэтому компоненты работают и у хоста, которому тема не нужна. @@ -166,7 +186,10 @@ class PersonalizationTheme extends ThemeExtension { } @override - PersonalizationTheme lerp(ThemeExtension? other, double t) { + PersonalizationTheme lerp( + ThemeExtension? other, + double t, + ) { if (other is! PersonalizationTheme) return this; return PersonalizationTheme( colors: colors.lerp(other.colors, t), From 1cee01daecfb26fd3f009ff81f04357d03c9586f Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 18 Sep 2026 22:20:46 +0400 Subject: [PATCH 22/79] style(ui): dart format the remaining design system files --- .../components/personalization_accordion.dart | 13 ++- .../ui/components/personalization_badge.dart | 27 ++++- .../ui/components/personalization_button.dart | 93 +++++++++------- .../personalization_button_group.dart | 23 ++-- .../components/personalization_checkbox.dart | 4 +- .../personalization_favorites_badge.dart | 8 +- .../personalization_input_field.dart | 85 +++++++------- .../personalization_product_image.dart | 8 +- .../ui/components/personalization_rating.dart | 8 +- .../personalization_recommender_block.dart | 23 +++- .../personalization_search_results_title.dart | 21 ++-- .../personalization_suggestion_row.dart | 53 ++++++--- lib/src/ui/personalization_colors.dart | 105 ++++++++++++++---- lib/src/ui/personalization_elevation.dart | 5 + lib/src/ui/personalization_icons.dart | 36 ++++-- lib/src/ui/personalization_radius.dart | 10 ++ lib/src/ui/personalization_spacing.dart | 8 ++ lib/src/ui/personalization_typography.dart | 3 +- 18 files changed, 362 insertions(+), 171 deletions(-) diff --git a/lib/src/ui/components/personalization_accordion.dart b/lib/src/ui/components/personalization_accordion.dart index 6b8fc55..31692bb 100644 --- a/lib/src/ui/components/personalization_accordion.dart +++ b/lib/src/ui/components/personalization_accordion.dart @@ -32,7 +32,8 @@ class PersonalizationAccordion extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -47,8 +48,9 @@ class PersonalizationAccordion extends StatelessWidget { package: theme.fontFamily.package, color: colors.textPrimary, ); - final asset = - expanded ? PersonalizationIcons.angleUp : PersonalizationIcons.angleDown; + final asset = expanded + ? PersonalizationIcons.angleUp + : PersonalizationIcons.angleDown; return GestureDetector( onTap: onToggle == null ? null : () => onToggle!(!expanded), @@ -59,7 +61,10 @@ class PersonalizationAccordion extends StatelessWidget { Text(label, style: style), if (count != null) ...[ const SizedBox(width: 4), - Text('($count)', style: style.copyWith(color: colors.textSecondary)), + Text( + '($count)', + style: style.copyWith(color: colors.textSecondary), + ), ], const SizedBox(width: 4), SizedBox( diff --git a/lib/src/ui/components/personalization_badge.dart b/lib/src/ui/components/personalization_badge.dart index 24605b1..44cd255 100644 --- a/lib/src/ui/components/personalization_badge.dart +++ b/lib/src/ui/components/personalization_badge.dart @@ -32,12 +32,27 @@ class PersonalizationBadge extends StatelessWidget { final theme = PersonalizationTheme.of(context); final colors = theme.colors; final (padH, padV, radius, fontSize, lineHeight) = switch (size) { - PersonalizationBadgeSize.lg => - (12.0, 8.0, PersonalizationRadiusToken.buttonLg, 20.0, 24.0), - PersonalizationBadgeSize.md => - (8.0, 4.0, PersonalizationRadiusToken.buttonMd, 16.0, 20.0), - PersonalizationBadgeSize.sm => - (4.0, 2.0, PersonalizationRadiusToken.buttonSm, 14.0, 16.0), + PersonalizationBadgeSize.lg => ( + 12.0, + 8.0, + PersonalizationRadiusToken.buttonLg, + 20.0, + 24.0, + ), + PersonalizationBadgeSize.md => ( + 8.0, + 4.0, + PersonalizationRadiusToken.buttonMd, + 16.0, + 20.0, + ), + PersonalizationBadgeSize.sm => ( + 4.0, + 2.0, + PersonalizationRadiusToken.buttonSm, + 14.0, + 16.0, + ), }; return Container( diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart index f0f92a2..b5592ca 100644 --- a/lib/src/ui/components/personalization_button.dart +++ b/lib/src/ui/components/personalization_button.dart @@ -51,7 +51,8 @@ class PersonalizationButton extends StatefulWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override State createState() => _PersonalizationButtonState(); @@ -72,7 +73,8 @@ class _PersonalizationButtonState extends State { final foreground = _foreground(colors); final children = [ - if (widget.iconStart != null) _icon(context, widget.iconStart!, metrics, foreground), + if (widget.iconStart != null) + _icon(context, widget.iconStart!, metrics, foreground), if (_hasText) Text( widget.label!, @@ -87,7 +89,8 @@ class _PersonalizationButtonState extends State { color: foreground, ), ), - if (widget.iconEnd != null) _icon(context, widget.iconEnd!, metrics, foreground), + if (widget.iconEnd != null) + _icon(context, widget.iconEnd!, metrics, foreground), ]; return GestureDetector( @@ -99,7 +102,9 @@ class _PersonalizationButtonState extends State { padding: _padding(metrics), decoration: BoxDecoration( color: _background(colors), - borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), + borderRadius: BorderRadius.circular( + theme.radius.resolve(metrics.radius), + ), ), child: Row( mainAxisSize: MainAxisSize.min, @@ -138,8 +143,12 @@ class _PersonalizationButtonState extends State { ); } return EdgeInsets.only( - left: widget.iconStart != null ? metrics.paddingNarrow : metrics.paddingWide, - right: widget.iconEnd != null ? metrics.paddingNarrow : metrics.paddingWide, + left: widget.iconStart != null + ? metrics.paddingNarrow + : metrics.paddingWide, + right: widget.iconEnd != null + ? metrics.paddingNarrow + : metrics.paddingWide, top: metrics.paddingVertical, bottom: metrics.paddingVertical, ); @@ -214,39 +223,39 @@ class _ButtonMetrics { const Map _metrics = { - PersonalizationButtonSize.lg: _ButtonMetrics( - fontSize: 20, - lineHeight: 32, - letterSpacing: 0, - radius: PersonalizationRadiusToken.buttonLg, - paddingVertical: 8, - paddingWide: 24, - paddingNarrow: 16, - paddingIconOnly: 12, - iconSize: 32, - ), - PersonalizationButtonSize.md: _ButtonMetrics( - fontSize: 16, - lineHeight: 24, - letterSpacing: 0, - radius: PersonalizationRadiusToken.buttonMd, - paddingVertical: 8, - paddingWide: 16, - paddingNarrow: 12, - paddingIconOnly: 8, - iconSize: 24, - ), - // SM берёт кегль со ступени sm, а интерлиньяж со ступени base: - // в макете 14/24, тогда как ступень sm — это 14/20. - PersonalizationButtonSize.sm: _ButtonMetrics( - fontSize: 14, - lineHeight: 24, - letterSpacing: 0.05, - radius: PersonalizationRadiusToken.buttonSm, - paddingVertical: 4, - paddingWide: 12, - paddingNarrow: 8, - paddingIconOnly: 4, - iconSize: 20, - ), -}; + PersonalizationButtonSize.lg: _ButtonMetrics( + fontSize: 20, + lineHeight: 32, + letterSpacing: 0, + radius: PersonalizationRadiusToken.buttonLg, + paddingVertical: 8, + paddingWide: 24, + paddingNarrow: 16, + paddingIconOnly: 12, + iconSize: 32, + ), + PersonalizationButtonSize.md: _ButtonMetrics( + fontSize: 16, + lineHeight: 24, + letterSpacing: 0, + radius: PersonalizationRadiusToken.buttonMd, + paddingVertical: 8, + paddingWide: 16, + paddingNarrow: 12, + paddingIconOnly: 8, + iconSize: 24, + ), + // SM берёт кегль со ступени sm, а интерлиньяж со ступени base: + // в макете 14/24, тогда как ступень sm — это 14/20. + PersonalizationButtonSize.sm: _ButtonMetrics( + fontSize: 14, + lineHeight: 24, + letterSpacing: 0.05, + radius: PersonalizationRadiusToken.buttonSm, + paddingVertical: 4, + paddingWide: 12, + paddingNarrow: 8, + paddingIconOnly: 4, + iconSize: 20, + ), + }; diff --git a/lib/src/ui/components/personalization_button_group.dart b/lib/src/ui/components/personalization_button_group.dart index 31d9e06..062b769 100644 --- a/lib/src/ui/components/personalization_button_group.dart +++ b/lib/src/ui/components/personalization_button_group.dart @@ -47,7 +47,8 @@ class PersonalizationButtonGroup extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -97,7 +98,9 @@ class PersonalizationButtonGroup extends StatelessWidget { alignment: Alignment.center, decoration: BoxDecoration( color: active ? colors.buttonPrimary : colors.backgroundTransparent, - borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), + borderRadius: BorderRadius.circular( + theme.radius.resolve(metrics.radius), + ), ), child: SizedBox( width: metrics.iconSize, @@ -125,8 +128,14 @@ class _GroupMetrics { const Map _groupMetrics = { - PersonalizationButtonGroupSize.md: - _GroupMetrics(radius: PersonalizationRadiusToken.segmentedMd, padding: 6, iconSize: 24), - PersonalizationButtonGroupSize.sm: - _GroupMetrics(radius: PersonalizationRadiusToken.segmentedSm, padding: 2, iconSize: 20), -}; + PersonalizationButtonGroupSize.md: _GroupMetrics( + radius: PersonalizationRadiusToken.segmentedMd, + padding: 6, + iconSize: 24, + ), + PersonalizationButtonGroupSize.sm: _GroupMetrics( + radius: PersonalizationRadiusToken.segmentedSm, + padding: 2, + iconSize: 20, + ), + }; diff --git a/lib/src/ui/components/personalization_checkbox.dart b/lib/src/ui/components/personalization_checkbox.dart index 100d82e..d8f9232 100644 --- a/lib/src/ui/components/personalization_checkbox.dart +++ b/lib/src/ui/components/personalization_checkbox.dart @@ -40,7 +40,9 @@ class PersonalizationCheckbox extends StatelessWidget { state: state, fill: isFilled ? (disabled ? colors.buttonPrimaryDisabled : colors.buttonPrimary) - : (disabled ? colors.backgroundInputDisabled : colors.backgroundInput), + : (disabled + ? colors.backgroundInputDisabled + : colors.backgroundInput), border: isFilled ? null : colors.lineInput, glyph: colors.textLightPrimary, radius: theme.radius.resolve(PersonalizationRadiusToken.sm), diff --git a/lib/src/ui/components/personalization_favorites_badge.dart b/lib/src/ui/components/personalization_favorites_badge.dart index d5325cf..a849f31 100644 --- a/lib/src/ui/components/personalization_favorites_badge.dart +++ b/lib/src/ui/components/personalization_favorites_badge.dart @@ -14,7 +14,8 @@ class PersonalizationFavoritesBadge extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -24,7 +25,10 @@ class PersonalizationFavoritesBadge extends StatelessWidget { width: 24, height: 24, padding: const EdgeInsets.all(4), - decoration: BoxDecoration(shape: BoxShape.circle, color: colors.semanticWarning), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: colors.semanticWarning, + ), child: iconBuilder?.call( context, PersonalizationIcons.starFill, diff --git a/lib/src/ui/components/personalization_input_field.dart b/lib/src/ui/components/personalization_input_field.dart index 539655e..a274e2a 100644 --- a/lib/src/ui/components/personalization_input_field.dart +++ b/lib/src/ui/components/personalization_input_field.dart @@ -71,10 +71,12 @@ class PersonalizationInputField extends StatefulWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override - State createState() => _PersonalizationInputFieldState(); + State createState() => + _PersonalizationInputFieldState(); } class _PersonalizationInputFieldState extends State { @@ -111,8 +113,9 @@ class _PersonalizationInputFieldState extends State { final colors = theme.colors; final metrics = _inputMetrics[widget.size]!; final filled = _controller.text.isNotEmpty; - final foreground = - filled && widget.enabled ? colors.textPrimary : colors.textHint; + final foreground = filled && widget.enabled + ? colors.textPrimary + : colors.textHint; final style = TextStyle( fontSize: metrics.fontSize, @@ -138,10 +141,16 @@ class _PersonalizationInputFieldState extends State { final field = Container( padding: _padding(metrics), decoration: BoxDecoration( - color: widget.enabled ? colors.backgroundInput : colors.backgroundInputDisabled, - borderRadius: BorderRadius.circular(theme.radius.resolve(metrics.radius)), + color: widget.enabled + ? colors.backgroundInput + : colors.backgroundInputDisabled, + borderRadius: BorderRadius.circular( + theme.radius.resolve(metrics.radius), + ), border: Border.all( - color: _focused && widget.enabled ? colors.lineInputFocus : colors.lineInput, + color: _focused && widget.enabled + ? colors.lineInputFocus + : colors.lineInput, width: _border, ), ), @@ -283,34 +292,34 @@ class _InputMetrics { // тогда как ступень lg — это 18/28. SM так же смешан: 14/24 против 14/20. const Map _inputMetrics = { - PersonalizationInputFieldSize.lg: _InputMetrics( - fontSize: 18, - lineHeight: 32, - letterSpacing: 0, - radius: PersonalizationRadiusToken.buttonLg, - paddingVertical: 12, - paddingInput: 16, - paddingSelectStart: 16, - iconSize: 32, - ), - PersonalizationInputFieldSize.md: _InputMetrics( - fontSize: 16, - lineHeight: 24, - letterSpacing: 0, - radius: PersonalizationRadiusToken.buttonMd, - paddingVertical: 8, - paddingInput: 12, - paddingSelectStart: 12, - iconSize: 24, - ), - PersonalizationInputFieldSize.sm: _InputMetrics( - fontSize: 14, - lineHeight: 24, - letterSpacing: 0.05, - radius: PersonalizationRadiusToken.buttonSm, - paddingVertical: 4, - paddingInput: 12, - paddingSelectStart: 8, - iconSize: 24, - ), -}; + PersonalizationInputFieldSize.lg: _InputMetrics( + fontSize: 18, + lineHeight: 32, + letterSpacing: 0, + radius: PersonalizationRadiusToken.buttonLg, + paddingVertical: 12, + paddingInput: 16, + paddingSelectStart: 16, + iconSize: 32, + ), + PersonalizationInputFieldSize.md: _InputMetrics( + fontSize: 16, + lineHeight: 24, + letterSpacing: 0, + radius: PersonalizationRadiusToken.buttonMd, + paddingVertical: 8, + paddingInput: 12, + paddingSelectStart: 12, + iconSize: 24, + ), + PersonalizationInputFieldSize.sm: _InputMetrics( + fontSize: 14, + lineHeight: 24, + letterSpacing: 0.05, + radius: PersonalizationRadiusToken.buttonSm, + paddingVertical: 4, + paddingInput: 12, + paddingSelectStart: 8, + iconSize: 24, + ), + }; diff --git a/lib/src/ui/components/personalization_product_image.dart b/lib/src/ui/components/personalization_product_image.dart index e75b034..a8910e6 100644 --- a/lib/src/ui/components/personalization_product_image.dart +++ b/lib/src/ui/components/personalization_product_image.dart @@ -24,10 +24,10 @@ class PersonalizationProductImage extends StatelessWidget { final PersonalizationProductImageAspect aspect; double get _ratio => switch (aspect) { - PersonalizationProductImageAspect.square => 1, - PersonalizationProductImageAspect.landscape => 4 / 3, - PersonalizationProductImageAspect.portrait => 3 / 4, - }; + PersonalizationProductImageAspect.square => 1, + PersonalizationProductImageAspect.landscape => 4 / 3, + PersonalizationProductImageAspect.portrait => 3 / 4, + }; @override Widget build(BuildContext context) { diff --git a/lib/src/ui/components/personalization_rating.dart b/lib/src/ui/components/personalization_rating.dart index 39fc3a8..ce28a21 100644 --- a/lib/src/ui/components/personalization_rating.dart +++ b/lib/src/ui/components/personalization_rating.dart @@ -30,7 +30,8 @@ class PersonalizationRating extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -46,8 +47,9 @@ class PersonalizationRating extends StatelessWidget { package: theme.fontFamily.package, color: colors.textHint, ); - final Color starColor = - reviews > 0 ? colors.semanticWarning : colors.lineGeneric; + final Color starColor = reviews > 0 + ? colors.semanticWarning + : colors.lineGeneric; return Padding( padding: const EdgeInsets.only(bottom: 4), diff --git a/lib/src/ui/components/personalization_recommender_block.dart b/lib/src/ui/components/personalization_recommender_block.dart index da1a029..fa86501 100644 --- a/lib/src/ui/components/personalization_recommender_block.dart +++ b/lib/src/ui/components/personalization_recommender_block.dart @@ -56,20 +56,26 @@ class PersonalizationRecommenderBlock extends StatefulWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override - State createState() => _PersonalizationRecommenderBlockState(); + State createState() => + _PersonalizationRecommenderBlockState(); } -class _PersonalizationRecommenderBlockState extends State { +class _PersonalizationRecommenderBlockState + extends State { int _page = 0; @override Widget build(BuildContext context) { final carousel = widget.layout == PersonalizationProductsLayout.carousel; final double gap = carousel ? 16 : 12; - final bool showAll = carousel && widget.showAllText != null && widget.showAllText!.isNotEmpty; + final bool showAll = + carousel && + widget.showAllText != null && + widget.showAllText!.isNotEmpty; return Column( crossAxisAlignment: CrossAxisAlignment.stretch, @@ -95,12 +101,17 @@ class _PersonalizationRecommenderBlockState extends State setState(() => _page = index) : null, + onFirstVisibleChanged: carousel + ? (int index) => setState(() => _page = index) + : null, iconBuilder: widget.iconBuilder, ), if (carousel && widget.showDots) ...[ SizedBox(height: gap), - PersonalizationDots(count: widget.products.length, selectedIndex: _page), + PersonalizationDots( + count: widget.products.length, + selectedIndex: _page, + ), ], ], ); diff --git a/lib/src/ui/components/personalization_search_results_title.dart b/lib/src/ui/components/personalization_search_results_title.dart index 72dd505..8233567 100644 --- a/lib/src/ui/components/personalization_search_results_title.dart +++ b/lib/src/ui/components/personalization_search_results_title.dart @@ -9,7 +9,10 @@ import 'personalization_title.dart'; /// Применённый фильтр: подпись и снятие по крестику. class PersonalizationSearchFilter { - const PersonalizationSearchFilter({required this.label, required this.onRemove}); + const PersonalizationSearchFilter({ + required this.label, + required this.onRemove, + }); final String label; final VoidCallback onRemove; @@ -74,7 +77,8 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -142,7 +146,8 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { iconBuilder: iconBuilder, onPressed: onSort, ), - if (showFiltersButton || showSortButton) const SizedBox(width: 12), + if (showFiltersButton || showSortButton) + const SizedBox(width: 12), Text(results!.prefix, style: regular), const SizedBox(width: 4), Text('${results!.count}', style: strong), @@ -165,11 +170,11 @@ class PersonalizationSearchResultsTitle extends StatelessWidget { removeIconBuilder: iconBuilder == null ? null : (BuildContext context, String asset) => iconBuilder!( - context, - asset, - 16, - colors.textPrimary, - ), + context, + asset, + 16, + colors.textPrimary, + ), ), ], ), diff --git a/lib/src/ui/components/personalization_suggestion_row.dart b/lib/src/ui/components/personalization_suggestion_row.dart index 48b3af2..feddf16 100644 --- a/lib/src/ui/components/personalization_suggestion_row.dart +++ b/lib/src/ui/components/personalization_suggestion_row.dart @@ -45,7 +45,8 @@ class PersonalizationSuggestionRow extends StatelessWidget { String asset, double size, Color color, - )? iconBuilder; + )? + iconBuilder; @override Widget build(BuildContext context) { @@ -54,14 +55,14 @@ class PersonalizationSuggestionRow extends StatelessWidget { final category = kind == PersonalizationSuggestionKind.category; TextStyle style(FontWeight weight, Color color) => TextStyle( - fontFamily: theme.fontFamily.familyFor(weight), - package: theme.fontFamily.package, - fontSize: 14, - height: 20 / 14, - letterSpacing: 0.05, - fontWeight: weight, - color: color, - ); + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.05, + fontWeight: weight, + color: color, + ); final regular = style(FontWeight.w400, colors.textPrimary); final bold = style(FontWeight.w600, colors.textPrimary); @@ -69,7 +70,9 @@ class PersonalizationSuggestionRow extends StatelessWidget { onTap: onTap, behavior: HitTestBehavior.opaque, child: Row( - crossAxisAlignment: category ? CrossAxisAlignment.center : CrossAxisAlignment.start, + crossAxisAlignment: category + ? CrossAxisAlignment.center + : CrossAxisAlignment.start, children: [ if (showImage) ...[ SizedBox( @@ -77,7 +80,9 @@ class PersonalizationSuggestionRow extends StatelessWidget { height: 40, child: ColoredBox( color: colors.backgroundCard, - child: image == null ? null : Image(image: image!, fit: BoxFit.cover), + child: image == null + ? null + : Image(image: image!, fit: BoxFit.cover), ), ), const SizedBox(width: 10), @@ -87,14 +92,20 @@ class PersonalizationSuggestionRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - Text.rich(_highlighted(regular, bold), maxLines: 1, overflow: TextOverflow.ellipsis), + Text.rich( + _highlighted(regular, bold), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), if (showImage && subtitle != null && subtitle!.isNotEmpty) // У товара это цена полужирным, у категории — родитель серым. Text( subtitle!, maxLines: 1, overflow: TextOverflow.ellipsis, - style: category ? style(FontWeight.w400, colors.textHint) : bold, + style: category + ? style(FontWeight.w400, colors.textHint) + : bold, ), ], ), @@ -104,7 +115,12 @@ class PersonalizationSuggestionRow extends StatelessWidget { SizedBox( width: 24, height: 24, - child: iconBuilder?.call(context, PersonalizationIcons.angleLargeRight, 24, colors.textHint), + child: iconBuilder?.call( + context, + PersonalizationIcons.angleLargeRight, + 24, + colors.textHint, + ), ), ], ], @@ -114,13 +130,18 @@ class PersonalizationSuggestionRow extends StatelessWidget { TextSpan _highlighted(TextStyle regular, TextStyle bold) { final query = highlight ?? ''; - final index = query.isEmpty ? -1 : title.toLowerCase().indexOf(query.toLowerCase()); + final index = query.isEmpty + ? -1 + : title.toLowerCase().indexOf(query.toLowerCase()); if (index < 0) return TextSpan(text: title, style: regular); return TextSpan( style: regular, children: [ TextSpan(text: title.substring(0, index)), - TextSpan(text: title.substring(index, index + query.length), style: bold), + TextSpan( + text: title.substring(index, index + query.length), + style: bold, + ), TextSpan(text: title.substring(index + query.length)), ], ); diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index cc62067..6395033 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -216,14 +216,18 @@ class PersonalizationColors { backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, backgroundCard: backgroundCard ?? this.backgroundCard, backgroundInput: backgroundInput ?? this.backgroundInput, - backgroundTransparent: backgroundTransparent ?? this.backgroundTransparent, - backgroundInputDisabled: backgroundInputDisabled ?? this.backgroundInputDisabled, + backgroundTransparent: + backgroundTransparent ?? this.backgroundTransparent, + backgroundInputDisabled: + backgroundInputDisabled ?? this.backgroundInputDisabled, buttonPrimary: buttonPrimary ?? this.buttonPrimary, buttonPrimaryFocus: buttonPrimaryFocus ?? this.buttonPrimaryFocus, buttonSecondary: buttonSecondary ?? this.buttonSecondary, buttonSecondaryFocus: buttonSecondaryFocus ?? this.buttonSecondaryFocus, - buttonPrimaryDisabled: buttonPrimaryDisabled ?? this.buttonPrimaryDisabled, - buttonSecondaryDisabled: buttonSecondaryDisabled ?? this.buttonSecondaryDisabled, + buttonPrimaryDisabled: + buttonPrimaryDisabled ?? this.buttonPrimaryDisabled, + buttonSecondaryDisabled: + buttonSecondaryDisabled ?? this.buttonSecondaryDisabled, buttonGhost: buttonGhost ?? this.buttonGhost, lineBrand: lineBrand ?? this.lineBrand, lineGeneric: lineGeneric ?? this.lineGeneric, @@ -240,7 +244,8 @@ class PersonalizationColors { textLightSecondary: textLightSecondary ?? this.textLightSecondary, textLightHint: textLightHint ?? this.textLightHint, textInvertedPrimary: textInvertedPrimary ?? this.textInvertedPrimary, - textInvertedSecondary: textInvertedSecondary ?? this.textInvertedSecondary, + textInvertedSecondary: + textInvertedSecondary ?? this.textInvertedSecondary, textInvertedHint: textInvertedHint ?? this.textInvertedHint, textBrand: textBrand ?? this.textBrand, textLink: textLink ?? this.textLink, @@ -253,36 +258,96 @@ class PersonalizationColors { brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, semanticDanger: Color.lerp(semanticDanger, other.semanticDanger, t)!, - backgroundPrimary: Color.lerp(backgroundPrimary, other.backgroundPrimary, t)!, - backgroundGeneric: Color.lerp(backgroundGeneric, other.backgroundGeneric, t)!, + backgroundPrimary: Color.lerp( + backgroundPrimary, + other.backgroundPrimary, + t, + )!, + backgroundGeneric: Color.lerp( + backgroundGeneric, + other.backgroundGeneric, + t, + )!, backgroundCard: Color.lerp(backgroundCard, other.backgroundCard, t)!, backgroundInput: Color.lerp(backgroundInput, other.backgroundInput, t)!, - backgroundTransparent: Color.lerp(backgroundTransparent, other.backgroundTransparent, t)!, - backgroundInputDisabled: Color.lerp(backgroundInputDisabled, other.backgroundInputDisabled, t)!, + backgroundTransparent: Color.lerp( + backgroundTransparent, + other.backgroundTransparent, + t, + )!, + backgroundInputDisabled: Color.lerp( + backgroundInputDisabled, + other.backgroundInputDisabled, + t, + )!, buttonPrimary: Color.lerp(buttonPrimary, other.buttonPrimary, t)!, - buttonPrimaryFocus: Color.lerp(buttonPrimaryFocus, other.buttonPrimaryFocus, t)!, + buttonPrimaryFocus: Color.lerp( + buttonPrimaryFocus, + other.buttonPrimaryFocus, + t, + )!, buttonSecondary: Color.lerp(buttonSecondary, other.buttonSecondary, t)!, - buttonSecondaryFocus: Color.lerp(buttonSecondaryFocus, other.buttonSecondaryFocus, t)!, - buttonPrimaryDisabled: Color.lerp(buttonPrimaryDisabled, other.buttonPrimaryDisabled, t)!, - buttonSecondaryDisabled: Color.lerp(buttonSecondaryDisabled, other.buttonSecondaryDisabled, t)!, + buttonSecondaryFocus: Color.lerp( + buttonSecondaryFocus, + other.buttonSecondaryFocus, + t, + )!, + buttonPrimaryDisabled: Color.lerp( + buttonPrimaryDisabled, + other.buttonPrimaryDisabled, + t, + )!, + buttonSecondaryDisabled: Color.lerp( + buttonSecondaryDisabled, + other.buttonSecondaryDisabled, + t, + )!, buttonGhost: Color.lerp(buttonGhost, other.buttonGhost, t)!, lineBrand: Color.lerp(lineBrand, other.lineBrand, t)!, lineGeneric: Color.lerp(lineGeneric, other.lineGeneric, t)!, - lineGenericSubtle: Color.lerp(lineGenericSubtle, other.lineGenericSubtle, t)!, + lineGenericSubtle: Color.lerp( + lineGenericSubtle, + other.lineGenericSubtle, + t, + )!, lineInput: Color.lerp(lineInput, other.lineInput, t)!, lineInputFocus: Color.lerp(lineInputFocus, other.lineInputFocus, t)!, textPrimary: Color.lerp(textPrimary, other.textPrimary, t)!, textSecondary: Color.lerp(textSecondary, other.textSecondary, t)!, textHint: Color.lerp(textHint, other.textHint, t)!, textDarkPrimary: Color.lerp(textDarkPrimary, other.textDarkPrimary, t)!, - textDarkSecondary: Color.lerp(textDarkSecondary, other.textDarkSecondary, t)!, + textDarkSecondary: Color.lerp( + textDarkSecondary, + other.textDarkSecondary, + t, + )!, textDarkHint: Color.lerp(textDarkHint, other.textDarkHint, t)!, - textLightPrimary: Color.lerp(textLightPrimary, other.textLightPrimary, t)!, - textLightSecondary: Color.lerp(textLightSecondary, other.textLightSecondary, t)!, + textLightPrimary: Color.lerp( + textLightPrimary, + other.textLightPrimary, + t, + )!, + textLightSecondary: Color.lerp( + textLightSecondary, + other.textLightSecondary, + t, + )!, textLightHint: Color.lerp(textLightHint, other.textLightHint, t)!, - textInvertedPrimary: Color.lerp(textInvertedPrimary, other.textInvertedPrimary, t)!, - textInvertedSecondary: Color.lerp(textInvertedSecondary, other.textInvertedSecondary, t)!, - textInvertedHint: Color.lerp(textInvertedHint, other.textInvertedHint, t)!, + textInvertedPrimary: Color.lerp( + textInvertedPrimary, + other.textInvertedPrimary, + t, + )!, + textInvertedSecondary: Color.lerp( + textInvertedSecondary, + other.textInvertedSecondary, + t, + )!, + textInvertedHint: Color.lerp( + textInvertedHint, + other.textInvertedHint, + t, + )!, textBrand: Color.lerp(textBrand, other.textBrand, t)!, textLink: Color.lerp(textLink, other.textLink, t)!, textLinkVisited: Color.lerp(textLinkVisited, other.textLinkVisited, t)!, diff --git a/lib/src/ui/personalization_elevation.dart b/lib/src/ui/personalization_elevation.dart index 8e750d4..fd29adc 100644 --- a/lib/src/ui/personalization_elevation.dart +++ b/lib/src/ui/personalization_elevation.dart @@ -10,6 +10,7 @@ import 'package:flutter/painting.dart'; abstract final class PersonalizationElevation { /// None static const List none = []; + /// Elevation 1 static const List e1 = [ BoxShadow( @@ -23,6 +24,7 @@ abstract final class PersonalizationElevation { blurRadius: 2, ), ]; + /// Elevation 2 static const List e2 = [ BoxShadow( @@ -36,6 +38,7 @@ abstract final class PersonalizationElevation { blurRadius: 6, ), ]; + /// Elevation 3 static const List e3 = [ BoxShadow( @@ -49,6 +52,7 @@ abstract final class PersonalizationElevation { blurRadius: 6, ), ]; + /// Elevation 4 static const List e4 = [ BoxShadow( @@ -62,6 +66,7 @@ abstract final class PersonalizationElevation { blurRadius: 8, ), ]; + /// Elevation 5 static const List e5 = [ BoxShadow( diff --git a/lib/src/ui/personalization_icons.dart b/lib/src/ui/personalization_icons.dart index 2e3f699..32c95f7 100644 --- a/lib/src/ui/personalization_icons.dart +++ b/lib/src/ui/personalization_icons.dart @@ -7,23 +7,35 @@ /// поэтому пакет отдаёт только пути, а отрисовка остаётся за потребителем /// (например flutter_svg). Зависимостей это не добавляет. abstract final class PersonalizationIcons { - static const String angleDown = 'packages/rees46_sdk/assets/icons/angle-down.svg'; - static const String angleLargeRight = 'packages/rees46_sdk/assets/icons/angle-large-right.svg'; + static const String angleDown = + 'packages/rees46_sdk/assets/icons/angle-down.svg'; + static const String angleLargeRight = + 'packages/rees46_sdk/assets/icons/angle-large-right.svg'; static const String angleUp = 'packages/rees46_sdk/assets/icons/angle-up.svg'; - static const String arrowLeft = 'packages/rees46_sdk/assets/icons/arrow-left.svg'; - static const String arrowRotateCw = 'packages/rees46_sdk/assets/icons/arrow-rotate-cw.svg'; - static const String arrowsUpDown = 'packages/rees46_sdk/assets/icons/arrows-up-down.svg'; + static const String arrowLeft = + 'packages/rees46_sdk/assets/icons/arrow-left.svg'; + static const String arrowRotateCw = + 'packages/rees46_sdk/assets/icons/arrow-rotate-cw.svg'; + static const String arrowsUpDown = + 'packages/rees46_sdk/assets/icons/arrows-up-down.svg'; static const String copy = 'packages/rees46_sdk/assets/icons/copy.svg'; - static const String crossLarge = 'packages/rees46_sdk/assets/icons/cross-large.svg'; + static const String crossLarge = + 'packages/rees46_sdk/assets/icons/cross-large.svg'; static const String cross = 'packages/rees46_sdk/assets/icons/cross.svg'; - static const String equalizerHorizontal = 'packages/rees46_sdk/assets/icons/equalizer-horizontal.svg'; - static const String grid2x2Fill = 'packages/rees46_sdk/assets/icons/grid-2x2-fill.svg'; + static const String equalizerHorizontal = + 'packages/rees46_sdk/assets/icons/equalizer-horizontal.svg'; + static const String grid2x2Fill = + 'packages/rees46_sdk/assets/icons/grid-2x2-fill.svg'; static const String grid2x2 = 'packages/rees46_sdk/assets/icons/grid-2x2.svg'; - static const String listFill = 'packages/rees46_sdk/assets/icons/list-fill.svg'; + static const String listFill = + 'packages/rees46_sdk/assets/icons/list-fill.svg'; static const String list = 'packages/rees46_sdk/assets/icons/list.svg'; - static const String magnifier = 'packages/rees46_sdk/assets/icons/magnifier.svg'; - static const String spacingMd = 'packages/rees46_sdk/assets/icons/spacing-md.svg'; - static const String starFill = 'packages/rees46_sdk/assets/icons/star-fill.svg'; + static const String magnifier = + 'packages/rees46_sdk/assets/icons/magnifier.svg'; + static const String spacingMd = + 'packages/rees46_sdk/assets/icons/spacing-md.svg'; + static const String starFill = + 'packages/rees46_sdk/assets/icons/star-fill.svg'; static const List all = [ angleDown, diff --git a/lib/src/ui/personalization_radius.dart b/lib/src/ui/personalization_radius.dart index 1b03dcf..69d2816 100644 --- a/lib/src/ui/personalization_radius.dart +++ b/lib/src/ui/personalization_radius.dart @@ -7,24 +7,34 @@ abstract final class PersonalizationRadius { /// XS static const double xs = 2; + /// SM static const double sm = 4; + /// MD static const double md = 6; + /// LG static const double lg = 8; + /// XL static const double xl = 10; + /// 2XL static const double xl2 = 12; + /// 3XL static const double xl3 = 14; + /// 4XL static const double xl4 = 16; + /// 5XL static const double xl5 = 20; + /// 6XL static const double xl6 = 24; + /// Rounded static const double rounded = 999; diff --git a/lib/src/ui/personalization_spacing.dart b/lib/src/ui/personalization_spacing.dart index 6d9a7d6..16f8081 100644 --- a/lib/src/ui/personalization_spacing.dart +++ b/lib/src/ui/personalization_spacing.dart @@ -7,20 +7,28 @@ abstract final class PersonalizationSpacing { /// XS static const double xs = 2; + /// SM static const double sm = 4; + /// MD static const double md = 8; + /// LG static const double lg = 12; + /// XL static const double xl = 16; + /// 2XL static const double xl2 = 24; + /// 3XL static const double xl3 = 32; + /// 4XL static const double xl4 = 48; + /// 5XL static const double xl5 = 64; } diff --git a/lib/src/ui/personalization_typography.dart b/lib/src/ui/personalization_typography.dart index 6518b0c..e64ef66 100644 --- a/lib/src/ui/personalization_typography.dart +++ b/lib/src/ui/personalization_typography.dart @@ -139,5 +139,4 @@ abstract final class PersonalizationTypography { fontWeight: FontWeight.w600, letterSpacing: -0.5, ); - -} \ No newline at end of file +} From e3f38d991bb7ed500cb3d78cde4d14fd20eb3189 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 18 Sep 2026 22:20:58 +0400 Subject: [PATCH 23/79] fix(ui): cards in a row share a baseline, loader replaces count and load more, dark fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Card in carousel and grid types splits into a top group (image, name, rating) and a bottom group (price, button) with the slack between them; the list wraps carousel and grid rows in IntrinsicHeight and stretches the cards, so a name that wraps to two lines no longer pushes the button below its neighbours. The catalogue hides the count and the "Load more" button while loading — the Grid+Loader and List+Loader frames in the design file show only the loader in their place. Without the theme extension the kit now picks its light or dark set by the app theme's brightness instead of staying light. --- .../components/personalization_catalog.dart | 6 +- .../personalization_product_card.dart | 66 ++++++++++++------- .../personalization_products_list.dart | 56 +++++++++------- lib/src/ui/personalization_theme.dart | 12 ++-- 4 files changed, 85 insertions(+), 55 deletions(-) diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart index 0dd76b4..a27cee5 100644 --- a/lib/src/ui/components/personalization_catalog.dart +++ b/lib/src/ui/components/personalization_catalog.dart @@ -100,15 +100,17 @@ class PersonalizationCatalog extends StatelessWidget { onProductTap: onProductTap, iconBuilder: iconBuilder, ), + // Во фреймах с лоадером (296:3544, 299:6606) счётчика и кнопки нет — на время + // загрузки лоадер встаёт на их место. if (loading) const PersonalizationLoader(), - if (count != null) + if (count != null && !loading) PersonalizationCount( prefix: count!.prefix, shown: count!.shown, separator: count!.separator, total: count!.total, ), - if (loadMoreText != null && loadMoreText!.isNotEmpty) + if (loadMoreText != null && loadMoreText!.isNotEmpty && !loading) PersonalizationButton( label: loadMoreText, size: PersonalizationButtonSize.md, diff --git a/lib/src/ui/components/personalization_product_card.dart b/lib/src/ui/components/personalization_product_card.dart index ed7656d..35ac0cd 100644 --- a/lib/src/ui/components/personalization_product_card.dart +++ b/lib/src/ui/components/personalization_product_card.dart @@ -244,40 +244,58 @@ class PersonalizationProductCard extends StatelessWidget { // Carousel и Grid: картинка, название, рейтинг, цена, кнопка — колонкой с шагом 8. // У колонок скидка лежит на картинке: отступ 8 у carousel и 4 у grid. + // Колонка из двух групп: верх (картинка, название, рейтинг) и низ (цена, кнопка). + // Когда ряд или карусель растягивают карточку до самой высокой соседки, лишнее + // уходит между группами — цена с кнопкой остаются на одной линии, даже если + // название ушло на две строки. В макете такой случай не нарисован: там названия + // в одну строку. Сама по себе (без растяжения) колонка остаётся по содержимому. final column = Column( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Stack( + Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, children: [ - PersonalizationProductImage(image: image, aspect: imageAspect), - if (discountBadge != null) - Positioned( - top: metrics.badgeInset, - right: metrics.badgeInset, - child: discountBadge, - ), + Stack( + children: [ + PersonalizationProductImage(image: image, aspect: imageAspect), + if (discountBadge != null) + Positioned( + top: metrics.badgeInset, + right: metrics.badgeInset, + child: discountBadge, + ), + ], + ), + const SizedBox(height: 8), + nameBlock(2), + if (ratingRow != null) ...[ + const SizedBox(height: 8), + ratingRow, + ], ], ), - const SizedBox(height: 8), - nameBlock(2), - if (ratingRow != null) ...[ - const SizedBox(height: 8), - ratingRow, - ], - const SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.baseline, - textBaseline: TextBaseline.alphabetic, + Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, children: [ - priceText, - if (oldPriceText != null) ...[ - const SizedBox(width: 8), - oldPriceText, - ], + const SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + priceText, + if (oldPriceText != null) ...[ + const SizedBox(width: 8), + oldPriceText, + ], + ], + ), + if (action != null) ...[const SizedBox(height: 8), action], ], ), - if (action != null) ...[const SizedBox(height: 8), action], ], ); return _tappable( diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart index 4cd2032..75df7b9 100644 --- a/lib/src/ui/components/personalization_products_list.dart +++ b/lib/src/ui/components/personalization_products_list.dart @@ -118,17 +118,21 @@ class _PersonalizationProductsListState final products = widget.products; switch (widget.layout) { case PersonalizationProductsLayout.carousel: + // IntrinsicHeight + stretch: соседние карточки одной высоты, и карточка + // сама держит цену с кнопкой у нижнего края (см. PersonalizationProductCard). return SingleChildScrollView( controller: _controller, scrollDirection: Axis.horizontal, - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - for (int i = 0; i < products.length; i++) ...[ - if (i > 0) const SizedBox(width: _gap), - _card(products[i], PersonalizationProductCardType.carousel), + child: IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (int i = 0; i < products.length; i++) ...[ + if (i > 0) const SizedBox(width: _gap), + _card(products[i], PersonalizationProductCardType.carousel), + ], ], - ], + ), ), ); case PersonalizationProductsLayout.grid: @@ -136,25 +140,27 @@ class _PersonalizationProductsListState children: [ for (int row = 0; row < products.length; row += 2) ...[ if (row > 0) const SizedBox(height: _gap), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: _card( - products[row], - PersonalizationProductCardType.grid, + IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded( + child: _card( + products[row], + PersonalizationProductCardType.grid, + ), ), - ), - const SizedBox(width: _gap), - Expanded( - child: row + 1 < products.length - ? _card( - products[row + 1], - PersonalizationProductCardType.grid, - ) - : const SizedBox.shrink(), - ), - ], + const SizedBox(width: _gap), + Expanded( + child: row + 1 < products.length + ? _card( + products[row + 1], + PersonalizationProductCardType.grid, + ) + : const SizedBox.shrink(), + ), + ], + ), ), ], ], diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart index e15444f..7f59c68 100644 --- a/lib/src/ui/personalization_theme.dart +++ b/lib/src/ui/personalization_theme.dart @@ -167,10 +167,14 @@ class PersonalizationTheme extends ThemeExtension { colors: PersonalizationColors.dark, ); - /// Тема из контекста. Расширение не подключено — берётся светлая по умолчанию, - /// поэтому компоненты работают и у хоста, которому тема не нужна. - static PersonalizationTheme of(BuildContext context) => - Theme.of(context).extension() ?? light; + /// Тема из контекста. Расширение не подключено — берётся набор по яркости темы + /// приложения, поэтому компоненты работают и у хоста, которому тема не нужна, и + /// в тёмной схеме не остаются светлыми. + static PersonalizationTheme of(BuildContext context) { + final theme = Theme.of(context); + return theme.extension() ?? + (theme.brightness == Brightness.dark ? dark : light); + } @override PersonalizationTheme copyWith({ From 8e5f97b9125fd293ebc72b4dcdd311f7c1147abd Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 18 Sep 2026 22:20:58 +0400 Subject: [PATCH 24/79] feat(example): dark theme wired, bundled photos, category title on the catalogue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The example app registers the kit's light and dark theme extensions on its MaterialApp, so the UI Kit screen follows the system scheme. Product photos are bundled assets rather than picsum URLs — the showcase no longer depends on the network. The catalogue exhibit gets the category title (title + view switch) from the CatalogGrid page; the search results title stays with the search flow. Category rows in the instant search exhibit drop their stand-in pictures: the search API has none for categories. --- example/assets/uikit/backpack.jpg | Bin 0 -> 54781 bytes example/assets/uikit/bottle.jpg | Bin 0 -> 56810 bytes example/assets/uikit/headphones.jpg | Bin 0 -> 45660 bytes example/assets/uikit/jacket.jpg | Bin 0 -> 14383 bytes example/assets/uikit/pegasus.jpg | Bin 0 -> 27695 bytes example/assets/uikit/sneakers.jpg | Bin 0 -> 35760 bytes example/assets/uikit/sunglasses.jpg | Bin 0 -> 57013 bytes example/assets/uikit/watch.jpg | Bin 0 -> 33134 bytes example/lib/main.dart | 14 ++++++++ example/lib/ui_kit_pane.dart | 50 ++++++++++++++++++---------- example/pubspec.yaml | 7 ++-- 11 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 example/assets/uikit/backpack.jpg create mode 100644 example/assets/uikit/bottle.jpg create mode 100644 example/assets/uikit/headphones.jpg create mode 100644 example/assets/uikit/jacket.jpg create mode 100644 example/assets/uikit/pegasus.jpg create mode 100644 example/assets/uikit/sneakers.jpg create mode 100644 example/assets/uikit/sunglasses.jpg create mode 100644 example/assets/uikit/watch.jpg diff --git a/example/assets/uikit/backpack.jpg b/example/assets/uikit/backpack.jpg new file mode 100644 index 0000000000000000000000000000000000000000..53d42e4448f801d0aa4645be79d0c1f1c79e1765 GIT binary patch literal 54781 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 literal 0 HcmV?d00001 diff --git a/example/assets/uikit/headphones.jpg b/example/assets/uikit/headphones.jpg new file mode 100644 index 0000000000000000000000000000000000000000..87a2977061464ce1373b5d0afd19c23b33ce8a5f GIT binary patch literal 45660 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�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 z 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 E*;2jwF8}}l literal 0 HcmV?d00001 diff --git a/example/assets/uikit/jacket.jpg b/example/assets/uikit/jacket.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3e39817dcd8ea1ceb73d4865c6d38f0ec6d1e220 GIT binary patch literal 14383 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 z%0A!+6GX32o#&KLu7mL z3UgL?iP(XLAxW!%JhOTc7es2DU@q!#1VGT#0o+=G6o=aiG@qzls*x43b+fHZ7~+-* zVlM(Fw49~9OFKT%p-je9jxt>>SY6dX_b#O_>NbEooUzyo&oQ}yR%R~F2Je;1hz zgO^$GVGR|73~n$|BfLukU5_c~_YqXSiNwc04?FS02I?ZALD7b)$NPy=)QLNKlr3r% zGAW`6UeH3k7jptPgcFuxBu*a@)f{?-eWjs1?D5hR#ygi1oyW0?Ec|8sGIGz%sGZzP zN~Rl0XP7uefpe1A1-(lTa?Iu;`jj`A_$AG@EjK>XJ86Y^QDcTq+Jl^lUkF7J;#B3t z(h$ZLG8cO`6#GLZ#Bn+I1Ad?^2}B2x%*%cbn8+z0M@ShsoR{KR7aN_*m`;V5I{^d2IE#@NkMj~Zu?ppSZgmKq5rq-C;E4-tTJacdB~1_o zr88wQO){fS#;-iWBBhH=O20D=NYQDE+QLR7Ev=q##zWI6Gt9wLMK8jkWAy{@*-FwJ zK`uDtIrj&tP!@2M%3*$Zl}1#$vI1c(3d0J)7K+wYm#4Ble}(>Ml2qfVSWzFHoFckP zp?qA4Y^7G-_M<};$xX!ym^lx*V2WIbS#=Gz$HcwRRf2W=OS*qiW=B+9$2`XD@$ipV z9RzK~!?{_IF=qEV#J7Z8p_6& z4Z;G|O`JiZ3DmnISqsaA2Ckq#3Q7zM;Dz049tabHDhpi2JVd;n{5<&B-8;x{Y)E#BOb0I;=(a&OhJ-|++R!howohNGN6$L)rrlfIS4;Y7q<-io3Y0w zDRE8$d3eM)0)Fo2Y7kcSV{G-L_`5Cjk4O$9|>Av!@rMj@bvy11O%h+ZGW zT8<;EK&8e-!iLDQ*n3N_P5@vkH~4Uoa`%m9RpB3-JZS ze`#vQf#y-?U@H5X&@zV8^$J?57NkJh#rJ{@AoSqZxL;jKs4zPSX5;yX4HzB1axDIxJ9NfK^|%lTG&*=4GAq; zfE$V4#dw#+O0s$-2PS!iT*AT@;#Fi9s3rwF5I0i8f@i4NY|O%1sBp4~ws_oyU9#AO zS|Q!5wo%wytz2+d^AmuH8#9O{C%Avinl7h{?loTGx-~8o>P5!950%Lh8cO{>KH>&M zXzk`DAvIh|Xei1Q&=CYYFrcpdc36&>$RZ7PcGWR>Of1z-6!#OR0VNoT_V> z2-$ygxCdQ6BZ&*XCu2+y1oIN=mZd#hegYRH?f(E%QK#G$tO)DJa_e8HY_?FVs8u^2 z;wj`YizMzJaoKUB69px!B~heQ@%1>1smPC({X(~41a%ccEENP=B%tO!$jIxN)XP_> zl&1&|P%Ba^xA8bvQLZj6)U;T@J;TYB0f3Fcc~C+q@NBi}Tfqtt0j|QXL7a2uKRmHG zkBLC6!D}GLlx(Xlf+{Hbl&rbXQ3Fkird%;3sgKt34w0}#AyhDJ4j_!Bua%GS9g{(H z8%Oim^%WT39L)a!2E-FhWs0r$Hu@lVQwBG1F7xgTr7lv)UfB}z(M_4?kL3G`;g$x( z((*UN$ZteZZjmcgOjJ}*v#?&#xi(ZttGJ!Ysrev{tVD@>F4rMg(L9{RT&n@pyb&T7 zpAal5)y2D1YsDjIV}?JP96_;fVlRuFTO+&sfGKk7Yyz4f!#MFTT0z?6NW}%Mz97Bd zh1qOb#6YvC)P?XCs4!Fh{{Zqj%-T7A;iYYA*V7810^!d&0np#nCxSmG@J=;@gR?3+ zXL9Fe>wcikQ!Q&u4>S`{;M^}HAvdf!>B@4K%gIRE_bPUlC`gi;asVzMkS+@9Bn{?! zvZ(A^TAg1-4U#&k#*KLRj1-J`e}acNx(4D|CSa2YEY?S@}=LF%ItUnT(H$oZzOO&f$+o zJ7w~2p>`H7=a$Rso(G+LuQ1LA0H>bf=cj{PWeoMf!klea9U0Xi#k8y1^j=UkQ zt<8ENNDGuPEdKy=1vBnkLt`Av$g8P#)px{ObDxZrOaLn3S`k7Q1>Z0MTlt1dvXT=5 zay@w?jY~XBOPy=?DGrxmNAN{<(+cYQ*;9#7Lj)^EOQVMjOnZg!rXr)CFw1*^j-y43 z6>yS;PDaEVy_V+Yl(2X^0>BNFsEg(*Y*6sj8_ZC7g+z4{N%Qq1s@56Cr z%h)QyUEICowQEE*4N&9PwSN2WN4{of%S>VkB69q60V&bEumP5W69E{Ux=y;#}Vo4a|2K zz!Wg|4WnM7o!kRZ?7NGD3QJd+pz#p8ofDkQ0>835`a%P%sY#N;b+)$tdV$gY|GF*r^l&Hf+`eo~JLxM&O(*5%tU zluTRm0P_R1mUL_>qs+DL<{|!KlJtq?ngtNQnL|hjCTw%;dxrI_K1e>GZr)$G8O_D< zRHtQ1Bow~oN7_7362S24;SVzC_b!%r>ME5wDQ|IH(;!KBs9>GSFspgHtUr zu9pW|N*s+6u!9|+sSwXp7A`2p-NdeE8wBW_Ihv6ng{*_Y2^&quyh>ke_r|qxSKK%S zGQ7Apu<1?2V1?ymV)I0e^5<}n&C0tV7Q6CSdBbNln<$Z%Ua^%XmfG9 zeg-$o8$1~6ncZ~(%HfMI=OynLReixoK(6LvxN|v`!W^Rz!YJqQ3o6E>EA0`>21;RZ zI9ex?SrqPGynJ?ff*E+eBX<&#jUsuT4~r!XwbZR5k5E5w9%6$ajf>n_Qj~6vLhZ3{ zCf^Ope%W(*l{NlgC>e&oiBgP>1#T9vV=(>5n>2%YZWl_Iv36QojH8CZORa(8fLqKc zv0#3p=)q<+#^9cI7rT+>LIit)!P;D2tBJzyU3u71clwCv!M9_s2x}R_mROSQ%vmjb z#}VH${$Q(_PT5Y;dX@1+(G#fMLJ0Rcmcs(MfpBP8SA+7Ye*$8uK+l;}=jmh2R`VN=$++M~Mf-=>BB}v0}W% z*sI1{kBGXK?g2NLm=7>88kGx*IWC!vR6j5tW(<~>a`IFQBfUbyiF=V&GG#&24v}M& zGoEf;VRE%N1fkBt+^5yqjIW3%++U<(x5PLNg}tJia7w+#J4fRoIM^>63i7Bl zs;HsDJEmNEnvSB>Smtf!DCuP6k^tE=$pA7hCQ?+K%2g7ed`tL>->9L?Sn$Qz)9QNh z^WV%o*-tQM3@lQ?p3zG&hm2KoEnvBcq$IWhiYS&U0DFfdGX%!QrOUMuZDXy1NM|gH z;Yf!VDiC9Jn`{7pC?Z{kLO^1p4VEtQ0(B5;V!Mev$bd~XrVU*o?Wl_Cg|22C?C&wL z%)t^K;4C^3DcIK-haHWULgHLCfDMN60Y_553U%T`N;>%}hIM#?Yv0;*oE=MqfC(w+0 zm-7~5EUSv7tgD6IVVp4t?!@Vj&BR)A0;pr;lyMVW#D_7x&mfGi3?1C;jvav|$70-% z!9%&O<@Fzs_#X_HTueEe%YjfIxmBcNOc08)C4&Y+(A0;<;mqU2@j$2-a@-{_q|=FN z7f~oa0@*~`m;4T99_SUWHH zp3I6voI!Od71ZcpnNY3L5}^w!M&Wv0uge? zYz%?1Y^gfx3ktY(EO8#Wmz1+Sut9~z)Y-S(RKHAGY@lu%xMQ7zuJMZPb035<=IYlhLZR|wpu0*J7kF{7Dj_M3B=dxIQh*s%wBiM}8k0KrB_wOjULFl+C~8f7^g9X>VH~03avF2tWV;0B`^-C>Q|L2lStV2

+d+iUH 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 E*&>no^8f$< literal 0 HcmV?d00001 diff --git a/example/assets/uikit/sunglasses.jpg b/example/assets/uikit/sunglasses.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2764eab74622b4855d44a192f43215f5fb62c695 GIT binary patch literal 57013 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 CU`!1F literal 0 HcmV?d00001 diff --git a/example/assets/uikit/watch.jpg b/example/assets/uikit/watch.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ea9d3409da96478c54e6f242574b1627f01eecb1 GIT binary patch literal 33134 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 runApp(const App()); @@ -15,8 +19,18 @@ class App extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: 'REES46 Flutter SDK', + // The kit's theme extension rides on ThemeData: light and dark sets + // switch together with the app's brightness. theme: ThemeData( colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), + extensions: const >[PersonalizationTheme.light], + ), + darkTheme: ThemeData( + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.blue, + brightness: Brightness.dark, + ), + extensions: const >[PersonalizationTheme.dark], ), home: const InitPage(), ); diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index bea1294..2031bdf 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -576,9 +576,8 @@ class _ButtonGroupExhibitState extends State<_ButtonGroupExhibit> { } class _SearchResultsTitleExhibit extends StatefulWidget { - const _SearchResultsTitleExhibit({this.onViewChanged, this.count = 128}); + const _SearchResultsTitleExhibit({this.count = 128}); - final ValueChanged? onViewChanged; final int count; @override @@ -595,10 +594,7 @@ class _SearchResultsTitleExhibitState return PersonalizationSearchResultsTitle( title: 'Sneakers', selectedViewIndex: _view, - onViewChanged: (index) { - setState(() => _view = index); - widget.onViewChanged?.call(index); - }, + onViewChanged: (index) => setState(() => _view = index), onBack: () {}, onFilters: () {}, onSort: () {}, @@ -687,23 +683,22 @@ class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { PersonalizationSuggestion(id: 'c3', title: 'Kids boots'), ] : [ + // Categories come without pictures: the search API returns none for + // them, so the "with images" state only illustrates product rows. PersonalizationSuggestion( id: 'c1', title: 'Running shoes', subtitle: 'Shoes', - image: _products[0].image, ), PersonalizationSuggestion( id: 'c2', title: 'Running apparel', subtitle: 'Clothing', - image: _products[1].image, ), PersonalizationSuggestion( id: 'c3', title: 'Trail gear', subtitle: 'Outdoor', - image: _products[2].image, ), ], productsLabel: typing ? 'Products' : 'Frequently searched', @@ -740,8 +735,12 @@ class _CatalogExhibit extends StatefulWidget { State<_CatalogExhibit> createState() => _CatalogExhibitState(); } +/// The catalogue as a host would wire it: the category title (title + view switch, as on +/// the CatalogGrid page) sits in the header slot and drives the grid/list switch. The +/// search results title with back, filters and sort belongs to the search flow. class _CatalogExhibitState extends State<_CatalogExhibit> { PersonalizationProductsLayout _layout = PersonalizationProductsLayout.grid; + int _view = 0; List _shown = _products.take(4).toList(); bool _loading = false; @@ -762,12 +761,29 @@ class _CatalogExhibitState extends State<_CatalogExhibit> { @override Widget build(BuildContext context) { return PersonalizationCatalog( - header: _SearchResultsTitleExhibit( - onViewChanged: (index) => setState(() { - _layout = index == 0 - ? PersonalizationProductsLayout.grid - : PersonalizationProductsLayout.list; - }), + header: PersonalizationTitle( + title: 'Sneakers', + trailing: PersonalizationButtonGroup( + size: PersonalizationButtonGroupSize.md, + selectedIndex: _view, + onSelected: (index) => setState(() { + _view = index; + _layout = index == 0 + ? PersonalizationProductsLayout.grid + : PersonalizationProductsLayout.list; + }), + iconBuilder: _icon, + items: const [ + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.grid2x2, + activeIcon: PersonalizationIcons.grid2x2Fill, + ), + PersonalizationButtonGroupItem( + icon: PersonalizationIcons.list, + activeIcon: PersonalizationIcons.listFill, + ), + ], + ), ), layout: _layout, products: _shown, @@ -975,8 +991,8 @@ Widget _recommender( const int _totalProducts = 128; -ImageProvider _image(String seed) => - NetworkImage('https://picsum.photos/seed/$seed/600/600'); +/// Photos ship with the app: the showcase must not depend on the network. +ImageProvider _image(String seed) => AssetImage('assets/uikit/$seed.jpg'); /// Static products for the exhibits. Strings arrive formatted — that is the kit's contract. final List _products = [ diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 0530aff..00306d1 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -65,10 +65,9 @@ flutter: # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg + # Photos for the UI Kit showcase — bundled so the demo does not depend on the network. + assets: + - assets/uikit/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images From 7eb2b16f7ea8b8967fddfaafd12c5535f57896ea Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 21 Sep 2026 14:52:07 +0400 Subject: [PATCH 25/79] feat(example): appearance switch on the UI Kit screen Checking the kit's dark set meant leaving the app for the system settings and coming back. The UI Kit app bar now carries a button cycling Auto -> Light -> Dark, labelled with the mode it is in. The mode lives in a ValueNotifier that MaterialApp.themeMode listens to, so the whole example repaints and the kit follows through the theme extension attached to each ThemeData. A plain notifier rather than a state manager: neither the kit nor the example depends on one, and this needs no more. --- example/lib/app_theme_mode.dart | 25 +++++++++++++++++++++ example/lib/main.dart | 39 +++++++++++++++++++++------------ example/lib/ui_kit_pane.dart | 23 +++++++++++++++++++ 3 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 example/lib/app_theme_mode.dart diff --git a/example/lib/app_theme_mode.dart b/example/lib/app_theme_mode.dart new file mode 100644 index 0000000..36ad8e6 --- /dev/null +++ b/example/lib/app_theme_mode.dart @@ -0,0 +1,25 @@ +import 'package:flutter/material.dart'; + +/// Colour scheme the demo forces on itself, so the kit's dark set can be checked +/// without leaving for the system settings. +/// +/// A plain [ValueNotifier] rather than a state manager: the example has no +/// dependency injection and the kit does not ask for one either — [MaterialApp] +/// listens to this, and the UI Kit screen's switch writes to it. +final ValueNotifier appThemeMode = ValueNotifier( + ThemeMode.system, +); + +/// Cycles system -> light -> dark -> system. +ThemeMode nextThemeMode(ThemeMode mode) => switch (mode) { + ThemeMode.system => ThemeMode.light, + ThemeMode.light => ThemeMode.dark, + ThemeMode.dark => ThemeMode.system, +}; + +/// Label of the switch: the mode it is in now, not the one it would go to. +String themeModeLabel(ThemeMode mode) => switch (mode) { + ThemeMode.system => 'Auto', + ThemeMode.light => 'Light', + ThemeMode.dark => 'Dark', +}; diff --git a/example/lib/main.dart b/example/lib/main.dart index c6fc660..db9483c 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -3,6 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter/foundation.dart'; import 'package:rees46_sdk/rees46_sdk.dart'; +import 'app_theme_mode.dart'; import 'multi_instance_pane.dart'; // The kit is private until release: the theme comes from the src barrel. // ignore: implementation_imports @@ -17,22 +18,32 @@ class App extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'REES46 Flutter SDK', - // The kit's theme extension rides on ThemeData: light and dark sets - // switch together with the app's brightness. - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), - extensions: const >[PersonalizationTheme.light], - ), - darkTheme: ThemeData( - colorScheme: ColorScheme.fromSeed( - seedColor: Colors.blue, - brightness: Brightness.dark, + // themeMode is driven by the switch on the UI Kit screen, so the kit's dark + // set can be checked without changing the device setting. + return ValueListenableBuilder( + valueListenable: appThemeMode, + builder: (context, mode, _) => MaterialApp( + title: 'REES46 Flutter SDK', + // The kit's theme extension rides on ThemeData: light and dark sets + // switch together with the app's brightness. + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), + extensions: const >[ + PersonalizationTheme.light, + ], + ), + darkTheme: ThemeData( + colorScheme: ColorScheme.fromSeed( + seedColor: Colors.blue, + brightness: Brightness.dark, + ), + extensions: const >[ + PersonalizationTheme.dark, + ], ), - extensions: const >[PersonalizationTheme.dark], + themeMode: mode, + home: const InitPage(), ), - home: const InitPage(), ); } } diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 2031bdf..d2d4a7c 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; + +import 'app_theme_mode.dart'; // The kit stays out of the package barrel until its release; the example reaches // it directly, which the analyzer flags as an implementation import on purpose. // ignore: implementation_imports @@ -32,6 +34,7 @@ class UiKitPane extends StatelessWidget { child: Scaffold( appBar: AppBar( title: const Text('UI Kit'), + actions: const [_AppearanceSwitch()], bottom: const TabBar( tabs: [ Tab(text: 'Components'), @@ -52,6 +55,26 @@ class UiKitPane extends StatelessWidget { } } +/// Switch cycling the app between the system scheme, light and dark. +/// +/// It writes to [appThemeMode], which [MaterialApp] listens to, so the whole +/// demo repaints — the kit's components included, since their palette comes +/// from the theme extension attached to each [ThemeData]. +class _AppearanceSwitch extends StatelessWidget { + const _AppearanceSwitch(); + + @override + Widget build(BuildContext context) { + return ValueListenableBuilder( + valueListenable: appThemeMode, + builder: (context, mode, _) => TextButton( + onPressed: () => appThemeMode.value = nextThemeMode(mode), + child: Text(themeModeLabel(mode)), + ), + ); + } +} + /// The search flow as a host would wire it: the instant search field resolves the SDK by /// shopId and searches on its own; submitting a phrase swaps it for the results screen, /// whose back button returns. Taps on products and categories only show a snackbar — From e157e90f63f3ca0280a354db5f89ebf9388a2f61 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 21 Sep 2026 23:09:05 +0400 Subject: [PATCH 26/79] feat(ui): in-app popup widget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The popup the server already sends on init and trackEvent, drawn from the design system. Today the native SDKs present it themselves and only a boolean crosses the bridge, so Flutter shows a UIKit or Android dialog over its own UI: it obeys the platform's appearance rather than MaterialApp's themeMode, Navigator never sees it, and widget tests cannot reach it. This is the Dart side of fixing that; the popup payload still has to reach Dart, which is a separate change to the bridge. Source: InAppPopup / Modal page, component sets In App Popup/Modal and In App Popup/Fullscreen — four views (image on top, image as background, text only, icon) times two presentations. Position on screen is left to whoever presents it; presentation only picks the metrics, since the fullscreen one drops the corner radius, pads 24 instead of 20 and moves the type up a step. Two departures from the file, both deliberate. The cross belongs to the popup rather than to the image container, because the text and icon views have no image and the file still draws a cross on them. And the text close button is not in the file at all — the admin panel offers it as its own toggle next to the action button, so it sits here as a secondary button under the primary one, and an empty caption leaves just the cross. Adds Background/Float and Background/Modal, which the file grew after the colours were taken; the popup paints itself with Modal. Background/Card and Background/Generic have drifted too — the kit still holds the pre-rework values — so a full colour re-sync is due separately. Buttons gain onDark: over a background image the file switches its controls to the inverted palette, otherwise a secondary button's dark caption drowns in the photograph. --- .../ui/components/personalization_button.dart | 12 +- .../personalization_in_app_popup.dart | 298 ++++++++++++++++++ lib/src/ui/personalization_colors.dart | 31 ++ lib/src/ui/personalization_ui.dart | 1 + 4 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 lib/src/ui/components/personalization_in_app_popup.dart diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart index b5592ca..6ff59ef 100644 --- a/lib/src/ui/components/personalization_button.dart +++ b/lib/src/ui/components/personalization_button.dart @@ -29,6 +29,7 @@ class PersonalizationButton extends StatefulWidget { this.iconStart, this.iconEnd, this.iconBuilder, + this.onDark = false, }); final String? label; @@ -38,6 +39,11 @@ class PersonalizationButton extends StatefulWidget { /// Не задан — кнопка недоступна. final VoidCallback? onPressed; + /// Кнопка стоит поверх тёмного (картинки-фона). В макете такие контролы берут + /// инвертированную палитру: заливка Secondary белая 5%, подпись и иконка светлые. + /// На [PersonalizationButtonView.primary] не влияет — она и так светлая по тексту. + final bool onDark; + /// Ассет иконки перед текстом. Без текста кнопка становится кнопкой-иконкой. final String? iconStart; @@ -176,14 +182,16 @@ class _PersonalizationButtonState extends State { case PersonalizationButtonView.primary: return colors.brandPrimary; case PersonalizationButtonView.secondary: - return colors.buttonSecondary; + return widget.onDark + ? colors.buttonSecondaryOnDark + : colors.buttonSecondary; case PersonalizationButtonView.ghost: return colors.backgroundTransparent; } } Color _foreground(PersonalizationColors colors) { - if (widget.view == PersonalizationButtonView.primary) { + if (widget.view == PersonalizationButtonView.primary || widget.onDark) { return _enabled ? colors.textLightPrimary : colors.textLightHint; } return _enabled ? colors.textPrimary : colors.textHint; diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart new file mode 100644 index 0000000..ef26a40 --- /dev/null +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -0,0 +1,298 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_radius.dart'; +import '../personalization_spacing.dart'; +import '../personalization_theme.dart'; +import '../personalization_typography.dart'; +import 'personalization_button.dart'; + +/// Вид попапа: чем занято место над текстом. +enum PersonalizationInAppPopupView { image, imageBackground, text, icon } + +/// Модалка карточкой или во весь экран — от этого зависят метрики. +enum PersonalizationInAppPopupPresentation { modal, fullscreen } + +/// Инап-попап: карточка с картинкой, заголовком, текстом и кнопками. +/// +/// Источник: Figma Mobile SDK UI Kit, страница InAppPopup / Modal (1:33), +/// компонент-сеты In App Popup/Modal (469:2767) и In App Popup/Fullscreen +/// (469:2835). У обоих четыре вида: картинка сверху, картинка фоном, только +/// текст, иконка. +/// +/// Позицию на экране (верх/центр/низ/во весь экран) виджет не выбирает — это +/// дело того, кто его показывает; здесь только [presentation], от которой +/// зависят метрики: у модалки скругление 24 и отступы 20, у полноэкранной +/// скруглений нет и отступы 24, а кегли на ступень крупнее. +/// +/// Крестик стоит **всегда** и принадлежит самому попапу, а не контейнеру +/// картинки: в макете виды «только текст» и «иконка» картинки не имеют, но +/// крестик у них нарисован. Текстовая кнопка закрытия ([closeText]) в макете не +/// нарисована — её даёт админка отдельным тумблером рядом с кнопкой действия, +/// поэтому она здесь вторичной кнопкой под основной. Пустой текст — кнопки нет, +/// остаётся один крестик. +/// +/// Отступ 20 у модалки и интерлиньяж 48 у полноэкранного заголовка вне шкал +/// кита — взяты из макета как есть. +class PersonalizationInAppPopup extends StatelessWidget { + const PersonalizationInAppPopup({ + super.key, + this.view = PersonalizationInAppPopupView.image, + this.presentation = PersonalizationInAppPopupPresentation.modal, + this.title, + this.text, + this.actionText, + this.closeText, + this.image, + this.icon, + this.iconBuilder, + this.onAction, + this.onClose, + }); + + final PersonalizationInAppPopupView view; + final PersonalizationInAppPopupPresentation presentation; + + final String? title; + final String? text; + + /// Подпись кнопки действия. Пусто — кнопки нет. + final String? actionText; + + /// Подпись кнопки закрытия. Пусто — остаётся только крестик. + final String? closeText; + + /// Картинку даёт хост — кит не тянет сеть. + final ImageProvider? image; + + /// Иконка вида [PersonalizationInAppPopupView.icon]. + final Widget? icon; + + /// Как нарисовать иконку крестика: пакет не рисует SVG сам. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + final VoidCallback? onAction; + final VoidCallback? onClose; + + bool get _modal => + presentation == PersonalizationInAppPopupPresentation.modal; + + bool get _overImage => view == PersonalizationInAppPopupView.imageBackground; + + bool get _centred => + view == PersonalizationInAppPopupView.text || + view == PersonalizationInAppPopupView.icon; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final pad = _modal ? 20.0 : PersonalizationSpacing.xl2; + final gapSection = _modal ? 20.0 : PersonalizationSpacing.xl2; + + // Background/Modal, а не Card: в светлой они совпадают (белый), в тёмной у + // модалки своя ступень. В Figma компонент привязан к Card, но значение Card + // в ките отстало от файла (там уже белый) — ресинк цветов отдельной задачей. + final surface = colors.backgroundModal; + final radius = _modal + ? BorderRadius.circular(PersonalizationRadius.xl6) + : BorderRadius.zero; + + Widget content; + switch (view) { + case PersonalizationInAppPopupView.image: + content = Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Картинка забирает всё, что остаётся над карточкой с текстом. + Expanded(child: _image()), + Container( + color: surface, + padding: EdgeInsets.all(pad), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + _textBlock(context), + SizedBox( + height: _modal + ? PersonalizationSpacing.xl + : PersonalizationSpacing.xl2, + ), + _buttons(context), + ], + ), + ), + ], + ); + + case PersonalizationInAppPopupView.imageBackground: + content = Stack( + fit: StackFit.expand, + children: [ + _image(), + Padding( + padding: EdgeInsets.all(pad), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Здесь крестик не накладкой, а первой строкой: в макете он + // занимает свою строку, иначе заголовок заезжает под него. + Align( + alignment: Alignment.topRight, + child: _closeIcon(context), + ), + // Текст прижат к низу, над кнопками. + Expanded( + child: Align( + alignment: Alignment.bottomLeft, + child: _textBlock(context), + ), + ), + SizedBox(height: gapSection), + _buttons(context), + ], + ), + ), + ], + ); + + case PersonalizationInAppPopupView.text: + case PersonalizationInAppPopupView.icon: + final centre = [ + if (view == PersonalizationInAppPopupView.icon && + icon != null) ...[ + SizedBox( + width: _modal ? 100 : 120, + height: _modal ? 100 : 120, + child: icon, + ), + const SizedBox(height: PersonalizationSpacing.xl2), + ], + _textBlock(context), + ]; + content = Padding( + padding: EdgeInsets.all(pad), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded( + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: centre, + ), + ), + ), + SizedBox(height: gapSection), + _buttons(context), + ], + ), + ); + } + + return ClipRRect( + borderRadius: radius, + child: Container( + color: surface, + child: Stack( + children: [ + Positioned.fill(child: content), + // Крестик всегда на месте — у видов без картинки тоже. У фона-картинки + // он уже стоит в колонке. + if (!_overImage) + Positioned(top: pad, right: pad, child: _closeIcon(context)), + ], + ), + ), + ); + } + + Widget _image() => image == null + ? const SizedBox.shrink() + : Image(image: image!, fit: BoxFit.cover); + + Widget _textBlock(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + // Полноэкранный заголовок в макете 36/48, а ступень 4XL кита — 36/52: + // кегль с одной ступени, интерлиньяж с другой, как и в остальном файле. + final titleStyle = _modal + ? PersonalizationTypography.xl3Emphasized + : PersonalizationTypography.xl4Emphasized.copyWith(height: 48 / 36); + final textStyle = _modal + ? PersonalizationTypography.lgDefault + : PersonalizationTypography.xl2Default; + final align = _centred ? TextAlign.center : TextAlign.start; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + if ((title ?? '').isNotEmpty) + Text( + title!, + textAlign: align, + style: titleStyle.copyWith( + color: _overImage ? colors.textLightPrimary : colors.textPrimary, + ), + ), + if ((title ?? '').isNotEmpty && (text ?? '').isNotEmpty) + const SizedBox(height: PersonalizationSpacing.md), + if ((text ?? '').isNotEmpty) + Text( + text!, + textAlign: align, + style: textStyle.copyWith( + color: _overImage + ? colors.textLightSecondary + : colors.textSecondary, + ), + ), + ], + ); + } + + Widget _buttons(BuildContext context) { + final action = (actionText ?? '').isNotEmpty; + final close = (closeText ?? '').isNotEmpty; + if (!action && !close) return const SizedBox.shrink(); + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + if (action) + PersonalizationButton( + label: actionText, + onPressed: onAction, + iconBuilder: iconBuilder, + ), + if (action && close) const SizedBox(height: PersonalizationSpacing.md), + if (close) + PersonalizationButton( + label: closeText, + view: PersonalizationButtonView.secondary, + onDark: _overImage, + onPressed: onClose, + iconBuilder: iconBuilder, + ), + ], + ); + } + + Widget _closeIcon(BuildContext context) => PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + onDark: _overImage, + iconStart: PersonalizationIcons.crossLarge, + iconBuilder: iconBuilder, + onPressed: onClose, + ); +} diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index 6395033..c0851f1 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -17,12 +17,20 @@ class PersonalizationColors { final Color backgroundPrimary; final Color backgroundGeneric; final Color backgroundCard; + + /// Поверхности поверх карточки. В светлой все три белые, различаются только + /// в тёмной: Card #1A1A1A, Float #262626, Modal #333333. + final Color backgroundFloat; + final Color backgroundModal; final Color backgroundInput; final Color backgroundTransparent; final Color backgroundInputDisabled; final Color buttonPrimary; final Color buttonPrimaryFocus; final Color buttonSecondary; + + /// Secondary поверх тёмного (картинки-фона): белая 5%, как в тёмном режиме файла. + final Color buttonSecondaryOnDark; final Color buttonSecondaryFocus; final Color buttonPrimaryDisabled; final Color buttonSecondaryDisabled; @@ -55,12 +63,15 @@ class PersonalizationColors { required this.backgroundPrimary, required this.backgroundGeneric, required this.backgroundCard, + required this.backgroundFloat, + required this.backgroundModal, required this.backgroundInput, required this.backgroundTransparent, required this.backgroundInputDisabled, required this.buttonPrimary, required this.buttonPrimaryFocus, required this.buttonSecondary, + required this.buttonSecondaryOnDark, required this.buttonSecondaryFocus, required this.buttonPrimaryDisabled, required this.buttonSecondaryDisabled, @@ -94,12 +105,15 @@ class PersonalizationColors { backgroundPrimary: Color(0xFF007DF2), backgroundGeneric: Color(0xFFFAFAFA), backgroundCard: Color(0xFFF2F2F2), + backgroundFloat: Color(0xFFFFFFFF), + backgroundModal: Color(0xFFFFFFFF), backgroundInput: Color(0xFFF2F2F2), backgroundTransparent: Color(0x00FFFFFF), backgroundInputDisabled: Color(0x0D000000), buttonPrimary: Color(0xFF007DF2), buttonPrimaryFocus: Color(0xFF004BC0), buttonSecondary: Color(0x0D000000), + buttonSecondaryOnDark: Color(0x0DFFFFFF), buttonSecondaryFocus: Color(0x1A000000), buttonPrimaryDisabled: Color(0xFF32AFFF), buttonSecondaryDisabled: Color(0x0D000000), @@ -133,12 +147,15 @@ class PersonalizationColors { backgroundPrimary: Color(0xFF007DF2), backgroundGeneric: Color(0xFF141414), backgroundCard: Color(0xFF0D0D0D), + backgroundFloat: Color(0xFF262626), + backgroundModal: Color(0xFF333333), backgroundInput: Color(0xFF141414), backgroundTransparent: Color(0x00FFFFFF), backgroundInputDisabled: Color(0x0DFFFFFF), buttonPrimary: Color(0xFF007DF2), buttonPrimaryFocus: Color(0xFF32AFFF), buttonSecondary: Color(0x0DFFFFFF), + buttonSecondaryOnDark: Color(0x0DFFFFFF), buttonSecondaryFocus: Color(0x1AFFFFFF), buttonPrimaryDisabled: Color(0xFF32AFFF), buttonSecondaryDisabled: Color(0x0DFFFFFF), @@ -177,12 +194,15 @@ class PersonalizationColors { Color? backgroundPrimary, Color? backgroundGeneric, Color? backgroundCard, + Color? backgroundFloat, + Color? backgroundModal, Color? backgroundInput, Color? backgroundTransparent, Color? backgroundInputDisabled, Color? buttonPrimary, Color? buttonPrimaryFocus, Color? buttonSecondary, + Color? buttonSecondaryOnDark, Color? buttonSecondaryFocus, Color? buttonPrimaryDisabled, Color? buttonSecondaryDisabled, @@ -215,6 +235,8 @@ class PersonalizationColors { backgroundPrimary: backgroundPrimary ?? this.backgroundPrimary, backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, backgroundCard: backgroundCard ?? this.backgroundCard, + backgroundFloat: backgroundFloat ?? this.backgroundFloat, + backgroundModal: backgroundModal ?? this.backgroundModal, backgroundInput: backgroundInput ?? this.backgroundInput, backgroundTransparent: backgroundTransparent ?? this.backgroundTransparent, @@ -223,6 +245,8 @@ class PersonalizationColors { buttonPrimary: buttonPrimary ?? this.buttonPrimary, buttonPrimaryFocus: buttonPrimaryFocus ?? this.buttonPrimaryFocus, buttonSecondary: buttonSecondary ?? this.buttonSecondary, + buttonSecondaryOnDark: + buttonSecondaryOnDark ?? this.buttonSecondaryOnDark, buttonSecondaryFocus: buttonSecondaryFocus ?? this.buttonSecondaryFocus, buttonPrimaryDisabled: buttonPrimaryDisabled ?? this.buttonPrimaryDisabled, @@ -269,6 +293,8 @@ class PersonalizationColors { t, )!, backgroundCard: Color.lerp(backgroundCard, other.backgroundCard, t)!, + backgroundFloat: Color.lerp(backgroundFloat, other.backgroundFloat, t)!, + backgroundModal: Color.lerp(backgroundModal, other.backgroundModal, t)!, backgroundInput: Color.lerp(backgroundInput, other.backgroundInput, t)!, backgroundTransparent: Color.lerp( backgroundTransparent, @@ -287,6 +313,11 @@ class PersonalizationColors { t, )!, buttonSecondary: Color.lerp(buttonSecondary, other.buttonSecondary, t)!, + buttonSecondaryOnDark: Color.lerp( + buttonSecondaryOnDark, + other.buttonSecondaryOnDark, + t, + )!, buttonSecondaryFocus: Color.lerp( buttonSecondaryFocus, other.buttonSecondaryFocus, diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index 1a25b1b..53e5849 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -23,6 +23,7 @@ export 'personalization_icons.dart'; export 'personalization_colors.dart'; export 'personalization_theme.dart'; +export 'components/personalization_in_app_popup.dart'; export 'components/personalization_badge.dart'; export 'components/personalization_tag.dart'; export 'components/personalization_checkbox.dart'; From a275b21ea698d8aab2b8f60fda2fbbd5e372f557 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 21 Sep 2026 23:09:05 +0400 Subject: [PATCH 27/79] feat(example): in-app popup exhibits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Four exhibits on the Blocks tab, one per view, covering the button matrix the admin panel can produce: one button, both buttons, close button with text, and no buttons at all — where only the cross is left to dismiss with. --- example/lib/ui_kit_pane.dart | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index d2d4a7c..2242a92 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -561,8 +561,74 @@ final List<_Exhibit> _blockExhibits = [ 'Filters — range, checkbox lists with show more, reset / apply', (context) => _filters(), ), + _Exhibit( + 'In App Popup — image, one button', + (context) => _inAppPopup(context, PersonalizationInAppPopupView.image), + ), + _Exhibit( + 'In App Popup — image background, both buttons', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.imageBackground, + closeText: 'Not now', + ), + ), + _Exhibit( + 'In App Popup — text only, close button with text', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.text, + closeText: 'Maybe later', + ), + ), + _Exhibit( + 'In App Popup — icon, no buttons (cross only)', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.icon, + actionText: null, + ), + ), ]; +void _snack(BuildContext context, String message) => ScaffoldMessenger.of( + context, +).showSnackBar(SnackBar(content: Text(message))); + +/// The popup as the SDK will hand it over: the host supplies the image and wires the +/// two callbacks. Fixed height here only because the showcase is a scrolling column — +/// on screen the popup is sized by whoever presents it. +Widget _inAppPopup( + BuildContext context, + PersonalizationInAppPopupView view, { + String? actionText = 'Action', + String? closeText, +}) { + return SizedBox( + height: 460, + child: PersonalizationInAppPopup( + view: view, + title: 'Pizza ipsum dolor meat lovers', + text: 'Cheese ranch Philly roll pepperoni hand thin garlic bacon.', + actionText: actionText, + closeText: closeText, + image: + view == PersonalizationInAppPopupView.text || + view == PersonalizationInAppPopupView.icon + ? null + : _image('jacket'), + icon: const Icon( + Icons.verified_user, + size: 100, + color: Color(0xFF16AE13), + ), + iconBuilder: _icon, + onAction: () => _snack(context, 'Popup action'), + onClose: () => _snack(context, 'Popup closed'), + ), + ); +} + // --- Stateful exhibits ------------------------------------------------------ class _ButtonGroupExhibit extends StatefulWidget { From c85da53de26f38a1449df938febe80f3ffd603e0 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Mon, 21 Sep 2026 23:28:14 +0400 Subject: [PATCH 28/79] docs(ui): note what wiring the in-app popup to SDK data needs The widget is laid out but not fed by the SDK yet, and the reason is not obvious from the Flutter side: the popup never crosses the bridge, and the native hook needed to divert it exists on iOS but not on Android. --- .../ui/components/personalization_in_app_popup.dart | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart index ef26a40..dbe4cc5 100644 --- a/lib/src/ui/components/personalization_in_app_popup.dart +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -34,6 +34,19 @@ enum PersonalizationInAppPopupPresentation { modal, fullscreen } /// /// Отступ 20 у модалки и интерлиньяж 48 у полноэкранного заголовка вне шкал /// кита — взяты из макета как есть. +// TODO: связать виджет с данными SDK. Сейчас попап приходит только в натив, а через +// pigeon едет один булев флаг enableAutoPopupPresentation — payload до Dart не доходит, +// поэтому виджет пока только свёрстан и показывается в витрине примера. +// Чтобы включить: +// 1. android-sdk: завести точку перехвата попапа. Её там нет — shopPopUp(popupDto) +// вызывается напрямую из RegisterManager и TrackEventManagerImpl и сразу рисует +// диалог; ни делегата, ни флага подавления, и самого enableAutoPopupPresentation +// на Android тоже нет. Нужен листенер по образцу iOS PopupPresentationDelegate +// (sdk(_:shouldPresentPopup:) -> вернул nil, натив не показывает). +// 2. pigeon: PopupWire (id, position, delay, components, popupActions) и +// onPopup(shopId, popup) в PersonalizationFlutterApi. +// 3. Плагины: подписаться на перехват, показ подавить, payload переслать в Dart. +// trackPopupShown оставить нативу, чтобы показ не считался дважды. class PersonalizationInAppPopup extends StatelessWidget { const PersonalizationInAppPopup({ super.key, From 4027a0e20e68e4c289f9d284143b8d38d505e516 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 22 Sep 2026 00:13:00 +0400 Subject: [PATCH 29/79] feat(example): fullscreen in-app popup exhibits The widget supports both presentations, but only the modal one was on show, so the fullscreen branch had never been rendered. Four more exhibits, one per view, in a taller box since its padding and type are a step up. --- example/lib/ui_kit_pane.dart | 40 +++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 2242a92..0799747 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -589,6 +589,39 @@ final List<_Exhibit> _blockExhibits = [ actionText: null, ), ), + _Exhibit( + 'In App Popup, fullscreen — image', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.image, + fullscreen: true, + ), + ), + _Exhibit( + 'In App Popup, fullscreen — image background, both buttons', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.imageBackground, + closeText: 'Not now', + fullscreen: true, + ), + ), + _Exhibit( + 'In App Popup, fullscreen — text only', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.text, + fullscreen: true, + ), + ), + _Exhibit( + 'In App Popup, fullscreen — icon', + (context) => _inAppPopup( + context, + PersonalizationInAppPopupView.icon, + fullscreen: true, + ), + ), ]; void _snack(BuildContext context, String message) => ScaffoldMessenger.of( @@ -603,11 +636,16 @@ Widget _inAppPopup( PersonalizationInAppPopupView view, { String? actionText = 'Action', String? closeText, + bool fullscreen = false, }) { return SizedBox( - height: 460, + // Полноэкранному нужно больше места: отступы и кегли там на ступень крупнее. + height: fullscreen ? 620 : 460, child: PersonalizationInAppPopup( view: view, + presentation: fullscreen + ? PersonalizationInAppPopupPresentation.fullscreen + : PersonalizationInAppPopupPresentation.modal, title: 'Pizza ipsum dolor meat lovers', text: 'Cheese ranch Philly roll pepperoni hand thin garlic bacon.', actionText: actionText, From 3219b1ce25be18a718b32bd159185b3383156c28 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 22 Sep 2026 22:53:55 +0400 Subject: [PATCH 30/79] docs(ui): in-app popup TODO follows the Android interception point MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit android-sdk now has the popup interception point the TODO asked for, as SDK.popupPresentationListener, but not in a release yet — the plugin still pins v2.38.0. The TODO says so, adds the flag the Android plugin ignores today, and corrects who reports the show: a popup kept back is neither reported nor remembered by the native side, so Dart does both once the widget is on screen. --- .../personalization_in_app_popup.dart | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart index dbe4cc5..4c4bae0 100644 --- a/lib/src/ui/components/personalization_in_app_popup.dart +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -38,15 +38,18 @@ enum PersonalizationInAppPopupPresentation { modal, fullscreen } // pigeon едет один булев флаг enableAutoPopupPresentation — payload до Dart не доходит, // поэтому виджет пока только свёрстан и показывается в витрине примера. // Чтобы включить: -// 1. android-sdk: завести точку перехвата попапа. Её там нет — shopPopUp(popupDto) -// вызывается напрямую из RegisterManager и TrackEventManagerImpl и сразу рисует -// диалог; ни делегата, ни флага подавления, и самого enableAutoPopupPresentation -// на Android тоже нет. Нужен листенер по образцу iOS PopupPresentationDelegate -// (sdk(_:shouldPresentPopup:) -> вернул nil, натив не показывает). +// 1. android-sdk: точка перехвата готова, но ещё не в релизе — плагин сидит на +// v2.38.0. Нужен релиз с SDK.popupPresentationListener и +// Rees46Config.enableAutoPopupPresentation (контракт тот же, что у iOS +// PopupPresentationDelegate: вернул null — натив не показывает). // 2. pigeon: PopupWire (id, position, delay, components, popupActions) и // onPopup(shopId, popup) в PersonalizationFlutterApi. -// 3. Плагины: подписаться на перехват, показ подавить, payload переслать в Dart. -// trackPopupShown оставить нативу, чтобы показ не считался дважды. +// 3. Плагины: поставить листенер / делегат, возвращать null, payload переслать в +// Dart. На Android заодно прокинуть в Rees46Config флаг +// enableAutoPopupPresentation — сейчас плагин его игнорирует. +// 4. Показ трекает Dart, когда виджет действительно на экране: придержанный попап +// натив не трекает и не запоминает (так и на iOS). Значит, дедуп на 60 секунд +// тоже на стороне Dart, иначе повтор с сервера покажется дважды. class PersonalizationInAppPopup extends StatelessWidget { const PersonalizationInAppPopup({ super.key, From ed981356b672b3951251992c2bf48aa67192556b Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 00:20:23 +0400 Subject: [PATCH 31/79] fix(ui): search results show "no results" only when there are none MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The screen passed its empty text to the catalogue unconditionally, and the catalogue shows it whenever the product list is empty — so "No results for your request." came up while every new query's first page loaded, for a blank query and after an error. It is now shown only once the first page has come back. Reloading with a blank query invalidated the request in flight but left _loading set, and the dropped response could no longer clear it: the loader spun on and loadMore stayed blocked. A reload now clears it before deciding whether to send anything. Same behaviour as on Android, iOS and React Native. --- .../personalization_search_results_screen.dart | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/src/ui/widgets/personalization_search_results_screen.dart b/lib/src/ui/widgets/personalization_search_results_screen.dart index e672eaf..e4ced51 100644 --- a/lib/src/ui/widgets/personalization_search_results_screen.dart +++ b/lib/src/ui/widgets/personalization_search_results_screen.dart @@ -210,6 +210,10 @@ class _PersonalizationSearchResultsScreenState int _total = 0; int _page = 0; bool _loading = false; + + /// Первая страница текущей фразы пришла: только тогда пустая выдача — «ничего не найдено», + /// а не загрузка, пустая фраза или ошибка. + bool _answered = false; SearchFullResponse? _facetSource; PersonalizationSearchApplied _applied = const PersonalizationSearchApplied(); bool _filtersOpen = false; @@ -262,10 +266,14 @@ class _PersonalizationSearchResultsScreenState /// Первая страница заново. void _reload() { + // Ответ запроса в полёте отбросится по _seq и флаг не снимет — снимаем здесь, иначе + // на пустой фразе лоадер крутится вечно, а loadMore заблокирован. setState(() { _products = const []; _total = 0; _page = 0; + _loading = false; + _answered = false; }); final sdk = _sdk; if (sdk == null || _text.isEmpty) { @@ -327,7 +335,10 @@ class _PersonalizationSearchResultsScreenState _products = nextPage == 1 ? response.products : [..._products, ...response.products]; - if (nextPage == 1) _facetSource = response; + if (nextPage == 1) { + _answered = true; + _facetSource = response; + } }); } catch (error) { if (!mounted || seq != _seq) return; @@ -608,7 +619,7 @@ class _PersonalizationSearchResultsScreenState toCardProduct(product, widget.productActionText), ], imageAspect: widget.imageAspect, - emptyText: widget.emptyText, + emptyText: _answered ? widget.emptyText : null, loading: _loading, count: _products.isEmpty ? null From c7639b70276ceaa055cdd211dcf87f58b9608b6d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 00:20:24 +0400 Subject: [PATCH 32/79] fix(ui): filter edits survive a rebuild of the results screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The filter overlay got its sections from _buildSections() on every build, and PersonalizationFilters resets its state and its price fields whenever it is handed a different list. Any rebuild while the overlay was open — the first page arriving, or the host rebuilding — threw away the ticks and prices the user had not applied yet. The sections are now built when the overlay opens and kept, as Android does in openFilters(). They are rebuilt only when a new first page brings new facets while the overlay is open, where starting over is the right thing. --- ...personalization_search_results_screen.dart | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/src/ui/widgets/personalization_search_results_screen.dart b/lib/src/ui/widgets/personalization_search_results_screen.dart index e4ced51..11657df 100644 --- a/lib/src/ui/widgets/personalization_search_results_screen.dart +++ b/lib/src/ui/widgets/personalization_search_results_screen.dart @@ -216,7 +216,11 @@ class _PersonalizationSearchResultsScreenState bool _answered = false; SearchFullResponse? _facetSource; PersonalizationSearchApplied _applied = const PersonalizationSearchApplied(); - bool _filtersOpen = false; + + /// Секции открытого экрана фильтров, `null` — закрыт. Собираются на открытии и на новых + /// фасетах, а не в каждом build: новый список сбрасывает в [PersonalizationFilters] + /// несохранённые галочки и введённые цены. + List? _filterSections; int _seq = 0; final ScrollController _scroll = ScrollController(); @@ -338,6 +342,8 @@ class _PersonalizationSearchResultsScreenState if (nextPage == 1) { _answered = true; _facetSource = response; + // Фасеты сменились под открытым экраном фильтров — секции из нового ответа. + if (_filterSections != null) _filterSections = _buildSections(); } }); } catch (error) { @@ -350,7 +356,7 @@ class _PersonalizationSearchResultsScreenState void _apply(PersonalizationSearchApplied next) { setState(() { _applied = next; - _filtersOpen = false; + _filterSections = null; }); _reload(); } @@ -598,7 +604,7 @@ class _PersonalizationSearchResultsScreenState : PersonalizationProductsLayout.list; }), onBack: widget.onBack, - onFilters: () => setState(() => _filtersOpen = true), + onFilters: () => setState(() => _filterSections = _buildSections()), onSort: widget.onSortTap, showFiltersButton: widget.showFilters, showSortButton: widget.showSort, @@ -644,6 +650,7 @@ class _PersonalizationSearchResultsScreenState iconBuilder: widget.iconBuilder, ); + final filterSections = _filterSections; return ColoredBox( color: colors.backgroundGeneric, child: Stack( @@ -654,17 +661,17 @@ class _PersonalizationSearchResultsScreenState padding: const EdgeInsets.all(16), child: catalog, ), - if (_filtersOpen) + if (filterSections != null) ColoredBox( color: colors.backgroundGeneric, child: SingleChildScrollView( padding: const EdgeInsets.all(16), child: PersonalizationFilters( title: widget.filtersTitle, - sections: _buildSections(), + sections: filterSections, resetText: widget.resetText, applyText: widget.applyText, - onClose: () => setState(() => _filtersOpen = false), + onClose: () => setState(() => _filterSections = null), onReset: () => _apply(const PersonalizationSearchApplied()), onApply: (sections) => _apply(_fromSections(sections)), iconBuilder: widget.iconBuilder, From 1efc10de489121898ad09ec4e00f276d7121fabf Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 00:21:00 +0400 Subject: [PATCH 33/79] fix(ios): a search page becomes the right offset The native iOS search only takes an offset, and the bridge computed it as (page - 1) * limit only when a limit was set; otherwise it passed the page number through as the offset. SearchParams(page: 2) skipped two products instead of a page, and page 0 with a limit went negative. A first page (or page <= 0) now sends no offset, and a later page sends (page - 1) * limit. A later page without a limit is rejected with bad_args rather than guessed: the server's default page size is not documented anywhere the SDKs could read it, and both guesses return wrong products silently. The results screen always passes its page size, so it is unaffected. SearchParams documents page as 1-based and the iOS rule. --- ios/Classes/Rees46FlutterSdkPlugin.swift | 15 +++++++++++++-- lib/src/search/search_params.dart | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ios/Classes/Rees46FlutterSdkPlugin.swift b/ios/Classes/Rees46FlutterSdkPlugin.swift index 3e8f936..a6ab650 100644 --- a/ios/Classes/Rees46FlutterSdkPlugin.swift +++ b/ios/Classes/Rees46FlutterSdkPlugin.swift @@ -459,8 +459,19 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { let colors = p?["colors"] as? [String] let fashionSizes = p?["fashion_sizes"] as? [String] let filters = p?["filters"] as? [String: Any] - // The native iOS search paginates by product offset, not by page number. - let offset = page.map { limit != nil ? ($0 - 1) * limit! : $0 } + // The native iOS search pages by product offset, while page is 1-based as on Android: + // page N starts at (N - 1) * limit, and the first page (or page <= 0) has no offset. The + // server's default page size isn't pinned down anywhere, so a later page without a limit is + // rejected rather than guessed: no offset would return page 1 again, and the page number as + // the offset would shift by N products. + var offset: Int? + if let page = page, page > 1 { + guard let limit = limit, limit > 0 else { + completion(.failure(PigeonError(code: "bad_args", message: "page > 1 requires limit on iOS", details: nil))) + return + } + offset = (page - 1) * limit + } sdk.search( query: query, diff --git a/lib/src/search/search_params.dart b/lib/src/search/search_params.dart index 33e7b36..1c57076 100644 --- a/lib/src/search/search_params.dart +++ b/lib/src/search/search_params.dart @@ -7,7 +7,9 @@ import 'dart:convert'; /// Cross-platform notes: /// - [categories]: list of category ID strings. Android joins them with commas; /// iOS converts them to integers internally. -/// - [page]: maps to Android `PAGE` param and iOS `offset` param. +/// - [page]: 1-based. Android sends it as `page`; the iOS search only takes an +/// offset, so iOS sends `(page - 1) * limit` and rejects a [page] past the first +/// without a [limit]. /// /// [filters] are the shop's own facets by name — `{"Материал корпуса": ["Металл"]}` — /// as the full search response lists them in `filters`. From 679d0aaa8ecc1b2f24bbaf991351b6fa4796ff3b Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 00:21:00 +0400 Subject: [PATCH 34/79] refactor(android): drop the unused search params builder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit searchFull moved to buildLegacySearchParams for the raw search entry point, and buildSearchParams was left with no callers while still being extended — two copies to keep in step, one of them dead. It is gone. The raw entry point stays for now: android-sdk v2.38.0, which the plugin pins, lacks the facet, old-price and discount fields on its typed search models. A TODO at the call site names the fields and the change that brings them, and what to switch to once a release has them. --- .../Rees46FlutterSdkPlugin.kt | 69 ++++--------------- 1 file changed, 15 insertions(+), 54 deletions(-) diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index 1b487e2..b50b08d 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -326,11 +326,19 @@ class Rees46FlutterSdkPlugin : return } try { - // The typed searchManager.searchFull hands back a data class, and whatever that class - // does not model (the shop's facets in `filters`, old price, discount…) is lost before - // it reaches Dart. The bridge is a JSON pipe, so it takes the raw response instead: - // the legacy search entry point returns the server JSON as is. Move to a raw variant of - // the search manager once the native SDK offers one. + // The raw, deprecated SDK.search entry point rather than the typed + // searchManager.searchFull: android-sdk v2.38.0, which this plugin pins, has no + // `filters`, `industrial_filters`, `oldprice`, `oldprice_formatted`, `discount` or + // `discount_formatted` on SearchFullResponse and Product, so Gson drops them before they + // reach Dart, and the results screen needs the facets and the old price. The raw entry + // point returns the server JSON as is. + // TODO: once an android-sdk release after v2.38.0 ships those fields (commit 9e5d6ac, + // "feat(search): old price, discount, suggested queries and facets in search + // responses": SearchFullResponse.filters / industrialFilters, Product.oldPrice / + // oldPriceFormatted / discount / discountFormatted), bump rees46AndroidSdkVersion in + // build.gradle.kts and switch to sdk(shopId).searchManager.searchFull(query, + // NativeSearchParams, …) with Gson().toJson(response), as searchInstant does; move the + // params builder to NativeSearchParams. val params = buildLegacySearchParams(paramsJson) @Suppress("DEPRECATION") sdk(shopId).search( @@ -856,56 +864,9 @@ class Rees46FlutterSdkPlugin : } -private fun buildSearchParams(paramsJson: String?): NativeSearchParams { - val params = NativeSearchParams() - if (paramsJson.isNullOrBlank()) return params - val json = JSONObject(paramsJson) - json.optInt("limit").takeIf { it > 0 } - ?.let { params.put(NativeSearchParams.Parameter.LIMIT, it) } - json.optInt("page").takeIf { it > 0 } - ?.let { params.put(NativeSearchParams.Parameter.PAGE, it) } - json.optInt("category_limit").takeIf { it > 0 } - ?.let { params.put(NativeSearchParams.Parameter.CATEGORY_LIMIT, it) } - json.optInt("brand_limit").takeIf { it > 0 } - ?.let { params.put(NativeSearchParams.Parameter.BRAND_LIMIT, it) } - json.optString("sort_by").takeIf { it.isNotEmpty() } - ?.let { params.put(NativeSearchParams.Parameter.SORT_BY, it) } - json.optString("sort_dir").takeIf { it.isNotEmpty() } - ?.let { params.put(NativeSearchParams.Parameter.SORT_DIR, it) } - json.optString("locations").takeIf { it.isNotEmpty() } - ?.let { params.put(NativeSearchParams.Parameter.LOCATIONS, it) } - json.optString("brands").takeIf { it.isNotEmpty() } - ?.let { params.put(NativeSearchParams.Parameter.BRANDS, it) } - if (json.has("price_min")) - params.put(NativeSearchParams.Parameter.PRICE_MIN, json.getDouble("price_min").toString()) - if (json.has("price_max")) - params.put(NativeSearchParams.Parameter.PRICE_MAX, json.getDouble("price_max").toString()) - jsonArrayToStringArray(json.optJSONArray("categories")) - ?.let { params.put(NativeSearchParams.Parameter.CATEGORIES, it) } - jsonArrayToStringArray(json.optJSONArray("excluded_brands")) - ?.let { params.put(NativeSearchParams.Parameter.EXCLUDED_BRANDS, it) } - jsonArrayToStringArray(json.optJSONArray("colors")) - ?.let { params.put(NativeSearchParams.Parameter.COLORS, it) } - jsonArrayToStringArray(json.optJSONArray("fashion_sizes")) - ?.let { params.put(NativeSearchParams.Parameter.FASHION_SIZES, it) } - // Facets by name: {"Material": ["Metal", "Plastic"]}. - json.optJSONObject("filters")?.let { facets -> - val searchFilters = NativeSearchParams.SearchFilters() - var any = false - facets.keys().forEach { name -> - jsonArrayToStringArray(facets.optJSONArray(name))?.let { - searchFilters.put(name, it) - any = true - } - } - if (any) params.put(NativeSearchParams.Parameter.FILTERS, searchFilters) - } - return params -} - /** - * The same parameters as [buildSearchParams], on the legacy params class the raw search entry - * point takes. Keys come from the current parameter enum — both implement the same interface — + * Search parameters from the bridge JSON, on the legacy params class the raw search entry point + * takes. Keys come from the current parameter enum — both classes implement the same interface — * so the wire names stay identical. */ @Suppress("DEPRECATION") From 7ab98d573b621c4b2ca5d277b286985d1947c540 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 11:33:22 +0400 Subject: [PATCH 35/79] fix(ui): tokens follow the design file's variables again The design file has moved on since the tokens were taken on 9 September, and its variables, not the frames on the Colors page, are now what the kit follows. Colours: Background/Generic is #F2F2F2 / #0D0D0D, Background/Card is white / #1A1A1A and the dark input fill is #0D0D0D. A disabled primary button is Brand/Primary at 65% instead of #32AFFF: the variable used to resolve to the wrong colour and has now been filled in. Background/Primary is gone from the file and from the kit. Neutral 50 (5% black, 5% white in the dark) joins the palette and fills the image placeholders: the design has a plain grey there, and with the card now white a Card-coloured placeholder would vanish into the screen behind it. Spacing gained 20 and 56, so from 2XL on the steps are renamed as in the file: xl2 is 20 and 24 is now xl3. Its one use, the LG button's side padding, keeps its 24. Radius 7XL, the semantic spacings (padding and gap for blocks, the modal and the full screen) and the semantic radii Segmented LG, Card, Toast and Modal are added. The 4XL, 5XL and 6XL line heights are 48, 56 and 64. Five elevations became three: the new E2 and E3 are the old e3 and e5. The in-app popup follows its bindings in the file: Background/Card instead of Background/Modal, the Modal radius, the modal and full-screen paddings and gaps, and the 4XL style for the full-screen title, which is 36/48 on the scale now. The shadow colour Shadow/Heavy, 8% black in the light scheme and 50% in the dark, is in the colour sets as shadowHeavy; the elevation steps keep the light value and point to it. --- .../personalization_in_app_popup.dart | 28 +++++------ .../personalization_product_image.dart | 4 +- .../personalization_suggestion_row.dart | 2 +- lib/src/ui/personalization_colors.dart | 50 +++++++++++-------- lib/src/ui/personalization_elevation.dart | 39 +++------------ lib/src/ui/personalization_radius.dart | 17 ++++--- lib/src/ui/personalization_spacing.dart | 45 ++++++++++++++--- lib/src/ui/personalization_theme.dart | 27 ++++++++-- lib/src/ui/personalization_typography.dart | 12 ++--- 9 files changed, 134 insertions(+), 90 deletions(-) diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart index 4c4bae0..ba2e3fe 100644 --- a/lib/src/ui/components/personalization_in_app_popup.dart +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -32,8 +32,9 @@ enum PersonalizationInAppPopupPresentation { modal, fullscreen } /// поэтому она здесь вторичной кнопкой под основной. Пустой текст — кнопки нет, /// остаётся один крестик. /// -/// Отступ 20 у модалки и интерлиньяж 48 у полноэкранного заголовка вне шкал -/// кита — взяты из макета как есть. +/// Поля и зазор между блоками — семантические отступы Padding/Gap Modal (20) и +/// Padding/Gap Full Screen (24), скругление модалки — радиус Modal, фон — +/// Background/Card. // TODO: связать виджет с данными SDK. Сейчас попап приходит только в натив, а через // pigeon едет один булев флаг enableAutoPopupPresentation — payload до Dart не доходит, // поэтому виджет пока только свёрстан и показывается в витрине примера. @@ -109,15 +110,16 @@ class PersonalizationInAppPopup extends StatelessWidget { Widget build(BuildContext context) { final theme = PersonalizationTheme.of(context); final colors = theme.colors; - final pad = _modal ? 20.0 : PersonalizationSpacing.xl2; - final gapSection = _modal ? 20.0 : PersonalizationSpacing.xl2; + final pad = _modal + ? PersonalizationSpacing.paddingModal + : PersonalizationSpacing.paddingFullScreen; + final gapSection = _modal + ? PersonalizationSpacing.gapModal + : PersonalizationSpacing.gapFullScreen; - // Background/Modal, а не Card: в светлой они совпадают (белый), в тёмной у - // модалки своя ступень. В Figma компонент привязан к Card, но значение Card - // в ките отстало от файла (там уже белый) — ресинк цветов отдельной задачей. - final surface = colors.backgroundModal; + final surface = colors.backgroundCard; final radius = _modal - ? BorderRadius.circular(PersonalizationRadius.xl6) + ? BorderRadius.circular(PersonalizationRadius.modal) : BorderRadius.zero; Widget content; @@ -139,7 +141,7 @@ class PersonalizationInAppPopup extends StatelessWidget { SizedBox( height: _modal ? PersonalizationSpacing.xl - : PersonalizationSpacing.xl2, + : PersonalizationSpacing.xl3, ), _buttons(context), ], @@ -189,7 +191,7 @@ class PersonalizationInAppPopup extends StatelessWidget { height: _modal ? 100 : 120, child: icon, ), - const SizedBox(height: PersonalizationSpacing.xl2), + const SizedBox(height: PersonalizationSpacing.xl3), ], _textBlock(context), ]; @@ -237,11 +239,9 @@ class PersonalizationInAppPopup extends StatelessWidget { Widget _textBlock(BuildContext context) { final colors = PersonalizationTheme.of(context).colors; - // Полноэкранный заголовок в макете 36/48, а ступень 4XL кита — 36/52: - // кегль с одной ступени, интерлиньяж с другой, как и в остальном файле. final titleStyle = _modal ? PersonalizationTypography.xl3Emphasized - : PersonalizationTypography.xl4Emphasized.copyWith(height: 48 / 36); + : PersonalizationTypography.xl4Emphasized; final textStyle = _modal ? PersonalizationTypography.lgDefault : PersonalizationTypography.xl2Default; diff --git a/lib/src/ui/components/personalization_product_image.dart b/lib/src/ui/components/personalization_product_image.dart index a8910e6..16e3291 100644 --- a/lib/src/ui/components/personalization_product_image.dart +++ b/lib/src/ui/components/personalization_product_image.dart @@ -34,8 +34,10 @@ class PersonalizationProductImage extends StatelessWidget { final colors = PersonalizationTheme.of(context).colors; return AspectRatio( aspectRatio: _ratio, + // Заглушка до загрузки. В макете она нетокенный серый, здесь — Neutral 50: + // полупрозрачная, поэтому видна и на карточке, и прямо на фоне экрана. child: ColoredBox( - color: colors.backgroundCard, + color: colors.neutral50, child: image == null ? null : Image(image: image!, fit: BoxFit.cover), ), ); diff --git a/lib/src/ui/components/personalization_suggestion_row.dart b/lib/src/ui/components/personalization_suggestion_row.dart index feddf16..cc9f6dc 100644 --- a/lib/src/ui/components/personalization_suggestion_row.dart +++ b/lib/src/ui/components/personalization_suggestion_row.dart @@ -79,7 +79,7 @@ class PersonalizationSuggestionRow extends StatelessWidget { width: 40, height: 40, child: ColoredBox( - color: colors.backgroundCard, + color: colors.neutral50, child: image == null ? null : Image(image: image!, fit: BoxFit.cover), diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index c0851f1..d1908d9 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -4,17 +4,20 @@ import 'personalization_theme.dart'; /// Цвета дизайн-системы. /// -/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Colors, -/// фреймы 57:141 (Light) и 187:362 (Dark). Снято 2026-09-09. +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), коллекция переменных Color, +/// режимы Light и Dark. Сверено 2026-09-23. /// /// Набор цветов внутри [PersonalizationTheme]: подключается не сам по себе, /// а полем темы, и читается через [of] или `PersonalizationTheme.of(context).colors`. @immutable class PersonalizationColors { final Color brandPrimary; + + /// Neutral 50: полупрозрачная ступень, одинаково заметна на любом фоне — заглушки картинок. + final Color neutral50; + final Color semanticWarning; final Color semanticDanger; - final Color backgroundPrimary; final Color backgroundGeneric; final Color backgroundCard; @@ -56,11 +59,14 @@ class PersonalizationColors { final Color textLink; final Color textLinkVisited; + /// Shadow/Heavy: цвет тени вместе с её прозрачностью — 8% в светлой, 50% в тёмной. + final Color shadowHeavy; + const PersonalizationColors({ required this.brandPrimary, + required this.neutral50, required this.semanticWarning, required this.semanticDanger, - required this.backgroundPrimary, required this.backgroundGeneric, required this.backgroundCard, required this.backgroundFloat, @@ -96,15 +102,16 @@ class PersonalizationColors { required this.textBrand, required this.textLink, required this.textLinkVisited, + required this.shadowHeavy, }); static const PersonalizationColors light = PersonalizationColors( brandPrimary: Color(0xFF007DF2), + neutral50: Color(0x0D000000), semanticWarning: Color(0xFFF37A17), semanticDanger: Color(0xFFE51919), - backgroundPrimary: Color(0xFF007DF2), - backgroundGeneric: Color(0xFFFAFAFA), - backgroundCard: Color(0xFFF2F2F2), + backgroundGeneric: Color(0xFFF2F2F2), + backgroundCard: Color(0xFFFFFFFF), backgroundFloat: Color(0xFFFFFFFF), backgroundModal: Color(0xFFFFFFFF), backgroundInput: Color(0xFFF2F2F2), @@ -115,7 +122,8 @@ class PersonalizationColors { buttonSecondary: Color(0x0D000000), buttonSecondaryOnDark: Color(0x0DFFFFFF), buttonSecondaryFocus: Color(0x1A000000), - buttonPrimaryDisabled: Color(0xFF32AFFF), + // Brand/Primary с прозрачностью 65%. + buttonPrimaryDisabled: Color(0xA6007DF2), buttonSecondaryDisabled: Color(0x0D000000), buttonGhost: Color(0x00FFFFFF), lineBrand: Color(0xFF007DF2), @@ -138,18 +146,19 @@ class PersonalizationColors { textBrand: Color(0xFF007DF2), textLink: Color(0xFF007DF2), textLinkVisited: Color(0xFF4D00F2), + shadowHeavy: Color(0x14000000), ); static const PersonalizationColors dark = PersonalizationColors( brandPrimary: Color(0xFF007DF2), + neutral50: Color(0x0DFFFFFF), semanticWarning: Color(0xFFF37A17), semanticDanger: Color(0xFFE51919), - backgroundPrimary: Color(0xFF007DF2), - backgroundGeneric: Color(0xFF141414), - backgroundCard: Color(0xFF0D0D0D), + backgroundGeneric: Color(0xFF0D0D0D), + backgroundCard: Color(0xFF1A1A1A), backgroundFloat: Color(0xFF262626), backgroundModal: Color(0xFF333333), - backgroundInput: Color(0xFF141414), + backgroundInput: Color(0xFF0D0D0D), backgroundTransparent: Color(0x00FFFFFF), backgroundInputDisabled: Color(0x0DFFFFFF), buttonPrimary: Color(0xFF007DF2), @@ -157,7 +166,8 @@ class PersonalizationColors { buttonSecondary: Color(0x0DFFFFFF), buttonSecondaryOnDark: Color(0x0DFFFFFF), buttonSecondaryFocus: Color(0x1AFFFFFF), - buttonPrimaryDisabled: Color(0xFF32AFFF), + // Brand/Primary с прозрачностью 65%. + buttonPrimaryDisabled: Color(0xA6007DF2), buttonSecondaryDisabled: Color(0x0DFFFFFF), buttonGhost: Color(0x00FFFFFF), lineBrand: Color(0xFF007DF2), @@ -180,6 +190,7 @@ class PersonalizationColors { textBrand: Color(0xFF007DF2), textLink: Color(0xFF007DF2), textLinkVisited: Color(0xFF4D00F2), + shadowHeavy: Color(0x80000000), ); /// Цвета действующей темы. Расширение не подключено — берётся светлый набор, @@ -189,9 +200,9 @@ class PersonalizationColors { PersonalizationColors copyWith({ Color? brandPrimary, + Color? neutral50, Color? semanticWarning, Color? semanticDanger, - Color? backgroundPrimary, Color? backgroundGeneric, Color? backgroundCard, Color? backgroundFloat, @@ -227,12 +238,13 @@ class PersonalizationColors { Color? textBrand, Color? textLink, Color? textLinkVisited, + Color? shadowHeavy, }) { return PersonalizationColors( brandPrimary: brandPrimary ?? this.brandPrimary, + neutral50: neutral50 ?? this.neutral50, semanticWarning: semanticWarning ?? this.semanticWarning, semanticDanger: semanticDanger ?? this.semanticDanger, - backgroundPrimary: backgroundPrimary ?? this.backgroundPrimary, backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, backgroundCard: backgroundCard ?? this.backgroundCard, backgroundFloat: backgroundFloat ?? this.backgroundFloat, @@ -274,19 +286,16 @@ class PersonalizationColors { textBrand: textBrand ?? this.textBrand, textLink: textLink ?? this.textLink, textLinkVisited: textLinkVisited ?? this.textLinkVisited, + shadowHeavy: shadowHeavy ?? this.shadowHeavy, ); } PersonalizationColors lerp(PersonalizationColors other, double t) { return PersonalizationColors( brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, + neutral50: Color.lerp(neutral50, other.neutral50, t)!, semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, semanticDanger: Color.lerp(semanticDanger, other.semanticDanger, t)!, - backgroundPrimary: Color.lerp( - backgroundPrimary, - other.backgroundPrimary, - t, - )!, backgroundGeneric: Color.lerp( backgroundGeneric, other.backgroundGeneric, @@ -382,6 +391,7 @@ class PersonalizationColors { textBrand: Color.lerp(textBrand, other.textBrand, t)!, textLink: Color.lerp(textLink, other.textLink, t)!, textLinkVisited: Color.lerp(textLinkVisited, other.textLinkVisited, t)!, + shadowHeavy: Color.lerp(shadowHeavy, other.shadowHeavy, t)!, ); } } diff --git a/lib/src/ui/personalization_elevation.dart b/lib/src/ui/personalization_elevation.dart index fd29adc..1d823bf 100644 --- a/lib/src/ui/personalization_elevation.dart +++ b/lib/src/ui/personalization_elevation.dart @@ -2,11 +2,14 @@ import 'package:flutter/painting.dart'; /// Высоты дизайн-системы. /// -/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. -/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), стили Elevation 1–3. /// /// Единственная платформа, где обе тени макета ложатся без потерь: /// [BoxShadow] складывается списком. +/// +/// Цвет 0x14 — светлое значение токена Shadow/Heavy. В тёмной схеме он 0x80 +/// ([PersonalizationColors.shadowHeavy]): тени, которая должна следовать схеме, +/// цвет подставляют оттуда через [BoxShadow.copyWith]. abstract final class PersonalizationElevation { /// None static const List none = []; @@ -27,20 +30,6 @@ abstract final class PersonalizationElevation { /// Elevation 2 static const List e2 = [ - BoxShadow( - color: Color(0x14000000), // чёрный, 0.08 - offset: Offset(0, 6), - blurRadius: 8, - ), - BoxShadow( - color: Color(0x14000000), // чёрный, 0.08 - offset: Offset(0, 3), - blurRadius: 6, - ), - ]; - - /// Elevation 3 - static const List e3 = [ BoxShadow( color: Color(0x14000000), // чёрный, 0.08 offset: Offset(0, 10), @@ -53,22 +42,8 @@ abstract final class PersonalizationElevation { ), ]; - /// Elevation 4 - static const List e4 = [ - BoxShadow( - color: Color(0x14000000), // чёрный, 0.08 - offset: Offset(0, 15), - blurRadius: 15, - ), - BoxShadow( - color: Color(0x14000000), // чёрный, 0.08 - offset: Offset(0, 4), - blurRadius: 8, - ), - ]; - - /// Elevation 5 - static const List e5 = [ + /// Elevation 3 + static const List e3 = [ BoxShadow( color: Color(0x14000000), // чёрный, 0.08 offset: Offset(0, 23), diff --git a/lib/src/ui/personalization_radius.dart b/lib/src/ui/personalization_radius.dart index 69d2816..bba013a 100644 --- a/lib/src/ui/personalization_radius.dart +++ b/lib/src/ui/personalization_radius.dart @@ -1,7 +1,6 @@ /// Радиусы скругления дизайн-системы. /// -/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. -/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), коллекция переменных Radius. /// /// `rounded` — pill: значение заведомо больше любой стороны. abstract final class PersonalizationRadius { @@ -35,16 +34,22 @@ abstract final class PersonalizationRadius { /// 6XL static const double xl6 = 24; + /// 7XL + static const double xl7 = 32; + /// Rounded static const double rounded = 999; - /// Семантические радиусы: переменные Button LG/MD/SM и Segmented Button MD/SM - /// из Figma. К ним привязаны Button, Input, Badge, Tag и Button Group — - /// дизайнер меняет их отдельно от шкалы, поэтому и здесь они отдельно. - /// segmentedSm в макете не снят, выведен по шагу остальных (+2). + /// Семантические радиусы из коллекции Radius. К Button LG/MD/SM привязаны Button, + /// Input, Badge, Tag, к Segmented Button — Button Group, к Modal — попап. + /// Дизайнер меняет их отдельно от шкалы, поэтому и здесь они отдельно. static const double buttonLg = 12; static const double buttonMd = 10; static const double buttonSm = 8; + static const double segmentedLg = 10; static const double segmentedMd = 8; static const double segmentedSm = 6; + static const double card = 16; + static const double toast = 999; + static const double modal = 24; } diff --git a/lib/src/ui/personalization_spacing.dart b/lib/src/ui/personalization_spacing.dart index 16f8081..2e72322 100644 --- a/lib/src/ui/personalization_spacing.dart +++ b/lib/src/ui/personalization_spacing.dart @@ -1,9 +1,8 @@ /// Отступы дизайн-системы. /// -/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), страница Typography. -/// Сгенерировано скриптом; правки вносить в источник, не здесь. +/// Figma Mobile SDK UI Kit (SSwS49L1fG1psWA7xbakV6), коллекция переменных Spacings. /// -/// Шкала независима от типографической: здесь MD вместо Base и нет 6XL. +/// Шкала независима от типографической: здесь MD вместо Base, ступеней 11 — до 7XL. abstract final class PersonalizationSpacing { /// XS static const double xs = 2; @@ -21,14 +20,46 @@ abstract final class PersonalizationSpacing { static const double xl = 16; /// 2XL - static const double xl2 = 24; + static const double xl2 = 20; /// 3XL - static const double xl3 = 32; + static const double xl3 = 24; /// 4XL - static const double xl4 = 48; + static const double xl4 = 32; /// 5XL - static const double xl5 = 64; + static const double xl5 = 48; + + /// 6XL + static const double xl6 = 56; + + /// 7XL + static const double xl7 = 64; + + // Семантические отступы: поля и зазоры блоков, модалки и полноэкранного окна. + + /// Padding X + static const double paddingX = 16; + + /// Padding Y + static const double paddingY = 16; + + /// Gap X + static const double gapX = 16; + + /// Gap Y + static const double gapY = 16; + + /// Padding Modal + static const double paddingModal = 20; + + /// Gap Modal + static const double gapModal = 20; + + /// Padding Full Screen + static const double paddingFullScreen = 24; + + /// Gap Full Screen + static const double gapFullScreen = 24; } diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart index 7f59c68..048271a 100644 --- a/lib/src/ui/personalization_theme.dart +++ b/lib/src/ui/personalization_theme.dart @@ -44,12 +44,17 @@ enum PersonalizationRadiusToken { xl4, xl5, xl6, + xl7, rounded, buttonLg, buttonMd, buttonSm, + segmentedLg, segmentedMd, segmentedSm, + card, + toast, + modal, } /// Радиусы темы. Значения по умолчанию — шкала из макета. @@ -66,18 +71,24 @@ class PersonalizationRadiusScale { this.xl4 = PersonalizationRadius.xl4, this.xl5 = PersonalizationRadius.xl5, this.xl6 = PersonalizationRadius.xl6, + this.xl7 = PersonalizationRadius.xl7, this.rounded = PersonalizationRadius.rounded, this.buttonLg = PersonalizationRadius.buttonLg, this.buttonMd = PersonalizationRadius.buttonMd, this.buttonSm = PersonalizationRadius.buttonSm, + this.segmentedLg = PersonalizationRadius.segmentedLg, this.segmentedMd = PersonalizationRadius.segmentedMd, this.segmentedSm = PersonalizationRadius.segmentedSm, + this.card = PersonalizationRadius.card, + this.toast = PersonalizationRadius.toast, + this.modal = PersonalizationRadius.modal, }); - final double xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, rounded; + final double xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, xl7, rounded; - /// Семантические радиусы кнопочного семейства, см. [PersonalizationRadius]. - final double buttonLg, buttonMd, buttonSm, segmentedMd, segmentedSm; + /// Семантические радиусы, см. [PersonalizationRadius]. + final double buttonLg, buttonMd, buttonSm, segmentedLg, segmentedMd, segmentedSm; + final double card, toast, modal; /// Значение ступени из действующей темы. double resolve(PersonalizationRadiusToken token) => switch (token) { @@ -91,12 +102,17 @@ class PersonalizationRadiusScale { PersonalizationRadiusToken.xl4 => xl4, PersonalizationRadiusToken.xl5 => xl5, PersonalizationRadiusToken.xl6 => xl6, + PersonalizationRadiusToken.xl7 => xl7, PersonalizationRadiusToken.rounded => rounded, PersonalizationRadiusToken.buttonLg => buttonLg, PersonalizationRadiusToken.buttonMd => buttonMd, PersonalizationRadiusToken.buttonSm => buttonSm, + PersonalizationRadiusToken.segmentedLg => segmentedLg, PersonalizationRadiusToken.segmentedMd => segmentedMd, PersonalizationRadiusToken.segmentedSm => segmentedSm, + PersonalizationRadiusToken.card => card, + PersonalizationRadiusToken.toast => toast, + PersonalizationRadiusToken.modal => modal, }; PersonalizationRadiusScale lerp(PersonalizationRadiusScale other, double t) => @@ -111,12 +127,17 @@ class PersonalizationRadiusScale { xl4: lerpDouble(xl4, other.xl4, t), xl5: lerpDouble(xl5, other.xl5, t), xl6: lerpDouble(xl6, other.xl6, t), + xl7: lerpDouble(xl7, other.xl7, t), rounded: lerpDouble(rounded, other.rounded, t), buttonLg: lerpDouble(buttonLg, other.buttonLg, t), buttonMd: lerpDouble(buttonMd, other.buttonMd, t), buttonSm: lerpDouble(buttonSm, other.buttonSm, t), + segmentedLg: lerpDouble(segmentedLg, other.segmentedLg, t), segmentedMd: lerpDouble(segmentedMd, other.segmentedMd, t), segmentedSm: lerpDouble(segmentedSm, other.segmentedSm, t), + card: lerpDouble(card, other.card, t), + toast: lerpDouble(toast, other.toast, t), + modal: lerpDouble(modal, other.modal, t), ); static double lerpDouble(double a, double b, double t) => a + (b - a) * t; diff --git a/lib/src/ui/personalization_typography.dart b/lib/src/ui/personalization_typography.dart index e64ef66..31ee1ac 100644 --- a/lib/src/ui/personalization_typography.dart +++ b/lib/src/ui/personalization_typography.dart @@ -101,13 +101,13 @@ abstract final class PersonalizationTypography { // 4XL — 36/52 static const TextStyle xl4Default = TextStyle( fontSize: 36, - height: 1.4444, // 52 / 36 + height: 1.3333, // 48 / 36 fontWeight: FontWeight.w400, letterSpacing: -0.5, ); static const TextStyle xl4Emphasized = TextStyle( fontSize: 36, - height: 1.4444, // 52 / 36 + height: 1.3333, // 48 / 36 fontWeight: FontWeight.w600, letterSpacing: -0.5, ); @@ -115,13 +115,13 @@ abstract final class PersonalizationTypography { // 5XL — 48/64 static const TextStyle xl5Default = TextStyle( fontSize: 48, - height: 1.3333, // 64 / 48 + height: 1.1667, // 56 / 48 fontWeight: FontWeight.w400, letterSpacing: -0.5, ); static const TextStyle xl5Emphasized = TextStyle( fontSize: 48, - height: 1.3333, // 64 / 48 + height: 1.1667, // 56 / 48 fontWeight: FontWeight.w600, letterSpacing: -0.5, ); @@ -129,13 +129,13 @@ abstract final class PersonalizationTypography { // 6XL — 60/72 static const TextStyle xl6Default = TextStyle( fontSize: 60, - height: 1.2000, // 72 / 60 + height: 1.0667, // 64 / 60 fontWeight: FontWeight.w400, letterSpacing: -0.5, ); static const TextStyle xl6Emphasized = TextStyle( fontSize: 60, - height: 1.2000, // 72 / 60 + height: 1.0667, // 64 / 60 fontWeight: FontWeight.w600, letterSpacing: -0.5, ); From f171e3dda1df85d964f8af3e4cfb12a75d91e3a7 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 12:19:20 +0400 Subject: [PATCH 36/79] style(ui): format the radius scale fields The semantic radii added with the token resync left one line past the formatter's width, which the format check in CI rejects. --- lib/src/ui/personalization_theme.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/src/ui/personalization_theme.dart b/lib/src/ui/personalization_theme.dart index 048271a..bc45796 100644 --- a/lib/src/ui/personalization_theme.dart +++ b/lib/src/ui/personalization_theme.dart @@ -87,7 +87,12 @@ class PersonalizationRadiusScale { final double xs, sm, md, lg, xl, xl2, xl3, xl4, xl5, xl6, xl7, rounded; /// Семантические радиусы, см. [PersonalizationRadius]. - final double buttonLg, buttonMd, buttonSm, segmentedLg, segmentedMd, segmentedSm; + final double buttonLg, + buttonMd, + buttonSm, + segmentedLg, + segmentedMd, + segmentedSm; final double card, toast, modal; /// Значение ступени из действующей темы. From 9208d031a1449906ded36e601b11e1ab4bf54e7e Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 12:19:20 +0400 Subject: [PATCH 37/79] fix(ui): in-app popup cross, buttons and shadow as in the finished design The InAppPopup page is marked done, and its components differ from the kit. The cross is the design's Close component: an MD secondary button whose radius is overridden to Rounded, so it is a circle. The kit button gets a `rounded` parameter for that. In the image-background view the cross now lies over the content in the corner like in every other view instead of taking a row of its own, and over the top image it takes the dark palette, as the design sets the dark mode on it there. The two text buttons are 12 apart in a modal and 16 in a fullscreen popup, not 8. A modal casts the design's Elevation 3 shadow in the theme's Shadow/Heavy colour, so it deepens in the dark scheme. The shadow is drawn around the clipped card rather than inside the clip, which would cut it off. These are the kit's first widget tests: the round cross over the content in every view and presentation, the button gaps and the modal's shadow. --- .../ui/components/personalization_button.dart | 12 +- .../personalization_in_app_popup.dart | 67 ++++--- test/ui/personalization_button_test.dart | 55 ++++++ .../ui/personalization_in_app_popup_test.dart | 167 ++++++++++++++++++ 4 files changed, 276 insertions(+), 25 deletions(-) create mode 100644 test/ui/personalization_button_test.dart create mode 100644 test/ui/personalization_in_app_popup_test.dart diff --git a/lib/src/ui/components/personalization_button.dart b/lib/src/ui/components/personalization_button.dart index 6ff59ef..b6bacf5 100644 --- a/lib/src/ui/components/personalization_button.dart +++ b/lib/src/ui/components/personalization_button.dart @@ -30,6 +30,7 @@ class PersonalizationButton extends StatefulWidget { this.iconEnd, this.iconBuilder, this.onDark = false, + this.rounded = false, }); final String? label; @@ -44,6 +45,11 @@ class PersonalizationButton extends StatefulWidget { /// На [PersonalizationButtonView.primary] не влияет — она и так светлая по тексту. final bool onDark; + /// Скругление Rounded вместо радиуса размера: кнопка-иконка становится кругом. + /// Так в макете устроен крестик Close (секция Button) — кнопка MD Secondary, + /// у которой радиус переопределён на Rounded. + final bool rounded; + /// Ассет иконки перед текстом. Без текста кнопка становится кнопкой-иконкой. final String? iconStart; @@ -109,7 +115,11 @@ class _PersonalizationButtonState extends State { decoration: BoxDecoration( color: _background(colors), borderRadius: BorderRadius.circular( - theme.radius.resolve(metrics.radius), + theme.radius.resolve( + widget.rounded + ? PersonalizationRadiusToken.rounded + : metrics.radius, + ), ), ), child: Row( diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart index ba2e3fe..0295f73 100644 --- a/lib/src/ui/components/personalization_in_app_popup.dart +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -1,5 +1,6 @@ import 'package:flutter/widgets.dart'; +import '../personalization_elevation.dart'; import '../personalization_icons.dart'; import '../personalization_radius.dart'; import '../personalization_spacing.dart'; @@ -27,14 +28,18 @@ enum PersonalizationInAppPopupPresentation { modal, fullscreen } /// /// Крестик стоит **всегда** и принадлежит самому попапу, а не контейнеру /// картинки: в макете виды «только текст» и «иконка» картинки не имеют, но -/// крестик у них нарисован. Текстовая кнопка закрытия ([closeText]) в макете не -/// нарисована — её даёт админка отдельным тумблером рядом с кнопкой действия, -/// поэтому она здесь вторичной кнопкой под основной. Пустой текст — кнопки нет, -/// остаётся один крестик. +/// крестик у них нарисован. Он круглый (компонент Close: кнопка MD с радиусом +/// Rounded) и во всех видах лежит поверх содержимого в правом верхнем углу, на +/// отступе попапа; над фотографией — в тёмном варианте. Текстовая кнопка +/// закрытия ([closeText]) в макете не нарисована — её даёт админка отдельным +/// тумблером рядом с кнопкой действия, поэтому она здесь вторичной кнопкой под +/// основной, на шаге 12 у модалки и 16 у полноэкранного. Пустой текст — кнопки +/// нет, остаётся один крестик. /// /// Поля и зазор между блоками — семантические отступы Padding/Gap Modal (20) и /// Padding/Gap Full Screen (24), скругление модалки — радиус Modal, фон — -/// Background/Card. +/// Background/Card. У модалки тень Elevation 3 цветом Shadow/Heavy темы, у +/// полноэкранного тени нет. // TODO: связать виджет с данными SDK. Сейчас попап приходит только в натив, а через // pigeon едет один булев флаг enableAutoPopupPresentation — payload до Dart не доходит, // поэтому виджет пока только свёрстан и показывается в витрине примера. @@ -160,12 +165,6 @@ class PersonalizationInAppPopup extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - // Здесь крестик не накладкой, а первой строкой: в макете он - // занимает свою строку, иначе заголовок заезжает под него. - Align( - alignment: Alignment.topRight, - child: _closeIcon(context), - ), // Текст прижат к низу, над кнопками. Expanded( child: Align( @@ -216,18 +215,30 @@ class PersonalizationInAppPopup extends StatelessWidget { ); } - return ClipRRect( - borderRadius: radius, - child: Container( - color: surface, - child: Stack( - children: [ - Positioned.fill(child: content), - // Крестик всегда на месте — у видов без картинки тоже. У фона-картинки - // он уже стоит в колонке. - if (!_overImage) + // Тень снаружи карточки, поэтому она на обёртке, а не под ClipRRect — обрезка + // срезала бы её. Цвет берётся из темы: в тёмной схеме Shadow/Heavy плотнее. + return DecoratedBox( + decoration: BoxDecoration( + borderRadius: radius, + boxShadow: _modal + ? [ + for (final shadow in PersonalizationElevation.e3) + shadow.copyWith(color: colors.shadowHeavy), + ] + : null, + ), + child: ClipRRect( + borderRadius: radius, + child: Container( + color: surface, + child: Stack( + children: [ + Positioned.fill(child: content), + // Крестик всегда на месте — у видов без картинки тоже, накладкой + // поверх содержимого. Positioned(top: pad, right: pad, child: _closeIcon(context)), - ], + ], + ), ), ), ); @@ -290,7 +301,12 @@ class PersonalizationInAppPopup extends StatelessWidget { onPressed: onAction, iconBuilder: iconBuilder, ), - if (action && close) const SizedBox(height: PersonalizationSpacing.md), + if (action && close) + SizedBox( + height: _modal + ? PersonalizationSpacing.lg + : PersonalizationSpacing.xl, + ), if (close) PersonalizationButton( label: closeText, @@ -303,10 +319,13 @@ class PersonalizationInAppPopup extends StatelessWidget { ); } + // Над фотографией — и фоном, и сверху — крестик в тёмной палитре: в макете у + // него там тёмный режим. Widget _closeIcon(BuildContext context) => PersonalizationButton( size: PersonalizationButtonSize.md, view: PersonalizationButtonView.secondary, - onDark: _overImage, + onDark: _overImage || view == PersonalizationInAppPopupView.image, + rounded: true, iconStart: PersonalizationIcons.crossLarge, iconBuilder: iconBuilder, onPressed: onClose, diff --git a/test/ui/personalization_button_test.dart b/test/ui/personalization_button_test.dart new file mode 100644 index 0000000..4dcfc77 --- /dev/null +++ b/test/ui/personalization_button_test.dart @@ -0,0 +1,55 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +Widget _host(Widget child) => MaterialApp(home: Center(child: child)); + +BorderRadiusGeometry? _radius(WidgetTester tester) { + final container = tester.widget( + find.descendant( + of: find.byType(PersonalizationButton), + matching: find.byType(Container), + ), + ); + return (container.decoration! as BoxDecoration).borderRadius; +} + +void main() { + testWidgets('a rounded icon button is a circle', (tester) async { + await tester.pumpWidget( + _host( + const PersonalizationButton( + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + iconStart: PersonalizationIcons.crossLarge, + rounded: true, + ), + ), + ); + + expect( + _radius(tester), + BorderRadius.circular(PersonalizationRadius.rounded), + ); + final size = tester.getSize(find.byType(PersonalizationButton)); + expect(size.width, size.height); + }); + + testWidgets('without rounded the button keeps the radius of its size', ( + tester, + ) async { + await tester.pumpWidget( + _host( + const PersonalizationButton( + size: PersonalizationButtonSize.md, + iconStart: PersonalizationIcons.crossLarge, + ), + ), + ); + + expect( + _radius(tester), + BorderRadius.circular(PersonalizationRadius.buttonMd), + ); + }); +} diff --git a/test/ui/personalization_in_app_popup_test.dart b/test/ui/personalization_in_app_popup_test.dart new file mode 100644 index 0000000..371530a --- /dev/null +++ b/test/ui/personalization_in_app_popup_test.dart @@ -0,0 +1,167 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +Widget _host(Widget popup, {ThemeData? theme}) => MaterialApp( + theme: theme, + home: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: 400, height: 600, child: popup), + ), +); + +final Finder _cross = find.byWidgetPredicate( + (widget) => + widget is PersonalizationButton && + widget.iconStart == PersonalizationIcons.crossLarge, +); + +/// The shadow of the popup card: the nearest decoration above its clip. +List _shadows(WidgetTester tester) { + final clip = find + .descendant( + of: find.byType(PersonalizationInAppPopup), + matching: find.byType(ClipRRect), + ) + .first; + final box = tester.widget( + find.ancestor(of: clip, matching: find.byType(DecoratedBox)).first, + ); + return (box.decoration as BoxDecoration).boxShadow ?? const []; +} + +void main() { + testWidgets('the cross is a round overlay in the corner in every view', ( + tester, + ) async { + for (final presentation in PersonalizationInAppPopupPresentation.values) { + final pad = presentation == PersonalizationInAppPopupPresentation.modal + ? PersonalizationSpacing.paddingModal + : PersonalizationSpacing.paddingFullScreen; + for (final view in PersonalizationInAppPopupView.values) { + final reason = '$presentation, $view'; + await tester.pumpWidget( + _host( + PersonalizationInAppPopup( + view: view, + presentation: presentation, + title: 'Title', + text: 'Text', + actionText: 'Go', + closeText: 'Later', + ), + ), + ); + + expect(_cross, findsOneWidget, reason: reason); + expect( + tester.widget(_cross).rounded, + isTrue, + reason: reason, + ); + // Over the content, not a row of a column. + expect( + find.ancestor(of: _cross, matching: find.byType(Column)), + findsNothing, + reason: reason, + ); + final popup = tester.getRect(find.byType(PersonalizationInAppPopup)); + final cross = tester.getRect(_cross); + expect( + cross.topRight, + popup.topRight + Offset(-pad, pad), + reason: reason, + ); + expect(cross.width, cross.height, reason: reason); + } + } + }); + + testWidgets('the cross takes the dark palette over a photo', (tester) async { + for (final view in PersonalizationInAppPopupView.values) { + await tester.pumpWidget(_host(PersonalizationInAppPopup(view: view))); + + expect( + tester.widget(_cross).onDark, + view == PersonalizationInAppPopupView.image || + view == PersonalizationInAppPopupView.imageBackground, + reason: '$view', + ); + } + }); + + testWidgets('buttons are 12 apart in a modal and 16 in a fullscreen popup', ( + tester, + ) async { + const gaps = <(PersonalizationInAppPopupPresentation, double)>[ + (PersonalizationInAppPopupPresentation.modal, PersonalizationSpacing.lg), + ( + PersonalizationInAppPopupPresentation.fullscreen, + PersonalizationSpacing.xl, + ), + ]; + for (final (presentation, gap) in gaps) { + await tester.pumpWidget( + _host( + PersonalizationInAppPopup( + view: PersonalizationInAppPopupView.text, + presentation: presentation, + actionText: 'Go', + closeText: 'Later', + ), + ), + ); + + final action = find.widgetWithText(PersonalizationButton, 'Go'); + final close = find.widgetWithText(PersonalizationButton, 'Later'); + expect( + tester.getTopLeft(close).dy - tester.getBottomLeft(action).dy, + gap, + reason: '$presentation', + ); + } + }); + + testWidgets('a modal casts Elevation 3 in the scheme shadow colour', ( + tester, + ) async { + final schemes = <(ThemeData, PersonalizationColors)>[ + (ThemeData(), PersonalizationColors.light), + (ThemeData(brightness: Brightness.dark), PersonalizationColors.dark), + ]; + for (final (theme, colors) in schemes) { + await tester.pumpWidget( + _host( + const PersonalizationInAppPopup( + view: PersonalizationInAppPopupView.text, + ), + theme: theme, + ), + ); + // MaterialApp animates a theme change. + await tester.pumpAndSettle(); + + final shadows = _shadows(tester); + expect(shadows, hasLength(PersonalizationElevation.e3.length)); + for (int i = 0; i < shadows.length; i++) { + final expected = PersonalizationElevation.e3[i]; + expect(shadows[i].offset, expected.offset); + expect(shadows[i].blurRadius, expected.blurRadius); + expect(shadows[i].color, colors.shadowHeavy); + } + } + }); + + testWidgets('a fullscreen popup casts no shadow', (tester) async { + await tester.pumpWidget( + _host( + const PersonalizationInAppPopup( + view: PersonalizationInAppPopupView.text, + presentation: PersonalizationInAppPopupPresentation.fullscreen, + ), + ), + ); + + expect(_shadows(tester), isEmpty); + }); +} From 6151cacf1a7198609e81c59289806790b9283795 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 12:19:20 +0400 Subject: [PATCH 38/79] perf(ui): the catalogue builds only the cards on screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The search results screen put the catalogue in a SingleChildScrollView, and the catalogue laid its cards out in a Column: every loaded card was built, so ten pages meant two hundred cards and their images, and infinite scroll kept adding to that. The catalogue is now its own CustomScrollView. The header and the footer — empty state, loader, count, load more — are slivers around a lazily built list of cards: rows of two for the grid, sharing a height so prices and buttons line up as before, or one card per row for the list, with the same 12 between blocks and 16 between cards. Only the rows on screen are built. The results screen hands the catalogue its scroll controller and padding instead of wrapping it. Infinite scroll listens to that controller and asks for the next page half a screen before the end, as before, and a new query jumps back to the top. A catalogue placed inside another vertical scroll passes `scrollable: false` and lays out whole; given an unbounded height without the flag it does the same rather than failing. --- .../components/personalization_catalog.dart | 163 +++++++++++-- ...personalization_search_results_screen.dart | 23 +- test/ui/personalization_catalog_test.dart | 230 ++++++++++++++++++ ...nalization_search_results_screen_test.dart | 182 ++++++++++++++ 4 files changed, 571 insertions(+), 27 deletions(-) create mode 100644 test/ui/personalization_catalog_test.dart create mode 100644 test/ui/personalization_search_results_screen_test.dart diff --git a/lib/src/ui/components/personalization_catalog.dart b/lib/src/ui/components/personalization_catalog.dart index a27cee5..833a1e5 100644 --- a/lib/src/ui/components/personalization_catalog.dart +++ b/lib/src/ui/components/personalization_catalog.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; import '../personalization_icons.dart'; +import '../personalization_spacing.dart'; import 'personalization_button.dart'; import 'personalization_count.dart'; import 'personalization_empty_state.dart'; @@ -34,11 +35,17 @@ class PersonalizationCatalogCount { /// [PersonalizationSearchResultsTitle], у категории [PersonalizationTitle] с /// переключателем вида. Поэтому заголовок здесь — слот, а не вариант. /// Три нижних элемента в макете скрываемые (showLoader, showCount, showLoadMore). -/// Шаг блока 12. +/// Шаг блока 12, шаг плитки и списка 16 по обеим осям. /// /// Пустая выдача — страница SearchResultsScreen, Search Results/Empty State (319:7743): /// заголовок тот же, вместо плитки [PersonalizationEmptyState]. Показывается, когда /// задан [emptyText] и товаров нет. +/// +/// Весь каталог — одна лента: заголовок, карточки и нижние элементы — её части, а +/// карточки строятся только под видимую часть, сколько бы страниц ни догрузилось. +/// Поэтому его не вкладывают в прокрутку, он прокручивается сам. Внутри чужой +/// вертикальной прокрутки ([scrollable] `false` или высота не ограничена) он +/// раскладывается целиком, как обычный блок, и сам не прокручивается. class PersonalizationCatalog extends StatelessWidget { const PersonalizationCatalog({ super.key, @@ -54,6 +61,9 @@ class PersonalizationCatalog extends StatelessWidget { this.loadMoreText, this.onLoadMore, this.iconBuilder, + this.scrollable = true, + this.controller, + this.padding, }); final Widget? header; @@ -84,22 +94,42 @@ class PersonalizationCatalog extends StatelessWidget { )? iconBuilder; + /// Прокручивается ли каталог сам. `false` — раскладывается целиком по высоте + /// содержимого и не прокручивается: так его кладут в чужую вертикальную прокрутку. + /// Где высота не ограничена (колонка, скролл), он и без флага раскладывается целиком. + final bool scrollable; + + /// Контроллер собственной прокрутки: следить за ней (бесконечная прокрутка) и + /// возвращать ленту к началу. + final ScrollController? controller; + + /// Поля ленты. Содержимое прокручивается под ними, а не обрезается по их краю. + final EdgeInsetsGeometry? padding; + + /// Шаг между блоками каталога. + static const double _gapBlock = PersonalizationSpacing.lg; + + /// Шаг карточек плитки и списка по обеим осям. + static const double _gapTile = PersonalizationSpacing.xl; + @override Widget build(BuildContext context) { + if (!scrollable) return _list(embedded: true); + // Высота не ограничена — каталог положили в колонку или чужой скролл без флага: + // раскладываем целиком, как обычный блок, а не падаем на вьюпорте без высоты. + return LayoutBuilder( + builder: (context, constraints) => + _list(embedded: !constraints.hasBoundedHeight), + ); + } + + Widget _list({required bool embedded}) { final bool empty = products.isEmpty && (emptyText ?? '').isNotEmpty; - final sections = [ - ?header, - if (empty) - PersonalizationEmptyState(message: emptyText!) - else - PersonalizationProductsList( - layout: layout, - products: products, - imageAspect: imageAspect, - onProductAction: onProductAction, - onProductTap: onProductTap, - iconBuilder: iconBuilder, - ), + final bool grid = layout == PersonalizationProductsLayout.grid; + // Плитка идёт строками по две карточки, список — по одной. + final int rows = grid ? (products.length + 1) ~/ 2 : products.length; + final footer = [ + if (empty) PersonalizationEmptyState(message: emptyText!), // Во фреймах с лоадером (296:3544, 299:6606) счётчика и кнопки нет — на время // загрузки лоадер встаёт на их место. if (loading) const PersonalizationLoader(), @@ -121,15 +151,104 @@ class PersonalizationCatalog extends StatelessWidget { ), ]; - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - for (int i = 0; i < sections.length; i++) ...[ - if (i > 0) const SizedBox(height: 12), - sections[i], - ], + return CustomScrollView( + controller: controller, + // Вложенный каталог не прокручивается и не должен забирать чужой + // PrimaryScrollController. + primary: embedded ? false : null, + shrinkWrap: embedded, + physics: embedded ? const NeverScrollableScrollPhysics() : null, + slivers: [ + SliverPadding( + padding: padding ?? EdgeInsets.zero, + sliver: SliverMainAxisGroup( + slivers: [ + // Заголовок и нижние элементы — отдельные слайверы: они живут, пока жив + // каталог, и не теряют состояние, уехав за экран. Строится лениво только + // лента карточек. + if (header != null) SliverToBoxAdapter(child: header), + if (rows > 0) + SliverPadding( + padding: EdgeInsets.only(top: header != null ? _gapBlock : 0), + sliver: SliverList.separated( + itemCount: rows, + itemBuilder: (context, row) => grid + ? _gridRow(row) + : _card( + products[row], + PersonalizationProductCardType.list, + ), + separatorBuilder: (_, _) => + const SizedBox(height: _gapTile), + ), + ), + if (footer.isNotEmpty) + SliverToBoxAdapter( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < footer.length; i++) ...[ + if (i > 0 || header != null || rows > 0) + const SizedBox(height: _gapBlock), + footer[i], + ], + ], + ), + ), + ], + ), + ), ], ); } + + /// Строка плитки. IntrinsicHeight + stretch: соседние карточки одной высоты, и + /// цена с кнопкой у них на одной линии (см. [PersonalizationProductsList]). + Widget _gridRow(int row) { + final int first = row * 2; + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded( + child: _card(products[first], PersonalizationProductCardType.grid), + ), + const SizedBox(width: _gapTile), + Expanded( + child: first + 1 < products.length + ? _card( + products[first + 1], + PersonalizationProductCardType.grid, + ) + : const SizedBox.shrink(), + ), + ], + ), + ); + } + + /// Карточка товара — так же, как её собирает [PersonalizationProductsList]. + Widget _card( + PersonalizationProduct product, + PersonalizationProductCardType type, + ) { + return PersonalizationProductCard( + type: type, + image: product.image, + imageAspect: imageAspect, + brand: product.brand, + name: product.name, + rating: product.rating, + price: product.price, + oldPrice: product.oldPrice, + discount: product.discount, + actionText: product.actionText, + onAction: onProductAction == null + ? null + : () => onProductAction!(product), + onTap: onProductTap == null ? null : () => onProductTap!(product), + iconBuilder: iconBuilder, + ); + } } diff --git a/lib/src/ui/widgets/personalization_search_results_screen.dart b/lib/src/ui/widgets/personalization_search_results_screen.dart index 11657df..360bb58 100644 --- a/lib/src/ui/widgets/personalization_search_results_screen.dart +++ b/lib/src/ui/widgets/personalization_search_results_screen.dart @@ -279,6 +279,7 @@ class _PersonalizationSearchResultsScreenState _loading = false; _answered = false; }); + _toTop(); final sdk = _sdk; if (sdk == null || _text.isEmpty) { _seq++; @@ -288,6 +289,14 @@ class _PersonalizationSearchResultsScreenState _request(sdk, 1); } + /// Новая выдача — с начала ленты, а не с места, где пользователь бросил прошлую. + /// После кадра: перезапрос приходит и из didUpdateWidget, посреди сборки. + void _toTop() { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted && _scroll.hasClients) _scroll.jumpTo(0); + }); + } + /// Следующая страница, если она есть и запрос не в полёте. void _loadMore() { final sdk = _sdk; @@ -300,6 +309,8 @@ class _PersonalizationSearchResultsScreenState _request(sdk, _page + 1); } + /// Бесконечная прокрутка: следующая страница — за полэкрана до конца ленты. Запрос в + /// полёте повторно не уходит, это держит [_loadMore]. void _onScroll() { if (!widget.infiniteScroll || !_scroll.hasClients) return; final position = _scroll.position; @@ -618,6 +629,9 @@ class _PersonalizationSearchResultsScreenState ); final catalog = PersonalizationCatalog( + controller: _scroll, + // Поля экрана — поля ленты: карточки прокручиваются под ними. + padding: const EdgeInsets.all(16), header: header, layout: _layout, products: [ @@ -656,11 +670,10 @@ class _PersonalizationSearchResultsScreenState child: Stack( fit: StackFit.expand, children: [ - SingleChildScrollView( - controller: _scroll, - padding: const EdgeInsets.all(16), - child: catalog, - ), + // Каталог прокручивается сам, а не во внешнем скролле: там его лента + // раскладывалась бы целиком, и каждая догруженная страница оставалась бы + // построенной всеми карточками. + catalog, if (filterSections != null) ColoredBox( color: colors.backgroundGeneric, diff --git a/test/ui/personalization_catalog_test.dart b/test/ui/personalization_catalog_test.dart new file mode 100644 index 0000000..183f573 --- /dev/null +++ b/test/ui/personalization_catalog_test.dart @@ -0,0 +1,230 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +// The catalogue is one scrolling list: header, cards and footer are its parts. Given a +// bounded height it builds cards for what is on screen only, however many it holds. + +Widget _host(Widget child, {double height = 600}) => MaterialApp( + home: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: 400, height: height, child: child), + ), +); + +List _products(int count) => [ + for (int i = 0; i < count; i++) + PersonalizationProduct(id: '$i', name: 'Item $i', price: '$i'), +]; + +const PersonalizationCatalogCount _count = PersonalizationCatalogCount( + prefix: 'Showing', + shown: 4, + separator: 'of', + total: 40, +); + +/// Every card that exists, on screen or in the cache area around it. +final Finder _cards = find.byType( + PersonalizationProductCard, + skipOffstage: false, +); + +Rect _card(WidgetTester tester, int index) => + tester.getRect(find.byType(PersonalizationProductCard).at(index)); + +void main() { + testWidgets('a long catalogue builds cards for the screen, not for every ' + 'product', (tester) async { + await tester.pumpWidget( + _host(PersonalizationCatalog(products: _products(200))), + ); + + final built = _cards.evaluate().length; + expect(built, inInclusiveRange(1, 30)); + }); + + testWidgets('scrolling to the end keeps a screenful of cards', ( + tester, + ) async { + final controller = ScrollController(); + addTearDown(controller.dispose); + await tester.pumpWidget( + _host( + PersonalizationCatalog( + products: _products(200), + controller: controller, + count: _count, + ), + ), + ); + + // The extent of a lazy list is an estimate: jump until it holds at the end. + for (int i = 0; i < 50; i++) { + controller.jumpTo(controller.position.maxScrollExtent); + await tester.pump(); + if (controller.position.pixels == controller.position.maxScrollExtent) { + break; + } + } + + expect(find.text('Item 199'), findsOneWidget); + expect(find.byType(PersonalizationCount), findsOneWidget); + expect(_cards.evaluate().length, inInclusiveRange(1, 30)); + }); + + testWidgets('inside another scroll it lays out whole and does not scroll ' + 'itself', (tester) async { + await tester.pumpWidget( + _host( + ListView( + children: [ + PersonalizationCatalog( + products: _products(40), + count: _count, + scrollable: false, + ), + ], + ), + ), + ); + + expect(_cards, findsNWidgets(40)); + expect( + find.byType(PersonalizationCount, skipOffstage: false), + findsOneWidget, + ); + final own = tester.widget( + find + .descendant( + of: find.byType(PersonalizationCatalog), + matching: find.byType(Scrollable), + ) + .first, + ); + expect(own.physics, isA()); + }); + + testWidgets('an unbounded height lays it out whole without the flag', ( + tester, + ) async { + await tester.pumpWidget( + _host( + SingleChildScrollView( + child: PersonalizationCatalog(products: _products(10)), + ), + ), + ); + + expect(tester.takeException(), isNull); + expect(_cards, findsNWidgets(10)); + }); + + testWidgets('blocks are 12 apart, grid cards 16 on both axes, a row shares ' + 'its height', (tester) async { + tester.view.physicalSize = const Size(400, 2000); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.reset); + const header = SizedBox(key: Key('header'), height: 40); + await tester.pumpWidget( + _host( + const PersonalizationCatalog( + header: header, + products: [ + PersonalizationProduct( + id: '0', + brand: 'Brand', + name: 'A name long enough to take both lines of the card', + price: '1', + ), + PersonalizationProduct(id: '1', name: 'Short', price: '2'), + PersonalizationProduct(id: '2', name: 'Third', price: '3'), + ], + count: _count, + ), + height: 2000, + ), + ); + + final headerRect = tester.getRect(find.byKey(const Key('header'))); + expect(_card(tester, 0).top - headerRect.bottom, PersonalizationSpacing.lg); + expect( + _card(tester, 1).left - _card(tester, 0).right, + PersonalizationSpacing.xl, + ); + expect( + _card(tester, 2).top - _card(tester, 0).bottom, + PersonalizationSpacing.xl, + ); + expect(_card(tester, 0).height, _card(tester, 1).height); + expect( + tester.getRect(find.byType(PersonalizationCount)).top - + _card(tester, 2).bottom, + PersonalizationSpacing.lg, + ); + }); + + testWidgets('the list puts one card per row, 16 apart', (tester) async { + await tester.pumpWidget( + _host( + PersonalizationCatalog( + layout: PersonalizationProductsLayout.list, + products: _products(3), + ), + ), + ); + + expect(_card(tester, 0).width, 400); + expect( + _card(tester, 1).top - _card(tester, 0).bottom, + PersonalizationSpacing.xl, + ); + }); + + testWidgets('the loader takes the place of the count and load more', ( + tester, + ) async { + Widget catalog({required bool loading}) => _host( + PersonalizationCatalog( + products: _products(4), + count: _count, + loadMoreText: 'Load more', + onLoadMore: () {}, + loading: loading, + ), + ); + final loadMore = find.widgetWithText(PersonalizationButton, 'Load more'); + + await tester.pumpWidget(catalog(loading: false)); + expect(find.byType(PersonalizationCount), findsOneWidget); + expect(loadMore, findsOneWidget); + expect(find.byType(PersonalizationLoader), findsNothing); + + await tester.pumpWidget(catalog(loading: true)); + expect(find.byType(PersonalizationCount), findsNothing); + expect(loadMore, findsNothing); + expect(find.byType(PersonalizationLoader), findsOneWidget); + }); + + testWidgets('no products and an empty text show the empty state under the ' + 'header', (tester) async { + const header = SizedBox(key: Key('header'), height: 40); + await tester.pumpWidget( + _host( + const PersonalizationCatalog( + header: header, + products: [], + emptyText: 'Nothing found', + ), + ), + ); + + expect(find.byKey(const Key('header')), findsOneWidget); + expect(find.byType(PersonalizationEmptyState), findsOneWidget); + expect( + tester.getRect(find.byType(PersonalizationEmptyState)).top - + tester.getRect(find.byKey(const Key('header'))).bottom, + PersonalizationSpacing.lg, + ); + }); +} diff --git a/test/ui/personalization_search_results_screen_test.dart b/test/ui/personalization_search_results_screen_test.dart new file mode 100644 index 0000000..a91c43c --- /dev/null +++ b/test/ui/personalization_search_results_screen_test.dart @@ -0,0 +1,182 @@ +import 'dart:async'; +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/rees46_sdk.dart'; +import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +/// Host API that answers `searchFull` from memory: [total] products, a page of the +/// requested limit at a time. While [hold] is set, answers wait for it. +class _FakeHostApi extends pigeon.PersonalizationHostApi { + static const int total = 200; + + /// Pages asked for, in order. + final List pages = []; + Completer? hold; + + @override + Future searchFull( + String query, + String? paramsJson, + String? shopId, + ) async { + final params = jsonDecode(paramsJson!) as Map; + final page = params['page'] as int; + final limit = params['limit'] as int; + pages.add(page); + await hold?.future; + final from = (page - 1) * limit; + return jsonEncode({ + 'products': >[ + for (int i = from; i < from + limit && i < total; i++) + {'id': '$i', 'name': 'Item $i', 'price': i}, + ], + 'products_total': total, + }); + } + + @override + Future trackSearch( + String query, + List? results, + String? shopId, + ) async {} +} + +Widget _host(Widget screen) => MaterialApp( + home: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: 400, height: 600, child: screen), + ), +); + +ScrollPosition _position(WidgetTester tester) => tester + .state( + find + .descendant( + of: find.byType(PersonalizationCatalog), + matching: find.byType(Scrollable), + ) + .first, + ) + .position; + +/// Physics that do not pull an emptied list back into range by themselves, as the +/// platform defaults do: the jump to the top has to come from the screen. +class _PlainScrollBehavior extends ScrollBehavior { + const _PlainScrollBehavior(); + + @override + ScrollPhysics getScrollPhysics(BuildContext context) => + const ClampingScrollPhysics(); +} + +/// Every card that exists, on screen or in the cache area around it. +int _cards() => find + .byType(PersonalizationProductCard, skipOffstage: false) + .evaluate() + .length; + +void main() { + late _FakeHostApi api; + late PersonalizationSdk sdk; + + setUp(() { + api = _FakeHostApi(); + sdk = PersonalizationSdk(api: api); + }); + + testWidgets('infinite scroll asks for the next page half a screen before ' + 'the end, once', (tester) async { + await tester.pumpWidget( + _host( + PersonalizationSearchResultsScreen( + sdk: sdk, + query: 'jacket', + infiniteScroll: true, + ), + ), + ); + await tester.pump(); + expect(api.pages, [1]); + + final position = _position(tester); + position.jumpTo(100); + await tester.pump(); + expect(api.pages, [1]); + + api.hold = Completer(); + position.jumpTo( + position.maxScrollExtent - position.viewportDimension / 2 + 1, + ); + await tester.pump(); + expect(api.pages, [1, 2]); + + // The page is still in flight: scrolling on does not ask for it again. + position.jumpTo(position.maxScrollExtent); + await tester.pump(); + expect(api.pages, [1, 2]); + + // Once it is in, the next approach to the end asks for the one after. + api.hold!.complete(); + api.hold = null; + await tester.pump(); + position.jumpTo(position.maxScrollExtent); + await tester.pump(); + expect(api.pages, [1, 2, 3]); + }); + + testWidgets('ten loaded pages keep a screenful of cards, not two hundred', ( + tester, + ) async { + await tester.pumpWidget( + _host( + PersonalizationSearchResultsScreen( + sdk: sdk, + query: 'jacket', + infiniteScroll: true, + ), + ), + ); + await tester.pump(); + + for (int i = 0; i < 100 && api.pages.length < 10; i++) { + final position = _position(tester); + position.jumpTo(position.maxScrollExtent); + await tester.pump(); + } + expect(api.pages, [for (int page = 1; page <= 10; page++) page]); + // Settle at the real end: the extent of a lazy list is an estimate. + for (int i = 0; i < 50; i++) { + final position = _position(tester); + position.jumpTo(position.maxScrollExtent); + await tester.pump(); + if (position.pixels == position.maxScrollExtent) break; + } + + expect(find.text('Item 199'), findsOneWidget); + expect(_cards(), inInclusiveRange(1, 30)); + }); + + testWidgets('a new query starts from the top', (tester) async { + Widget screen(String query) => _host( + ScrollConfiguration( + behavior: const _PlainScrollBehavior(), + child: PersonalizationSearchResultsScreen(sdk: sdk, query: query), + ), + ); + await tester.pumpWidget(screen('jacket')); + await tester.pump(); + _position(tester).jumpTo(1000); + await tester.pump(); + expect(_position(tester).pixels, 1000); + + await tester.pumpWidget(screen('coat')); + await tester.pump(); + + expect(_position(tester).pixels, 0); + expect(api.pages, [1, 1]); + }); +} From 744586a90715467e76ce706d0d91bee7848911b5 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 12:19:20 +0400 Subject: [PATCH 39/79] feat(example): catalogue exhibits laid out whole in the showcase scroll The catalogue now scrolls by itself, so the showcase's two catalogue exhibits, which sit inside the pane's scroll, pass scrollable: false. --- example/lib/ui_kit_pane.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 0799747..e131403 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -555,6 +555,8 @@ final List<_Exhibit> _blockExhibits = [ products: [], emptyText: 'No results for your request.', iconBuilder: _icon, + // Inside the showcase's scroll: laid out whole, no scrolling of its own. + scrollable: false, ), ), _Exhibit( @@ -925,6 +927,8 @@ class _CatalogExhibitState extends State<_CatalogExhibit> { onLoadMore: _loadMore, onProductAction: (_) {}, iconBuilder: _icon, + // Inside the showcase's scroll: laid out whole, no scrolling of its own. + scrollable: false, ); } } From 2439d65312e956fb2a2d73fa9c0400a334f53bf5 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 17:26:29 +0400 Subject: [PATCH 40/79] feat(ui): toast and loyalty card The kit gains the Toast (Components, 367:16178) and the Wallet-style loyalty card (Loyalty page, 570:9111), matching the native kits. PersonalizationToast is the pill: Background/Float, Elevation 2 in the theme's Shadow/Heavy, 18/18 w500 in Text/Primary instead of the design's raw black. PersonalizationToast.show() puts it in the root overlay, 16 inside the safe area (and above the keyboard at the bottom), fades it in and out, removes it after two seconds, replaces a toast still on screen and ignores touches. Where the platform announces it does; on Android the toast is a live region. The overlay has no Material above it, so the toast resets the default text style. PersonalizationLoyaltyCard keeps the 370x560 pass proportions through IntrinsicHeight under a minimum height, so the barcode section can take the rest and sit at the bottom even inside a scroll view. Header, stripe (width / 2.6, scrim, emblem, stamps), fields and code drop out when empty. The logo is a widget the host tints itself; the stripe and emblem are ImageProviders. Stamps go through iconBuilder like every kit icon, with a painter of the same paths as the fallback; both icons join the set. The barcode is Code 128 from an encoder of our own, kept out of the barrel, drawn by a RenderBox with modules snapped to physical pixels. --- assets/icons/check-rosette-fill.svg | 3 + assets/icons/rosette.svg | 3 + .../components/personalization_barcode.dart | 167 ++++++ .../components/personalization_code128.dart | 100 ++++ .../personalization_loyalty_card.dart | 558 ++++++++++++++++++ .../ui/components/personalization_toast.dart | 219 +++++++ lib/src/ui/personalization_icons.dart | 5 + lib/src/ui/personalization_ui.dart | 5 + test/ui/personalization_barcode_test.dart | 111 ++++ .../ui/personalization_loyalty_card_test.dart | 311 ++++++++++ test/ui/personalization_toast_test.dart | 288 +++++++++ 11 files changed, 1770 insertions(+) create mode 100644 assets/icons/check-rosette-fill.svg create mode 100644 assets/icons/rosette.svg create mode 100644 lib/src/ui/components/personalization_barcode.dart create mode 100644 lib/src/ui/components/personalization_code128.dart create mode 100644 lib/src/ui/components/personalization_loyalty_card.dart create mode 100644 lib/src/ui/components/personalization_toast.dart create mode 100644 test/ui/personalization_barcode_test.dart create mode 100644 test/ui/personalization_loyalty_card_test.dart create mode 100644 test/ui/personalization_toast_test.dart diff --git a/assets/icons/check-rosette-fill.svg b/assets/icons/check-rosette-fill.svg new file mode 100644 index 0000000..53c7432 --- /dev/null +++ b/assets/icons/check-rosette-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/rosette.svg b/assets/icons/rosette.svg new file mode 100644 index 0000000..d215eff --- /dev/null +++ b/assets/icons/rosette.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/src/ui/components/personalization_barcode.dart b/lib/src/ui/components/personalization_barcode.dart new file mode 100644 index 0000000..8dbffe6 --- /dev/null +++ b/lib/src/ui/components/personalization_barcode.dart @@ -0,0 +1,167 @@ +import 'dart:math' as math; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; + +import 'personalization_code128.dart'; + +/// Штрихкод Code 128. +/// +/// Источник: Figma Mobile SDK UI Kit, компонент Wallet/Code (520:8886): штрихкод +/// 232×42 на белой подложке. Здесь только штрихи — подложку с полями рисует тот, +/// кто кладёт штрихкод (карта лояльности, промокод). +/// +/// Ширина модуля — целое число физических пикселей: дробные модули на экране +/// размываются, и сканер читает их хуже. Во Flutter разметка в логических +/// единицах, поэтому модуль считается через плотность экрана: +/// `floor(232 * dpr / модулей) / dpr`, не меньше `1 / dpr`. Штрихкод не +/// растягивается ровно на 232, а берёт наибольший целый модуль, при котором в +/// 232 помещается, — итоговая ширина чуть меньше и зависит от длины кода. Если +/// разметка даёт меньше 232, модуль считается от доступной ширины. Штрихи +/// чёрные в любой теме: сканеру нужен контраст, а не палитра. +/// +/// Строку, которую Code 128 не несёт (пустую, не ASCII), не рисует — размер +/// нулевой. Для скринридера штрихкод читается своей строкой. +class PersonalizationBarcode extends StatelessWidget { + const PersonalizationBarcode({super.key, required this.code}); + + /// Кодируемая строка — номер карты, промокод. + final String code; + + /// Ширина, в которую штрихкод вписывается, и его высота — из макета. + static const double preferredWidth = 232; + static const double preferredHeight = 42; + + @override + Widget build(BuildContext context) { + final modules = PersonalizationCode128.encode(code); + if (modules == null) return const SizedBox.shrink(); + return Semantics( + container: true, + label: code, + child: _Bars( + modules: modules, + devicePixelRatio: MediaQuery.maybeDevicePixelRatioOf(context) ?? 1, + ), + ); + } +} + +/// Штрихи как RenderBox, а не CustomPaint под LayoutBuilder: модуль зависит от +/// доступной ширины, а карта лояльности меряет содержимое через IntrinsicHeight, +/// которого LayoutBuilder не поддерживает. +class _Bars extends LeafRenderObjectWidget { + const _Bars({required this.modules, required this.devicePixelRatio}); + + final List modules; + final double devicePixelRatio; + + @override + _RenderBars createRenderObject(BuildContext context) => + _RenderBars(modules, devicePixelRatio); + + @override + void updateRenderObject(BuildContext context, _RenderBars renderObject) { + renderObject + ..modules = modules + ..devicePixelRatio = devicePixelRatio; + } +} + +class _RenderBars extends RenderBox { + _RenderBars(this._modules, this._devicePixelRatio); + + List _modules; + set modules(List value) { + if (listEquals(value, _modules)) return; + _modules = value; + markNeedsLayout(); + } + + double _devicePixelRatio; + set devicePixelRatio(double value) { + if (value == _devicePixelRatio) return; + _devicePixelRatio = value; + markNeedsLayout(); + } + + /// Модуль, найденный при последней разметке: пересчитывать его из размера при + /// отрисовке нельзя — погрешность деления может отнять целый пиксель. + double _module = 0; + + /// Ширина модуля в логических единицах при данной доступной ширине. + double _moduleFor(double maxWidth) { + final available = math.min(PersonalizationBarcode.preferredWidth, maxWidth); + // Эпсилон — против погрешности плотности вроде 2.625: 3.9999 не должно + // превратиться в 3. + final pixels = (available * _devicePixelRatio / _modules.length + 1e-6) + .floorToDouble(); + return math.max(1, pixels) / _devicePixelRatio; + } + + Size _sizeFor(BoxConstraints constraints, double module) => + constraints.constrain( + Size(_modules.length * module, PersonalizationBarcode.preferredHeight), + ); + + @override + Size computeDryLayout(covariant BoxConstraints constraints) => + _sizeFor(constraints, _moduleFor(constraints.maxWidth)); + + @override + void performLayout() { + _module = _moduleFor(constraints.maxWidth); + size = _sizeFor(constraints, _module); + } + + @override + double computeMinIntrinsicWidth(double height) => + _modules.length * _moduleFor(double.infinity); + + @override + double computeMaxIntrinsicWidth(double height) => + computeMinIntrinsicWidth(height); + + @override + double computeMinIntrinsicHeight(double width) => + PersonalizationBarcode.preferredHeight; + + @override + double computeMaxIntrinsicHeight(double width) => + PersonalizationBarcode.preferredHeight; + + @override + void paint(PaintingContext context, Offset offset) { + final canvas = context.canvas; + final drawn = _modules.length * _module; + // По центру, если разметка дала больше, чем занимают модули. Начало + // прижато к физическому пикселю, иначе края всех штрихов лягут между + // пикселями. + final dpr = _devicePixelRatio; + double x = offset.dx + (size.width - drawn) / 2; + x = (x * dpr).roundToDouble() / dpr; + + // Без сглаживания: край штриха либо закрашен, либо нет — полупрозрачная + // кромка сканеру только мешает. + final paint = Paint() + // Чёрный, а не токен: сканеру нужен контраст в любой теме. + ..color = const Color(0xFF000000) + ..isAntiAlias = false; + + int i = 0; + while (i < _modules.length) { + int run = 1; + while (i + run < _modules.length && _modules[i + run] == _modules[i]) { + run++; + } + if (_modules[i]) { + canvas.drawRect( + Rect.fromLTWH(x, offset.dy, run * _module, size.height), + paint, + ); + } + x += run * _module; + i += run; + } + } +} diff --git a/lib/src/ui/components/personalization_code128.dart b/lib/src/ui/components/personalization_code128.dart new file mode 100644 index 0000000..71d5f45 --- /dev/null +++ b/lib/src/ui/components/personalization_code128.dart @@ -0,0 +1,100 @@ +/// Кодировщик штрихкода Code 128 — то, что рисует `PersonalizationBarcode`. +/// +/// Номер карты лояльности в макете (Wallet/Code, 520:8886) — линейный штрихкод, +/// а Code 128 — формат, который читают кассовые сканеры и Apple Wallet. +/// Библиотеку ради сотни строк таблицы SDK не тянет. +/// +/// Набор выбирается целиком на строку: одни цифры — набор C (две цифры на символ, +/// код вдвое короче), при нечётной длине последняя цифра уходит в набор B через +/// переключатель CODE B. Всё прочее — набор B, печатный ASCII 32…126. Строку с +/// другими символами Code 128 без расширений не несёт — тогда кодировщик +/// возвращает null, и штрихкода нет. +/// +/// В барель кита не входит: это внутренность штрихкода, наружу торчит только +/// виджет. Тесты импортируют файл напрямую. +abstract final class PersonalizationCode128 { + /// Символы строки: значения по порядку, от старт-символа до контрольного + /// включительно. Строку, которую набор не несёт, — null. + static List? values(String text) { + if (text.isEmpty) return null; + final units = text.codeUnits; + if (units.any((unit) => unit < 32 || unit > 126)) return null; + + final values = []; + final digits = units.every((unit) => unit >= 0x30 && unit <= 0x39); + if (digits && units.length >= 2) { + values.add(_startC); + final pairs = units.length ~/ 2; + for (int i = 0; i < pairs; i++) { + values.add(int.parse(text.substring(i * 2, i * 2 + 2))); + } + if (units.length.isOdd) { + values + ..add(_codeB) + ..add(units.last - 32); + } + } else { + values.add(_startB); + for (final unit in units) { + values.add(unit - 32); + } + } + values.add(checksum(values)); + return values; + } + + /// Модули слева направо, `true` — штрих. Тихих зон по краям нет — их даёт + /// подложка. + static List? encode(String text) { + final symbols = values(text); + if (symbols == null) return null; + final modules = []; + for (final value in [...symbols, _stop]) { + final pattern = _patterns[value]; + for (int i = 0; i < pattern.length; i++) { + final width = pattern.codeUnitAt(i) - 0x30; + // Ширины идут парами «штрих, пробел», начиная со штриха. + for (int k = 0; k < width; k++) { + modules.add(i.isEven); + } + } + } + return modules; + } + + /// Старт-символ плюс сумма значений, взвешенных позицией с единицы, по + /// модулю 103. [symbols] — от старт-символа до последнего символа данных. + static int checksum(List symbols) { + int sum = symbols.first; + for (int i = 1; i < symbols.length; i++) { + sum += i * symbols[i]; + } + return sum % 103; + } + + static const int _codeB = 100; + static const int _startB = 104; + static const int _startC = 105; + static const int _stop = 106; + + /// Ширины штрихов и пробелов символа, начиная со штриха; индекс — значение + /// символа. 103–105 — старт-символы A/B/C, 106 — стоп (13 модулей). + static const List _patterns = [ + '212222', '222122', '222221', '121223', '121322', '131222', '122213', // + '122312', '132212', '221213', '221312', '231212', '112232', '122132', // + '122231', '113222', '123122', '123221', '223211', '221132', '221231', // + '213212', '223112', '312131', '311222', '321122', '321221', '312212', // + '322112', '322211', '212123', '212321', '232121', '111323', '131123', // + '131321', '112313', '132113', '132311', '211313', '231113', '231311', // + '112133', '112331', '132131', '113123', '113321', '133121', '313121', // + '211331', '231131', '213113', '213311', '213131', '311123', '311321', // + '331121', '312113', '312311', '332111', '314111', '221411', '431111', // + '111224', '111422', '121124', '121421', '141122', '141221', '112214', // + '112412', '122114', '122411', '142112', '142211', '241211', '221114', // + '413111', '241112', '134111', '111242', '121142', '121241', '114212', // + '124112', '124211', '411212', '421112', '421211', '212141', '214121', // + '412121', '111143', '111341', '131141', '114113', '114311', '411113', // + '411311', '113141', '114131', '311141', '411131', '211412', '211214', // + '211232', '2331112', // + ]; +} diff --git a/lib/src/ui/components/personalization_loyalty_card.dart b/lib/src/ui/components/personalization_loyalty_card.dart new file mode 100644 index 0000000..73e4a78 --- /dev/null +++ b/lib/src/ui/components/personalization_loyalty_card.dart @@ -0,0 +1,558 @@ +import 'dart:math' as math; + +import 'package:flutter/widgets.dart'; + +import '../personalization_elevation.dart'; +import '../personalization_icons.dart'; +import '../personalization_spacing.dart'; +import '../personalization_theme.dart'; +import 'personalization_barcode.dart'; +import 'personalization_code128.dart'; + +/// Поле блока Info карты лояльности: подпись и значение. +@immutable +class PersonalizationLoyaltyCardField { + const PersonalizationLoyaltyCardField({ + required this.label, + required this.value, + }); + + final String label; + final String value; +} + +/// Карта лояльности в духе Apple Wallet. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Loyalty (1:34), фреймы +/// Wallet/iOS/Light Theme (570:9879) и Wallet/iOS/Dark Theme (570:10131); +/// компонент Wallet (570:9111) на странице Components, секция Card. Части: +/// Header, Wallet/Logo (570:9034), набор полей Wallet (559:8973), Wallet/Stripe +/// (520:8923), Wallet/Stamps (570:10384), Wallet/Info (570:9081), Wallet/Code +/// (520:8886). +/// +/// С данными SDK не связана: getLoyaltyStatus отдаёт только участие и уровень — +/// ни баланса, ни штампов, ни номера карты в нём нет. Всё содержимое даёт хост, +/// кит только раскладывает. Форма вступления из описания страницы в макете не +/// нарисована — её здесь нет. +/// +/// Ширина — ширина родителя, минимальная высота — пропорция пасса 370×560; +/// содержимое выше — карта растёт. Разделы идут стопкой без зазоров, пустой +/// раздел пропадает целиком: +/// - Header — логотип в начале, баланс (подпись и значение) в конце строки; +/// - Stripe — полоса высотой в ширину / 2.6 (strip Apple 375×144): картинка, +/// затемнение 30%, эмблема уровня и штампы; +/// - Info — поля [fields] поровну по ширине; +/// - Code — штрихкод [code] на белой подложке, забирает остаток высоты и +/// прижат к низу по центру. +/// +/// Скругление 2XL, обводка 1 внутрь цветом Line/Generic Subtle, тень Elevation 3 +/// цветом Shadow/Heavy темы. Фон — Background/Card, подписи и значения — +/// Text/Primary; оба переопределяются через [cardColor] и [contentColor]. Так в +/// тёмном примере макета карта фирменная синяя: #0087E8 — Semantic/Info, такого +/// токена в ките нет, цвет передаёт хост. +class PersonalizationLoyaltyCard extends StatelessWidget { + const PersonalizationLoyaltyCard({ + super.key, + this.logo, + this.balanceLabel, + this.balanceValue, + this.stripe, + this.emblem, + this.stamps = 0, + this.stampsTotal = 0, + this.fields = const [], + this.code, + this.cardColor, + this.contentColor, + this.iconBuilder, + }); + + /// Логотип хоста. Кит задаёт ему высоту 33, ширину картинка берёт по своей + /// пропорции. Виджет, а не [ImageProvider]: логотип кит не перекрашивает — + /// хочет хост цвет текста, он красит его сам (`Image(color: ...)`). Карта + /// меряет содержимое через IntrinsicHeight, поэтому LayoutBuilder в логотипе + /// не годится; Image и SvgPicture подходят. + final Widget? logo; + + /// Подпись баланса — в макете «Бонусы»; выводится прописными. + final String? balanceLabel; + + /// Баланс уже отформатированным — в макете «50 550». + final String? balanceValue; + + /// Картинка полосы, заполняет её с обрезкой по краям. Картинки даёт хост — + /// кит не тянет сеть. + final ImageProvider? stripe; + + /// Эмблема уровня поверх полосы, у правого края, частично за её границей. + final ImageProvider? emblem; + + /// Сколько штампов собрано. Приводится к 0…[stampsTotal]. + final int stamps; + + /// Сколько мест под штампы. 0 — ряда штампов нет. + final int stampsTotal; + + /// Поля блока Info по порядку — в макете «Владелец» и «Уровень». Тумблер + /// Show Owner макета — просто поле, которое хост не передал. + final List fields; + + /// Номер карты для штрихкода Code 128. Пусто или не кодируется — раздела + /// нет, минимальная высота карты остаётся. + final String? code; + + /// Фон карты. `null` — Background/Card. + final Color? cardColor; + + /// Цвет подписей и значений. `null` — Text/Primary. + final Color? contentColor; + + /// Как нарисовать иконку штампа ([PersonalizationIcons.checkRosetteFill], + /// [PersonalizationIcons.rosette]) заданного размера и цвета. Не задан — + /// кит рисует штампы сам по контуру тех же иконок. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + /// Пропорция пасса в макете. + static const double _designWidth = 370; + static const double _designHeight = 560; + + /// Wallet/Logo. + static const double _logoHeight = 33; + + /// Strip Apple Wallet — 375×144; в макете 368×141.5. + static const double _stripeRatio = 2.6; + + static const double _stampSize = 32; + + bool get _hasBalance => + (balanceLabel ?? '').isNotEmpty || (balanceValue ?? '').isNotEmpty; + + int get _total => math.max(0, stampsTotal); + + bool get _hasCode => + code != null && PersonalizationCode128.values(code!) != null; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final surface = cardColor ?? colors.backgroundCard; + final radius = BorderRadius.circular(theme.radius.xl2); + + return LayoutBuilder( + builder: (context, constraints) { + // Без ограничения по ширине (горизонтальная прокрутка) — ширина макета. + final width = constraints.hasBoundedWidth + ? constraints.maxWidth + : _designWidth; + + final sections = [ + if (logo != null || _hasBalance) _header(context), + if (stripe != null || emblem != null || _total > 0) + _stripe(context, width / _stripeRatio), + if (fields.isNotEmpty) _info(context), + if (_hasCode) Expanded(child: _code(context)), + ]; + + // Тень снаружи карты, поэтому она на обёртке, а не под ClipRRect — + // обрезка срезала бы её. Обводка поверх содержимого, внутри скругления: + // полоса во всю ширину её не перекрывает. + return SizedBox( + width: width, + child: DecoratedBox( + decoration: BoxDecoration( + borderRadius: radius, + boxShadow: [ + for (final shadow in PersonalizationElevation.e3) + shadow.copyWith(color: colors.shadowHeavy), + ], + ), + child: ClipRRect( + borderRadius: radius, + child: DecoratedBox( + position: DecorationPosition.foreground, + decoration: BoxDecoration( + borderRadius: radius, + border: Border.all(color: colors.lineGenericSubtle), + ), + child: ColoredBox( + color: surface, + // Высота — наибольшая из пропорции и содержимого. + // IntrinsicHeight меряет содержимое и в прокрутке без + // ограничения по высоте, где Expanded раздела Code иначе + // было бы нечего делить. + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: width * _designHeight / _designWidth, + ), + child: IntrinsicHeight( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: sections, + ), + ), + ), + ), + ), + ), + ), + ); + }, + ); + } + + // Подпись поля и баланса: 11/14, SemiBold, +0.04 em, прописными. + TextStyle _labelStyle(BuildContext context) => _style( + context, + fontSize: 11, + lineHeight: 14, + weight: FontWeight.w600, + letterSpacingEm: 0.04, + ); + + // Трекинг в макете в долях кегля, TextStyle ждёт логические пиксели. + TextStyle _style( + BuildContext context, { + required double fontSize, + required double lineHeight, + FontWeight weight = FontWeight.w400, + double letterSpacingEm = 0, + }) { + final theme = PersonalizationTheme.of(context); + return TextStyle( + fontSize: fontSize, + height: lineHeight / fontSize, + fontWeight: weight, + letterSpacing: fontSize * letterSpacingEm, + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + color: contentColor ?? theme.colors.textPrimary, + ); + } + + Widget _header(BuildContext context) { + final label = balanceLabel ?? ''; + final value = balanceValue ?? ''; + return Padding( + padding: const EdgeInsets.all(PersonalizationSpacing.xl), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (logo != null) SizedBox(height: _logoHeight, child: logo), + if (logo != null && _hasBalance) + const SizedBox(width: PersonalizationSpacing.xl), + if (_hasBalance) + Expanded( + // Строки баланса однострочные: IntrinsicHeight меряет шапку по + // собственной ширине картинки логотипа, а не по ширине при + // высоте 33, и перенос по такой ширине раздул бы шапку. + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: [ + if (label.isNotEmpty) + Text( + label.toUpperCase(), + textAlign: TextAlign.end, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: _labelStyle(context), + ), + if (value.isNotEmpty) + Text( + value, + textAlign: TextAlign.end, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: _style( + context, + fontSize: 24, + lineHeight: 24, + letterSpacingEm: -0.05, + ), + ), + ], + ), + ), + ], + ), + ); + } + + Widget _stripe(BuildContext context, double height) { + final colors = PersonalizationTheme.of(context).colors; + final filled = stamps.clamp(0, _total); + return SizedBox( + height: height, + child: Stack( + fit: StackFit.expand, + // Эмблема выходит за полосу — полоса её обрезает. + clipBehavior: Clip.hardEdge, + children: [ + // Чёрная подложка, а не токен: полоса в макете в тёмном режиме в + // любой теме, и пока картинка не загрузилась, под затемнением чёрное. + const ColoredBox(color: Color(0xFF000000)), + if (stripe != null) Image(image: stripe!, fit: BoxFit.cover), + // Затемнение 30%, чтобы штампы читались на любой картинке. + const ColoredBox(color: Color(0x4D000000)), + if (emblem != null) + // Геометрия из макета: эмблема 179.5×205.8 в точке (212.5, −16.5) + // полосы 368×141.5 — всё в долях высоты полосы. + PositionedDirectional( + top: -0.1166 * height, + end: -0.17 * height, + height: 1.4545 * height, + child: Image(image: emblem!, fit: BoxFit.contain), + ), + if (_total > 0) + Align( + alignment: AlignmentDirectional.centerStart, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: PersonalizationSpacing.xl, + ), + // Больше штампов, чем влезает в ширину, — ряд ужимается, а не + // вылезает за карту. В макете их до пяти. + child: FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + for (int i = 0; i < _total; i++) ...[ + if (i > 0) + const SizedBox(width: PersonalizationSpacing.md), + // Полоса в макете всегда в тёмном режиме, поэтому + // штампы — постоянные светлые токены, а не текстовые + // цвета темы. + _stamp( + context, + filled: i < filled, + color: i < filled + ? colors.textLightSecondary + : colors.textLightHint, + ), + ], + ], + ), + ), + ), + ), + ], + ), + ); + } + + Widget _stamp( + BuildContext context, { + required bool filled, + required Color color, + }) { + final asset = filled + ? PersonalizationIcons.checkRosetteFill + : PersonalizationIcons.rosette; + return SizedBox( + width: _stampSize, + height: _stampSize, + child: + iconBuilder?.call(context, asset, _stampSize, color) ?? + CustomPaint( + painter: _StampPainter(filled: filled, color: color), + ), + ); + } + + Widget _info(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(PersonalizationSpacing.xl), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (int i = 0; i < fields.length; i++) ...[ + if (i > 0) const SizedBox(width: PersonalizationSpacing.gapModal), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + fields[i].label.toUpperCase(), + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: _labelStyle(context), + ), + Text( + fields[i].value, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: _style( + context, + fontSize: 28, + lineHeight: 32, + letterSpacingEm: -0.05, + ), + ), + ], + ), + ), + ], + ], + ), + ); + } + + Widget _code(BuildContext context) { + final theme = PersonalizationTheme.of(context); + return Padding( + padding: const EdgeInsets.fromLTRB( + PersonalizationSpacing.xl, + PersonalizationSpacing.xl3, + PersonalizationSpacing.xl, + PersonalizationSpacing.xl3, + ), + child: Align( + alignment: Alignment.bottomCenter, + child: DecoratedBox( + decoration: BoxDecoration( + // Белый Brand/White, а не токен фона: сканеру нужна белая подложка + // в обеих темах. + color: const Color(0xFFFFFFFF), + borderRadius: BorderRadius.circular(theme.radius.lg), + border: Border.all(color: theme.colors.lineGenericSubtle), + ), + child: Padding( + padding: const EdgeInsets.all(PersonalizationSpacing.xl2), + child: PersonalizationBarcode(code: code!), + ), + ), + ), + ); + } +} + +/// Штамп без [PersonalizationLoyaltyCard.iconBuilder]: те же контуры, что в +/// ассетах check-rosette-fill.svg и rosette.svg, — пакет не рисует SVG сам. +class _StampPainter extends CustomPainter { + const _StampPainter({required this.filled, required this.color}); + + final bool filled; + final Color color; + + static final Path _checkRosetteFill = _svgPath(_checkRosetteFillData); + static final Path _rosette = _svgPath(_rosetteData); + + @override + void paint(Canvas canvas, Size size) { + canvas + ..save() + ..scale(size.width / 32, size.height / 32) + ..drawPath(filled ? _checkRosetteFill : _rosette, Paint()..color = color) + ..restore(); + } + + @override + bool shouldRepaint(_StampPainter oldDelegate) => + oldDelegate.filled != filled || oldDelegate.color != color; +} + +/// Контур из атрибута `d`: Figma экспортирует эти иконки абсолютными M, L, C и +/// Z. Сдвиг 0.6281 — из атрибута transform: контур 30.74 в рамке 32. Заливка +/// even-odd — так дырки (галочка, внутренний контур) вырезаются при любом +/// направлении обхода. +Path _svgPath(String data) { + final tokens = RegExp( + r'[MLCZ]|-?\d*\.?\d+', + ).allMatches(data).map((match) => match[0]!).toList(); + final path = Path()..fillType = PathFillType.evenOdd; + String command = 'M'; + int i = 0; + double next() => double.parse(tokens[i++]); + while (i < tokens.length) { + switch (tokens[i]) { + case 'M' || 'L' || 'C': + command = tokens[i++]; + case 'Z': + path.close(); + i++; + default: + switch (command) { + case 'M': + path.moveTo(next(), next()); + // Следующие пары после M — неявные L. + command = 'L'; + case 'L': + path.lineTo(next(), next()); + case 'C': + path.cubicTo(next(), next(), next(), next(), next(), next()); + } + } + } + return path.shift(const Offset(0.6281, 0.6281)); +} + +const String _checkRosetteFillData = + 'M13.4256 0.716651C14.5469 -0.238881 16.1969 -0.238887 17.3182 0.716651' + 'L20.12 3.10435C20.2801 3.24076 20.4796 3.32296 20.6893 3.3397' + 'L24.3592 3.63267C25.8276 3.74997 26.9939 4.91624 27.1112 6.38462' + 'L27.4042 10.0545C27.4209 10.2642 27.503 10.4638 27.6395 10.6239' + 'L30.0272 13.4256C30.9826 14.5469 30.9827 16.197 30.0272 17.3182' + 'L27.6395 20.12C27.503 20.2801 27.4209 20.4795 27.4042 20.6893' + 'L27.1112 24.3592C26.9939 25.8276 25.8276 26.9939 24.3592 27.1112' + 'L20.6893 27.4042C20.4795 27.4209 20.2801 27.503 20.12 27.6395' + 'L17.3182 30.0272C16.197 30.9827 14.5469 30.9826 13.4256 30.0272' + 'L10.6239 27.6395C10.4638 27.503 10.2642 27.4209 10.0545 27.4042' + 'L6.38462 27.1112C4.91624 26.9939 3.74998 25.8276 3.63267 24.3592' + 'L3.3397 20.6893C3.32296 20.4796 3.24076 20.2801 3.10435 20.12' + 'L0.716651 17.3182C-0.238887 16.1969 -0.23888 14.5469 0.716651 13.4256' + 'L3.10435 10.6239C3.2408 10.4637 3.32294 10.2643 3.3397 10.0545' + 'L3.63267 6.38462C3.74991 4.91619 4.91619 3.74991 6.38462 3.63267' + 'L10.0545 3.3397C10.2643 3.32294 10.4637 3.2408 10.6239 3.10435' + 'L13.4256 0.716651Z' + 'M21.579 11.1649C21.1884 10.7744 20.5554 10.7744 20.1649 11.1649' + 'L13.3719 17.9579L10.579 15.1649' + 'C10.1884 14.7744 9.55542 14.7744 9.16489 15.1649' + 'C8.77437 15.5554 8.77437 16.1884 9.16489 16.579L12.6649 20.079' + 'C13.0554 20.4693 13.6885 20.4694 14.079 20.079L21.579 12.579' + 'C21.9694 12.1885 21.9693 11.5554 21.579 11.1649Z'; + +const String _rosetteData = + 'M13.4256 0.716656C14.5469 -0.238886 16.1969 -0.238885 17.3182 0.716656' + 'L20.12 3.10435C20.2801 3.24084 20.4795 3.32296 20.6893 3.3397' + 'L24.3592 3.63267C25.8277 3.74991 26.9939 4.91619 27.1112 6.38462' + 'L27.4042 10.0545C27.4209 10.2643 27.503 10.4637 27.6395 10.6239' + 'L30.0272 13.4256C30.9827 14.5469 30.9827 16.1969 30.0272 17.3182' + 'L27.6395 20.12C27.503 20.2801 27.4209 20.4795 27.4042 20.6893' + 'L27.1112 24.3592C26.9939 25.8277 25.8277 26.9939 24.3592 27.1112' + 'L20.6893 27.4042C20.4795 27.4209 20.2801 27.503 20.12 27.6395' + 'L17.3182 30.0272C16.1969 30.9827 14.5469 30.9827 13.4256 30.0272' + 'L10.6239 27.6395C10.4637 27.503 10.2643 27.4209 10.0545 27.4042' + 'L6.38462 27.1112C4.91619 26.9939 3.74991 25.8277 3.63267 24.3592' + 'L3.3397 20.6893C3.32296 20.4795 3.24084 20.2801 3.10435 20.12' + 'L0.716656 17.3182C-0.238886 16.1969 -0.238885 14.5469 0.716656 13.4256' + 'L3.10435 10.6239C3.24084 10.4637 3.32296 10.2643 3.3397 10.0545' + 'L3.63267 6.38462C3.74991 4.91619 4.91619 3.74991 6.38462 3.63267' + 'L10.0545 3.3397C10.2643 3.32296 10.4637 3.24084 10.6239 3.10435' + 'L13.4256 0.716656Z' + 'M16.0204 2.23814C15.6467 1.91997 15.0971 1.91997 14.7235 2.23814' + 'L11.9208 4.62681C11.4403 5.03612 10.8429 5.28364 10.2137 5.33384' + 'L6.5438 5.62681C6.05435 5.66591 5.66591 6.05436 5.62681 6.5438' + 'L5.33384 10.2137C5.28364 10.8429 5.03612 11.4403 4.62681 11.9208' + 'L2.23814 14.7235C1.91997 15.0971 1.91997 15.6467 2.23814 16.0204' + 'L4.62681 18.8231C5.03612 19.3035 5.28364 19.901 5.33384 20.5301' + 'L5.62681 24.2001C5.66591 24.6895 6.05436 25.078 6.5438 25.117' + 'L10.2137 25.41C10.8429 25.4602 11.4403 25.7077 11.9208 26.117' + 'L14.7235 28.5057C15.0971 28.8239 15.6467 28.8239 16.0204 28.5057' + 'L18.8231 26.117C19.3035 25.7077 19.901 25.4602 20.5301 25.41' + 'L24.2001 25.117C24.6895 25.078 25.078 24.6895 25.117 24.2001' + 'L25.41 20.5301C25.4602 19.901 25.7077 19.3035 26.117 18.8231' + 'L28.5057 16.0204C28.8239 15.6467 28.8239 15.0971 28.5057 14.7235' + 'L26.117 11.9208C25.7077 11.4403 25.4602 10.8429 25.41 10.2137' + 'L25.117 6.5438C25.078 6.05435 24.6895 5.66591 24.2001 5.62681' + 'L20.5301 5.33384C19.901 5.28364 19.3035 5.03612 18.8231 4.62681' + 'L16.0204 2.23814Z'; diff --git a/lib/src/ui/components/personalization_toast.dart b/lib/src/ui/components/personalization_toast.dart new file mode 100644 index 0000000..12eee33 --- /dev/null +++ b/lib/src/ui/components/personalization_toast.dart @@ -0,0 +1,219 @@ +import 'dart:async'; + +import 'package:flutter/semantics.dart'; +import 'package:flutter/widgets.dart'; + +import '../personalization_elevation.dart'; +import '../personalization_spacing.dart'; +import '../personalization_theme.dart'; + +/// У какого края экрана показать тост. +enum PersonalizationToastPosition { top, bottom } + +/// Тост: короткое сообщение-«пилюля» поверх экрана. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Components, секция Toast +/// (367:16179), компонент 367:16178. На странице Stories он же во фреймах +/// 367:16063 (снизу, «Copied») и 367:16106 (сверху, «Code copied to clipboard»). +/// +/// Скругление — радиус Toast (999, то есть половина высоты), заливка +/// Background/Float, тень Elevation 2 цветом Shadow/Heavy темы. Поля 16 по +/// вертикали и 20 по горизонтали, текст 18/18 Medium по центру — однострочный +/// тост высотой 50. В макете текст залит сырым #000 без переменной, здесь +/// Text/Primary, чтобы тост работал и в тёмной теме. +/// +/// Сам виджет — только пилюля. Показывает её [show]: поверх текущего экрана, по +/// центру, в 16 от края безопасной зоны, с появлением и исчезанием. +class PersonalizationToast extends StatelessWidget { + const PersonalizationToast({super.key, required this.text}); + + final String text; + + /// Появление и исчезание. + static const Duration fadeDuration = Duration(milliseconds: 200); + + static _ShownToast? _current; + + /// Показывает тост поверх текущего экрана и через [duration] убирает. + /// + /// Кладётся в корневой [Overlay]: тост относится ко всему экрану, а не к + /// вложенному навигатору. По центру, в 16 от края безопасной зоны; снизу — ещё + /// и над клавиатурой, иначе она его закроет. Ширина — не больше экрана без + /// 16 с каждой стороны, длинный текст переносится. + /// + /// Новый вызов заменяет тост, который ещё на экране, — стопкой они не + /// копятся. Касания тост не перехватывает: всё под ним нажимается как + /// обычно. Скринридеру текст объявляется. + static void show( + BuildContext context, + String text, { + PersonalizationToastPosition position = PersonalizationToastPosition.bottom, + Duration duration = const Duration(milliseconds: 2000), + }) { + final overlay = Overlay.of(context, rootOverlay: true); + _current?.remove(); + + final toast = _ShownToast(); + toast.entry = OverlayEntry( + builder: (context) => _ToastLayer( + text: text, + position: position, + duration: duration, + onHidden: toast.remove, + ), + ); + _current = toast; + overlay.insert(toast.entry!); + _announce(context, text); + } + + // Где платформа умеет объявления (iOS, веб), текст объявляется явно. На + // Android объявления устарели — там тост помечен живой областью, и TalkBack + // зачитывает его сам (см. [_ToastLayer]). + static void _announce(BuildContext context, String text) { + if (!(MediaQuery.maybeSupportsAnnounceOf(context) ?? false)) return; + final view = View.maybeOf(context); + if (view == null) return; + unawaited( + SemanticsService.sendAnnouncement( + view, + text, + Directionality.maybeOf(context) ?? TextDirection.ltr, + ), + ); + } + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + return DecoratedBox( + decoration: BoxDecoration( + color: colors.backgroundFloat, + borderRadius: BorderRadius.circular(theme.radius.toast), + // Цвет тени из темы: в тёмной схеме Shadow/Heavy плотнее. + boxShadow: [ + for (final shadow in PersonalizationElevation.e2) + shadow.copyWith(color: colors.shadowHeavy), + ], + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: PersonalizationSpacing.xl, + horizontal: PersonalizationSpacing.xl2, + ), + child: Text( + text, + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 18, + height: 1, // 18 / 18 + fontWeight: FontWeight.w500, + letterSpacing: 0, + fontFamily: theme.fontFamily.familyFor(FontWeight.w500), + package: theme.fontFamily.package, + color: colors.textPrimary, + ), + ), + ), + ); + } +} + +/// Показанный тост: его запись в оверлее. Убирается один раз — по окончании +/// исчезания или когда его сменяет следующий. +class _ShownToast { + OverlayEntry? entry; + + void remove() { + final shown = entry; + if (shown == null) return; + entry = null; + if (identical(PersonalizationToast._current, this)) { + PersonalizationToast._current = null; + } + shown + ..remove() + ..dispose(); + } +} + +/// Слой тоста в оверлее: раскладка по краю экрана, появление, таймер, исчезание. +class _ToastLayer extends StatefulWidget { + const _ToastLayer({ + required this.text, + required this.position, + required this.duration, + required this.onHidden, + }); + + final String text; + final PersonalizationToastPosition position; + final Duration duration; + final VoidCallback onHidden; + + @override + State<_ToastLayer> createState() => _ToastLayerState(); +} + +class _ToastLayerState extends State<_ToastLayer> + with SingleTickerProviderStateMixin { + late final AnimationController _opacity; + Timer? _timer; + + @override + void initState() { + super.initState(); + _opacity = AnimationController( + vsync: this, + duration: PersonalizationToast.fadeDuration, + )..forward(); + _timer = Timer(widget.duration, _hide); + } + + // Будущее обратной анимации завершается только если она доиграла: сменённый + // тост убирается сразу, и второй раз onHidden не придёт. + void _hide() => _opacity.reverse().then((_) => widget.onHidden()); + + @override + void dispose() { + _timer?.cancel(); + _opacity.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final safe = MediaQuery.paddingOf(context); + final keyboard = MediaQuery.viewInsetsOf(context).bottom; + final top = widget.position == PersonalizationToastPosition.top; + const edge = PersonalizationSpacing.xl; + + return IgnorePointer( + child: Align( + alignment: top ? Alignment.topCenter : Alignment.bottomCenter, + child: Padding( + padding: EdgeInsets.fromLTRB( + safe.left + edge, + top ? safe.top + edge : 0, + safe.right + edge, + top ? 0 : safe.bottom + keyboard + edge, + ), + child: FadeTransition( + opacity: _opacity, + child: Semantics( + container: true, + liveRegion: !MediaQuery.supportsAnnounceOf(context), + // В корневом оверлее нет Material, и Text взял бы аварийный стиль + // приложения — моноширинный с жёлтым подчёркиванием. + child: DefaultTextStyle( + style: const TextStyle(), + child: PersonalizationToast(text: widget.text), + ), + ), + ), + ), + ), + ); + } +} diff --git a/lib/src/ui/personalization_icons.dart b/lib/src/ui/personalization_icons.dart index 32c95f7..8b4dd40 100644 --- a/lib/src/ui/personalization_icons.dart +++ b/lib/src/ui/personalization_icons.dart @@ -18,6 +18,8 @@ abstract final class PersonalizationIcons { 'packages/rees46_sdk/assets/icons/arrow-rotate-cw.svg'; static const String arrowsUpDown = 'packages/rees46_sdk/assets/icons/arrows-up-down.svg'; + static const String checkRosetteFill = + 'packages/rees46_sdk/assets/icons/check-rosette-fill.svg'; static const String copy = 'packages/rees46_sdk/assets/icons/copy.svg'; static const String crossLarge = 'packages/rees46_sdk/assets/icons/cross-large.svg'; @@ -32,6 +34,7 @@ abstract final class PersonalizationIcons { static const String list = 'packages/rees46_sdk/assets/icons/list.svg'; static const String magnifier = 'packages/rees46_sdk/assets/icons/magnifier.svg'; + static const String rosette = 'packages/rees46_sdk/assets/icons/rosette.svg'; static const String spacingMd = 'packages/rees46_sdk/assets/icons/spacing-md.svg'; static const String starFill = @@ -44,6 +47,7 @@ abstract final class PersonalizationIcons { arrowLeft, arrowRotateCw, arrowsUpDown, + checkRosetteFill, copy, crossLarge, cross, @@ -53,6 +57,7 @@ abstract final class PersonalizationIcons { listFill, list, magnifier, + rosette, spacingMd, starFill, ]; diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index 53e5849..e9e8ae9 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -51,6 +51,11 @@ export 'components/personalization_suggestion_row.dart'; export 'components/personalization_instant_search.dart'; export 'components/personalization_filters.dart'; export 'components/personalization_catalog.dart'; +export 'components/personalization_toast.dart'; +// Кодировщик Code 128 (personalization_code128.dart) не экспортируется — это +// внутренность штрихкода. +export 'components/personalization_barcode.dart'; +export 'components/personalization_loyalty_card.dart'; // Виджеты с данными SDK: сами резолвят инстанс по shopId, ходят в поиск и держат состояние. export 'widgets/search_support.dart' show PersonalizationSearchCategory; diff --git a/test/ui/personalization_barcode_test.dart b/test/ui/personalization_barcode_test.dart new file mode 100644 index 0000000..5e1a33e --- /dev/null +++ b/test/ui/personalization_barcode_test.dart @@ -0,0 +1,111 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +// The encoder is internal to the barcode and stays out of the kit barrel. +import 'package:rees46_sdk/src/ui/components/personalization_code128.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +String _bits(List modules) => + modules.map((bar) => bar ? '1' : '0').join(); + +Widget _host(Widget child) => MaterialApp( + home: Align(alignment: Alignment.topLeft, child: child), +); + +void main() { + group('Code 128 encoder', () { + test('letters and digits go to set B', () { + final values = PersonalizationCode128.values('PJJ123C')!; + // Start B, the data, then the checksum. + expect(values, [104, 48, 42, 42, 17, 18, 19, 35, 55]); + expect(PersonalizationCode128.checksum(values.sublist(0, 8)), 55); + + final bits = _bits(PersonalizationCode128.encode('PJJ123C')!); + expect(bits, hasLength(112)); + expect(bits.substring(0, 11), '11010010000'); + expect(bits.substring(bits.length - 13), '1100011101011'); + }); + + test('an even run of digits goes to set C in pairs', () { + expect(PersonalizationCode128.values('1234'), [105, 12, 34, 82]); + + final bits = _bits(PersonalizationCode128.encode('1234')!); + expect(bits, hasLength(57)); + expect(bits.substring(0, 11), '11010011100'); + expect(bits.substring(bits.length - 13), '1100011101011'); + }); + + test('an odd run of digits ends in set B through CODE B', () { + expect(PersonalizationCode128.values('123'), [105, 12, 100, 19, 65]); + expect(PersonalizationCode128.encode('123'), hasLength(68)); + }); + + test('a single digit is not worth set C', () { + expect(PersonalizationCode128.values('7')!.first, 104); + }); + + test('empty or non-ASCII input is not encodable', () { + expect(PersonalizationCode128.values(''), isNull); + expect(PersonalizationCode128.encode(''), isNull); + expect(PersonalizationCode128.encode('é'), isNull); + expect(PersonalizationCode128.encode('tab\there'), isNull); + }); + }); + + group('PersonalizationBarcode', () { + testWidgets('the module is a whole number of physical pixels', ( + tester, + ) async { + addTearDown(tester.view.reset); + // 112 modules into 232: 6 px at 3x, 4 px at 2x, 5 px at 2.625x. + const cases = <(double, double)>[(3, 6), (2, 4), (2.625, 5)]; + for (final (dpr, pixels) in cases) { + tester.view.devicePixelRatio = dpr; + await tester.pumpWidget( + _host(const PersonalizationBarcode(code: 'PJJ123C')), + ); + + final size = tester.getSize(find.byType(PersonalizationBarcode)); + expect(size.width, closeTo(112 * pixels / dpr, 1e-9), reason: '$dpr'); + expect(size.height, 42, reason: '$dpr'); + } + }); + + testWidgets('a narrower slot gets a smaller whole module', (tester) async { + addTearDown(tester.view.reset); + tester.view.devicePixelRatio = 3; + await tester.pumpWidget( + _host( + ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 120), + child: const PersonalizationBarcode(code: 'PJJ123C'), + ), + ), + ); + + // floor(120 * 3 / 112) = 3 px — one logical unit per module. + expect(tester.getSize(find.byType(PersonalizationBarcode)).width, 112); + }); + + testWidgets('an unencodable code takes no space', (tester) async { + for (final code in ['', 'é']) { + await tester.pumpWidget(_host(PersonalizationBarcode(code: code))); + + expect( + tester.getSize(find.byType(PersonalizationBarcode)), + Size.zero, + reason: code, + ); + } + }); + + testWidgets('a screen reader reads the code', (tester) async { + final semantics = tester.ensureSemantics(); + await tester.pumpWidget( + _host(const PersonalizationBarcode(code: '2000012345678')), + ); + + expect(find.bySemanticsLabel('2000012345678'), findsOneWidget); + semantics.dispose(); + }); + }); +} diff --git a/test/ui/personalization_loyalty_card_test.dart b/test/ui/personalization_loyalty_card_test.dart new file mode 100644 index 0000000..d919310 --- /dev/null +++ b/test/ui/personalization_loyalty_card_test.dart @@ -0,0 +1,311 @@ +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +/// A 1×1 transparent PNG: the tests only need an [ImageProvider] to exist. +final ImageProvider _pixel = MemoryImage( + Uint8List.fromList(const [ + 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, // + 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, // + 0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, // + 0x0A, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, // + 0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x49, // + 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82, // + ]), +); + +const List _fields = [ + PersonalizationLoyaltyCardField(label: 'Владелец', value: 'Олег'), + PersonalizationLoyaltyCardField(label: 'Уровень', value: 'Базовый'), +]; + +/// The card in a vertical scroll view, as a host screen would place it: the +/// height is unbounded, the width is [width]. +Widget _host(Widget card, {double width = 370, ThemeData? theme}) => + MaterialApp( + theme: theme, + home: Scaffold( + body: SingleChildScrollView( + child: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: width, child: card), + ), + ), + ), + ); + +PersonalizationLoyaltyCard _full({ + int stamps = 0, + int stampsTotal = 5, + Widget Function(BuildContext, String, double, Color)? iconBuilder, +}) => PersonalizationLoyaltyCard( + logo: const SizedBox(width: 108), + balanceLabel: 'Бонусы', + balanceValue: '50 550', + stripe: _pixel, + emblem: _pixel, + stamps: stamps, + stampsTotal: stampsTotal, + fields: _fields, + code: '2000012345678', + iconBuilder: iconBuilder, +); + +Rect _card(WidgetTester tester) => + tester.getRect(find.byType(PersonalizationLoyaltyCard)); + +final Finder _stripe = find.byWidgetPredicate( + (widget) => widget is ColoredBox && widget.color == const Color(0xFF000000), +); + +void main() { + testWidgets('the minimum height keeps the 370×560 pass proportion', ( + tester, + ) async { + for (final width in [370, 300, 343]) { + await tester.pumpWidget( + _host(const PersonalizationLoyaltyCard(), width: width), + ); + + expect( + _card(tester).height, + closeTo(width * 560 / 370, 1e-9), + reason: '$width', + ); + } + }); + + testWidgets('the full card fits the proportion and pins the code low', ( + tester, + ) async { + await tester.pumpWidget(_host(_full())); + + final card = _card(tester); + expect(card.height, closeTo(560, 1e-9)); + // Code section: 24 below the white box, 20 inside it. + final barcode = tester.getRect(find.byType(PersonalizationBarcode)); + expect(barcode.bottom, closeTo(card.bottom - 24 - 20, 1e-9)); + expect(barcode.center.dx, closeTo(card.center.dx, 1)); + }); + + testWidgets('a card narrower than its content grows past the proportion', ( + tester, + ) async { + await tester.pumpWidget(_host(_full(), width: 200)); + + // Header 16 + 38 + 16, stripe 200 / 2.6, info 16 + 46 + 16, + // code 24 + 20 + 42 + 20 + 24. + expect(_card(tester).height, closeTo(70 + 200 / 2.6 + 78 + 130, 1e-6)); + expect(tester.takeException(), isNull); + }); + + testWidgets('sections without content are left out', (tester) async { + await tester.pumpWidget(_host(const PersonalizationLoyaltyCard())); + expect(find.byType(Text), findsNothing); + expect(_stripe, findsNothing); + expect(find.byType(PersonalizationBarcode), findsNothing); + + // Only the info fields: no header and no stripe above them. + await tester.pumpWidget( + _host(const PersonalizationLoyaltyCard(fields: _fields)), + ); + expect( + tester.getTopLeft(find.text('ВЛАДЕЛЕЦ')).dy, + _card(tester).top + PersonalizationSpacing.xl, + ); + + // A code the barcode cannot carry drops the section. + for (final code in ['', 'é']) { + await tester.pumpWidget(_host(PersonalizationLoyaltyCard(code: code))); + expect(find.byType(PersonalizationBarcode), findsNothing, reason: code); + } + + // The balance shows only the lines it has. + await tester.pumpWidget( + _host(const PersonalizationLoyaltyCard(balanceValue: '50 550')), + ); + expect(find.byType(Text), findsOneWidget); + expect(find.text('50 550'), findsOneWidget); + }); + + testWidgets('the stripe shows for a picture, an emblem or stamps', ( + tester, + ) async { + final cards = [ + PersonalizationLoyaltyCard(stripe: _pixel), + PersonalizationLoyaltyCard(emblem: _pixel), + const PersonalizationLoyaltyCard(stampsTotal: 3), + ]; + for (final card in cards) { + await tester.pumpWidget(_host(card)); + + expect(_stripe, findsOneWidget); + final stripe = tester.getRect( + find.ancestor(of: _stripe, matching: find.byType(SizedBox)).first, + ); + expect(stripe.width, 370); + expect(stripe.height, closeTo(370 / 2.6, 1e-9)); + } + }); + + testWidgets('stamps are clamped to the total, filled ones first', ( + tester, + ) async { + const light = PersonalizationColors.light; + const cases = <(int, int, int)>[ + // stamps, total, filled + (0, 5, 0), + (4, 5, 4), + (7, 5, 5), + (-2, 3, 0), + (2, -1, 0), + ]; + for (final (stamps, total, filled) in cases) { + final drawn = <(String, Color)>[]; + await tester.pumpWidget( + _host( + _full( + stamps: stamps, + stampsTotal: total, + iconBuilder: (context, asset, size, color) { + drawn.add((asset, color)); + return SizedBox.square(dimension: size); + }, + ), + ), + ); + + final reason = '$stamps of $total'; + final expected = total < 0 ? 0 : total; + expect(drawn, hasLength(expected), reason: reason); + for (final (index, (asset, color)) in drawn.indexed) { + final isFilled = index < filled; + expect( + asset, + isFilled + ? PersonalizationIcons.checkRosetteFill + : PersonalizationIcons.rosette, + reason: reason, + ); + // Constant light tokens: the stripe is dark in either theme. + expect( + color, + isFilled ? light.textLightSecondary : light.textLightHint, + reason: reason, + ); + } + } + }); + + testWidgets('without an iconBuilder the kit draws the stamps itself', ( + tester, + ) async { + await tester.pumpWidget( + _host(const PersonalizationLoyaltyCard(stamps: 2, stampsTotal: 5)), + ); + + final stamps = find.descendant( + of: find.byType(PersonalizationLoyaltyCard), + matching: find.byType(CustomPaint), + ); + expect(stamps, findsNWidgets(5)); + expect(tester.getSize(stamps.first), const Size(32, 32)); + }); + + testWidgets('info fields share the width equally', (tester) async { + await tester.pumpWidget( + _host(const PersonalizationLoyaltyCard(fields: _fields)), + ); + + const pad = PersonalizationSpacing.xl; + const gap = PersonalizationSpacing.gapModal; + const column = (370 - 2 * pad - gap) / 2; + expect(tester.getTopLeft(find.text('ВЛАДЕЛЕЦ')).dx, pad); + expect(tester.getTopLeft(find.text('УРОВЕНЬ')).dx, pad + column + gap); + }); + + testWidgets('the palette follows the theme and yields to overrides', ( + tester, + ) async { + final schemes = <(ThemeData, PersonalizationColors)>[ + (ThemeData(), PersonalizationColors.light), + (ThemeData(brightness: Brightness.dark), PersonalizationColors.dark), + ]; + for (final (theme, colors) in schemes) { + await tester.pumpWidget(_host(_full(), theme: theme)); + // MaterialApp animates a theme change. + await tester.pumpAndSettle(); + + final reason = '${theme.brightness}'; + expect( + find.byWidgetPredicate( + (widget) => + widget is ColoredBox && widget.color == colors.backgroundCard, + ), + findsOneWidget, + reason: reason, + ); + for (final text in ['БОНУСЫ', '50 550', 'ВЛАДЕЛЕЦ', 'Олег']) { + expect( + tester.widget(find.text(text)).style!.color, + colors.textPrimary, + reason: '$reason, $text', + ); + } + // The barcode keeps its white box in either theme. + final box = tester.widget( + find + .ancestor( + of: find.byType(PersonalizationBarcode), + matching: find.byType(DecoratedBox), + ) + .first, + ); + expect( + (box.decoration as BoxDecoration).color, + const Color(0xFFFFFFFF), + reason: reason, + ); + // Elevation 3 in the scheme's shadow colour. + final shadow = tester.widget( + find + .descendant( + of: find.byType(PersonalizationLoyaltyCard), + matching: find.byType(DecoratedBox), + ) + .first, + ); + final shadows = (shadow.decoration as BoxDecoration).boxShadow!; + expect(shadows, hasLength(PersonalizationElevation.e3.length)); + for (final (index, cast) in shadows.indexed) { + expect(cast.offset, PersonalizationElevation.e3[index].offset); + expect(cast.color, colors.shadowHeavy, reason: reason); + } + } + + const brand = Color(0xFF0087E8); + const white = Color(0xFFFFFFFF); + await tester.pumpWidget( + _host( + const PersonalizationLoyaltyCard( + balanceLabel: 'Бонусы', + balanceValue: '50 550', + fields: _fields, + cardColor: brand, + contentColor: white, + ), + ), + ); + await tester.pumpAndSettle(); + expect( + find.byWidgetPredicate( + (widget) => widget is ColoredBox && widget.color == brand, + ), + findsOneWidget, + ); + expect(tester.widget(find.text('БОНУСЫ')).style!.color, white); + expect(tester.widget(find.text('Базовый')).style!.color, white); + }); +} diff --git a/test/ui/personalization_toast_test.dart b/test/ui/personalization_toast_test.dart new file mode 100644 index 0000000..086fd6f --- /dev/null +++ b/test/ui/personalization_toast_test.dart @@ -0,0 +1,288 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +const Duration _fade = PersonalizationToast.fadeDuration; + +/// A screen with a button that shows a toast, and a counter of taps on the +/// area under it. +class _Screen extends StatelessWidget { + const _Screen({required this.onShow, required this.onBackgroundTap}); + + final void Function(BuildContext context) onShow; + final VoidCallback onBackgroundTap; + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Positioned.fill( + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: onBackgroundTap, + ), + ), + Center( + child: Builder( + builder: (context) => TextButton( + onPressed: () => onShow(context), + child: const Text('show'), + ), + ), + ), + ], + ); + } +} + +Future _pumpScreen( + WidgetTester tester, { + required void Function(BuildContext context) onShow, + VoidCallback? onBackgroundTap, +}) { + return tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: _Screen( + onShow: onShow, + onBackgroundTap: onBackgroundTap ?? () {}, + ), + ), + ), + ); +} + +void main() { + testWidgets('the pill is 50 high, float-coloured, with Elevation 2', ( + tester, + ) async { + await tester.pumpWidget( + const MaterialApp( + home: Center(child: PersonalizationToast(text: 'Copied')), + ), + ); + + expect(tester.getSize(find.byType(PersonalizationToast)).height, 50); + final decoration = + tester + .widget( + find.descendant( + of: find.byType(PersonalizationToast), + matching: find.byType(DecoratedBox), + ), + ) + .decoration + as BoxDecoration; + expect(decoration.color, PersonalizationColors.light.backgroundFloat); + expect( + decoration.borderRadius, + BorderRadius.circular(PersonalizationRadius.toast), + ); + expect(decoration.boxShadow, hasLength(PersonalizationElevation.e2.length)); + for (int i = 0; i < decoration.boxShadow!.length; i++) { + expect( + decoration.boxShadow![i].offset, + PersonalizationElevation.e2[i].offset, + ); + expect( + decoration.boxShadow![i].color, + PersonalizationColors.light.shadowHeavy, + ); + } + final style = tester.widget(find.text('Copied')).style!; + expect(style.fontWeight, FontWeight.w500); + expect(style.color, PersonalizationColors.light.textPrimary); + }); + + testWidgets('shows at the bottom and hides after the duration', ( + tester, + ) async { + addTearDown(tester.view.reset); + tester.view.devicePixelRatio = 1; + tester.view.physicalSize = const Size(400, 800); + tester.view.padding = const FakeViewPadding(top: 40, bottom: 30); + + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show( + context, + 'Copied', + duration: const Duration(seconds: 1), + ), + ); + await tester.tap(find.text('show')); + await tester.pump(); + await tester.pump(_fade); + + expect(find.text('Copied'), findsOneWidget); + final pill = tester.getRect(find.byType(PersonalizationToast)); + expect(pill.bottom, 800 - 30 - 16); + expect(pill.center.dx, 200); + + // Still there just before the duration runs out. + await tester.pump(const Duration(seconds: 1) - _fade - _ms); + expect(find.text('Copied'), findsOneWidget); + + await tester.pump(_ms); + await tester.pumpAndSettle(); + expect(find.text('Copied'), findsNothing); + }); + + testWidgets('shows at the top below the safe area', (tester) async { + addTearDown(tester.view.reset); + tester.view.devicePixelRatio = 1; + tester.view.physicalSize = const Size(400, 800); + tester.view.padding = const FakeViewPadding(top: 40, bottom: 30); + + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show( + context, + 'Code copied to clipboard', + position: PersonalizationToastPosition.top, + ), + ); + await tester.tap(find.text('show')); + await tester.pump(); + await tester.pump(_fade); + + expect(tester.getRect(find.byType(PersonalizationToast)).top, 40 + 16); + + await _runOut(tester); + expect(find.byType(PersonalizationToast), findsNothing); + }); + + testWidgets('a long text wraps inside the screen width less 16 a side', ( + tester, + ) async { + addTearDown(tester.view.reset); + tester.view.devicePixelRatio = 1; + tester.view.physicalSize = const Size(400, 800); + + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show(context, 'word ' * 40), + ); + await tester.tap(find.text('show')); + await tester.pump(); + + final pill = tester.getRect(find.byType(PersonalizationToast)); + expect(pill.left, 16); + expect(pill.right, 400 - 16); + expect(pill.height, greaterThan(50)); + + await _runOut(tester); + }); + + testWidgets('a new toast replaces the one on screen', (tester) async { + await _pumpScreen( + tester, + onShow: (context) { + PersonalizationToast.show(context, 'First'); + PersonalizationToast.show(context, 'Second'); + }, + ); + await tester.tap(find.text('show')); + await tester.pump(); + + expect(find.text('First'), findsNothing); + expect(find.text('Second'), findsOneWidget); + expect(find.byType(PersonalizationToast), findsOneWidget); + + await _runOut(tester); + expect(find.byType(PersonalizationToast), findsNothing); + }); + + testWidgets('the replaced toast\'s timer does not cut the new one short', ( + tester, + ) async { + late BuildContext screen; + await _pumpScreen(tester, onShow: (context) => screen = context); + await tester.tap(find.text('show')); + + PersonalizationToast.show(screen, 'First'); + await tester.pump(const Duration(milliseconds: 1500)); + PersonalizationToast.show(screen, 'Second'); + await tester.pump(); + + // The first one's two seconds are up; the second has shown for 0.5 s. + await tester.pump(const Duration(milliseconds: 1000)); + expect(find.text('Second'), findsOneWidget); + + await _runOut(tester); + expect(find.byType(PersonalizationToast), findsNothing); + }); + + testWidgets('touches go through to the screen underneath', (tester) async { + int taps = 0; + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show(context, 'Copied'), + onBackgroundTap: () => taps++, + ); + await tester.tap(find.text('show')); + await tester.pump(); + await tester.pump(_fade); + + await tester.tapAt(tester.getCenter(find.byType(PersonalizationToast))); + expect(taps, 1); + + await _runOut(tester); + }); + + testWidgets('the text is announced where the platform supports it', ( + tester, + ) async { + tester.platformDispatcher.accessibilityFeaturesTestValue = + const FakeAccessibilityFeatures(supportsAnnounce: true); + addTearDown(tester.platformDispatcher.clearAccessibilityFeaturesTestValue); + + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show(context, 'Copied'), + ); + await tester.tap(find.text('show')); + await tester.pump(); + + expect( + tester.takeAnnouncements().map((announcement) => announcement.message), + contains('Copied'), + ); + + await _runOut(tester); + }); + + testWidgets('without announcements the toast is a live region', ( + tester, + ) async { + // Android: announcement events are deprecated there. + tester.platformDispatcher.accessibilityFeaturesTestValue = + const FakeAccessibilityFeatures(); + addTearDown(tester.platformDispatcher.clearAccessibilityFeaturesTestValue); + final semantics = tester.ensureSemantics(); + await _pumpScreen( + tester, + onShow: (context) => PersonalizationToast.show(context, 'Copied'), + ); + await tester.tap(find.text('show')); + await tester.pump(); + // Fully transparent, the toast is left out of the semantics tree. + await tester.pump(_fade); + + expect( + tester.getSemantics(find.byType(PersonalizationToast)), + isSemantics(label: 'Copied', isLiveRegion: true), + ); + + await _runOut(tester); + semantics.dispose(); + }); +} + +const Duration _ms = Duration(milliseconds: 1); + +/// Lets the default two seconds run out and the fade-out finish. +Future _runOut(WidgetTester tester) async { + await tester.pump(const Duration(seconds: 3)); + await tester.pumpAndSettle(); +} From 9231598fe8a21afe5592bd8017619c1493f4ff7d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 23 Sep 2026 17:26:29 +0400 Subject: [PATCH 41/79] feat(example): toast and loyalty card exhibits Blocks shows the toast pill and the presenter at both edges, and two loyalty cards filled as a host would: light with no stamps, brand blue with four of five. Components gets a Code 128 exhibit on a white plate; the icons exhibit lists the stamps by itself. The card art sits with the other showcase photos under assets/uikit; the logo is one 3x PNG given its height by the card and tinted to the content colour. --- example/assets/uikit/loyalty_emblem.png | Bin 0 -> 135223 bytes example/assets/uikit/loyalty_logo.png | Bin 0 -> 6945 bytes example/assets/uikit/loyalty_stripe.jpg | Bin 0 -> 72376 bytes example/lib/ui_kit_pane.dart | 95 +++++++++++++++++++++++- example/pubspec.yaml | 4 +- 5 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 example/assets/uikit/loyalty_emblem.png create mode 100644 example/assets/uikit/loyalty_logo.png create mode 100644 example/assets/uikit/loyalty_stripe.jpg diff --git a/example/assets/uikit/loyalty_emblem.png b/example/assets/uikit/loyalty_emblem.png new file mode 100644 index 0000000000000000000000000000000000000000..0354c3c00c5fdf2b9f04d5b30451b07755bab62e GIT binary patch literal 135223 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%0AL?8ab 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

Hh%nI8J_E%vHvtbJ+(( z^RCoqDqWF$5*r^9vaq_Z??ix z@s%JX2w)IH1;iFHt|dDdL5u9au@!;LFu0mS=ax=nY*>i&&xfn7&-i<&oXfCm?zQKmZ5aGXJhR1iYFSyIHZyAY!-XS*M z2!>O$cZ6ce!cz$S==$jr#vdpN9>M$z8qsbh24e-Gm-bOc<|dm`iP)s;ukd89QMokR z(LOm&&&bYVWY`{XbcS$Pk8TVyX^I$pAmJBX3?#1Yq8xYoF%zQOM#C4t#yq2Hw&U#@ zkLdv`<|6yLklkX~&q;{>AuxvGBr!*_^8Wz9Iz?{0#v*5{ZxIF~0zPo@6C>znBQp~M zAodPM8>xoP?6(!27uq+#MYb4k>{*E3CL4&Djq$%8YBa@QvHnWNfS5gt z{5T~;?-RylQ=~b}*AdEOX3PxCWd<_>J( literal 0 HcmV?d00001 diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index e131403..3f9b614 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -11,7 +11,8 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; /// /// "Components" walks through the primitives in every size, view and state the /// design file defines; "Blocks" shows the compositions built from them -/// (product cards, recommender layouts, instant search, the catalogue, the filters screen); +/// (product cards, recommender layouts, instant search, the catalogue, the filters screen, +/// in-app popups, the toast, the loyalty card); /// "Search" runs the two data-bound search widgets against the demo shop: the /// instant search field, and the results screen it opens on submit. /// Mirror of the Android `UiKitPane` / iOS `UIKitShowcaseViewController` / @@ -453,6 +454,23 @@ final List<_Exhibit> _componentExhibits = [ message: 'No results for your request.', ), ), + _Exhibit('Barcode — Code 128', (context) { + // The barcode brings no background of its own: scanners want white in + // either theme, so it sits on a white box, as it does on the loyalty card. + return Align( + alignment: Alignment.centerLeft, + child: DecoratedBox( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(PersonalizationRadius.lg), + ), + child: const Padding( + padding: EdgeInsets.all(20), + child: PersonalizationBarcode(code: _loyaltyCardNumber), + ), + ), + ); + }), _Exhibit('Icons — the full set, 24 dp', (context) { final color = PersonalizationTheme.of(context).colors.textPrimary; return _ScrollRow( @@ -624,6 +642,42 @@ final List<_Exhibit> _blockExhibits = [ fullscreen: true, ), ), + _Exhibit('Toast — top and bottom', (context) { + return _Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const PersonalizationToast(text: 'Copied'), + _ScrollRow( + children: [ + PersonalizationButton( + label: 'Show at the bottom', + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + onPressed: () => PersonalizationToast.show(context, 'Copied'), + ), + PersonalizationButton( + label: 'Show at the top', + size: PersonalizationButtonSize.md, + view: PersonalizationButtonView.secondary, + onPressed: () => PersonalizationToast.show( + context, + 'Code copied to clipboard', + position: PersonalizationToastPosition.top, + ), + ), + ], + ), + ], + ); + }), + _Exhibit( + 'Loyalty Card — light, stamps 0 of 5', + (context) => _loyaltyCard(context, stamps: 0), + ), + _Exhibit( + 'Loyalty Card — brand colour, stamps 4 of 5', + (context) => _loyaltyCard(context, stamps: 4, brand: true), + ), ]; void _snack(BuildContext context, String message) => ScaffoldMessenger.of( @@ -669,6 +723,45 @@ Widget _inAppPopup( ); } +/// The card number the loyalty exhibits encode. +const String _loyaltyCardNumber = '2000012345678'; + +/// The loyalty card as a host fills it. The SDK's loyalty status carries only +/// membership and the level, so the balance, the stamps and the card number +/// are the host's own data; the logo, stripe and emblem are demo art bundled +/// with the example — brand art does not ship in the SDK. +Widget _loyaltyCard( + BuildContext context, { + required int stamps, + bool brand = false, +}) { + // Semantic/Info from the design file's dark example; the kit has no token for it. + const brandBlue = Color(0xFF0087E8); + const white = Color(0xFFFFFFFF); + // The kit never tints the host's logo, so the demo tints it itself to the + // content colour: Text/Primary by default, white on the brand card. + final content = brand + ? white + : PersonalizationTheme.of(context).colors.textPrimary; + return PersonalizationLoyaltyCard( + logo: Image.asset('assets/uikit/loyalty_logo.png', color: content), + balanceLabel: 'Бонусы', + balanceValue: '50 550', + stripe: const AssetImage('assets/uikit/loyalty_stripe.jpg'), + emblem: const AssetImage('assets/uikit/loyalty_emblem.png'), + stamps: stamps, + stampsTotal: 5, + fields: const [ + PersonalizationLoyaltyCardField(label: 'Владелец', value: 'Олег'), + PersonalizationLoyaltyCardField(label: 'Уровень', value: 'Базовый'), + ], + code: _loyaltyCardNumber, + cardColor: brand ? brandBlue : null, + contentColor: brand ? white : null, + iconBuilder: _icon, + ); +} + // --- Stateful exhibits ------------------------------------------------------ class _ButtonGroupExhibit extends StatefulWidget { diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 00306d1..a3b4990 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -65,7 +65,9 @@ flutter: # the material Icons class. uses-material-design: true - # Photos for the UI Kit showcase — bundled so the demo does not depend on the network. + # Photos and loyalty-card art (logo, stripe, level emblem) for the UI Kit + # showcase — bundled so the demo does not depend on the network. Brand art is + # demo-only: the SDK does not ship it. assets: - assets/uikit/ From 4542c491a2cc1775c7e3ad0433e1d7990baab081 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 13:40:18 +0400 Subject: [PATCH 42/79] feat(example): category suggestions with pictures in the instant search exhibit The design gives categories pictures in the "with images" state as well, so the exhibit now shows them, using photos other than the three product rows below so the two sections do not repeat each other. --- example/lib/ui_kit_pane.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 3f9b614..c28290d 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -905,22 +905,25 @@ class _InstantSearchExhibitState extends State<_InstantSearchExhibit> { PersonalizationSuggestion(id: 'c3', title: 'Kids boots'), ] : [ - // Categories come without pictures: the search API returns none for - // them, so the "with images" state only illustrates product rows. + // The design gives categories pictures too. Photos other than the + // three products below, so the two sections do not repeat each other. PersonalizationSuggestion( id: 'c1', title: 'Running shoes', subtitle: 'Shoes', + image: _image('sneakers'), ), PersonalizationSuggestion( id: 'c2', title: 'Running apparel', subtitle: 'Clothing', + image: _image('jacket'), ), PersonalizationSuggestion( id: 'c3', title: 'Trail gear', subtitle: 'Outdoor', + image: _image('watch'), ), ], productsLabel: typing ? 'Products' : 'Frequently searched', From 07af627b80b376a4db67119160af1c1dafeeb71d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 20:38:11 +0400 Subject: [PATCH 43/79] fix(deps): build against Android SDK 2.39.0 and iOS SDK 3.34.0 The plugin pinned Android SDK 2.38.0 and iOS SDK 3.33.0. On Android that release failed the request that carried a popup: a popup in the init response threw before the server device id was stored, and init was retried with the same outcome. 2.39.0 shows popups on the main thread and no longer fails the request, and brings the popup presentation listener and the typed search fields. 3.34.0 shows popups without a known position fullscreen, as Android does. The full search still goes through the raw entry point; the comment now says the typed one can take over once checked against a live shop. --- android/build.gradle.kts | 2 +- .../Rees46FlutterSdkPlugin.kt | 22 +++++++++---------- example/ios/Podfile.lock | 8 +++---- ios/rees46_sdk.podspec | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 3c7b000..727e76e 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -87,7 +87,7 @@ android { dependencies { // REES46 Android SDK. - val rees46AndroidSdkVersion = "v2.38.0" + val rees46AndroidSdkVersion = "v2.39.0" add("rees46Implementation", "com.github.rees46:android-sdk:$rees46AndroidSdkVersion") // Used directly by the push presenter (NotificationCompat / ContextCompat). The native SDK diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index b50b08d..9b2f4b6 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -327,18 +327,16 @@ class Rees46FlutterSdkPlugin : } try { // The raw, deprecated SDK.search entry point rather than the typed - // searchManager.searchFull: android-sdk v2.38.0, which this plugin pins, has no - // `filters`, `industrial_filters`, `oldprice`, `oldprice_formatted`, `discount` or - // `discount_formatted` on SearchFullResponse and Product, so Gson drops them before they - // reach Dart, and the results screen needs the facets and the old price. The raw entry - // point returns the server JSON as is. - // TODO: once an android-sdk release after v2.38.0 ships those fields (commit 9e5d6ac, - // "feat(search): old price, discount, suggested queries and facets in search - // responses": SearchFullResponse.filters / industrialFilters, Product.oldPrice / - // oldPriceFormatted / discount / discountFormatted), bump rees46AndroidSdkVersion in - // build.gradle.kts and switch to sdk(shopId).searchManager.searchFull(query, - // NativeSearchParams, …) with Gson().toJson(response), as searchInstant does; move the - // params builder to NativeSearchParams. + // searchManager.searchFull: up to android-sdk v2.38.0 the typed SearchFullResponse and + // Product had no `filters`, `industrial_filters`, `oldprice`, `oldprice_formatted`, + // `discount` or `discount_formatted`, so Gson dropped them before they reached Dart, + // and the results screen needs the facets and the old price. The raw entry point + // returns the server JSON as is. + // TODO: v2.39.0, which this plugin now pins, has those fields. Switch to + // sdk(shopId).searchManager.searchFull(query, NativeSearchParams, …) with + // Gson().toJson(response), as searchInstant does, and move the params builder to + // NativeSearchParams — after checking against a live shop that the typed response + // carries everything the results screen reads. val params = buildLegacySearchParams(paramsJson) @Suppress("DEPRECATION") sdk(shopId).search( diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 6729fd7..d6f7fb4 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -7,10 +7,10 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Flutter - FlutterMacOS - - REES46 (3.33.0) + - REES46 (3.34.0) - rees46_sdk (0.0.1): - Flutter - - REES46 (= 3.33.0) + - REES46 (= 3.34.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -44,8 +44,8 @@ SPEC CHECKSUMS: Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e patrol: cea8074f183a2a4232d0ebd10569ae05149ada42 - REES46: 92331668908a711e67515f368a9b00ed775fcffc - rees46_sdk: 8ad2e581dcb34d936af65c5c7af8c9c4c84f5255 + REES46: fcc2b0e20747439ed15b24e22d810d13ce059654 + rees46_sdk: e3c4432522f341a644a483e6e94acc1f956d85e5 shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb PODFILE CHECKSUM: b6e248ac4c1eff5807c8b044b39b8bc326af3f5f diff --git a/ios/rees46_sdk.podspec b/ios/rees46_sdk.podspec index 4949ea5..80fde30 100644 --- a/ios/rees46_sdk.podspec +++ b/ios/rees46_sdk.podspec @@ -14,7 +14,7 @@ Flutter plugin wrapper around REES46 native SDK. s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'REES46', '3.33.0' + s.dependency 'REES46', '3.34.0' s.platform = :ios, '13.0' # Flutter.framework does not contain a i386 slice. From 3e1f2c3d758bcbd290723589db25e44389fc7ae7 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 20:38:12 +0400 Subject: [PATCH 44/79] fix(android): enableAutoPopupPresentation reaches the native SDK The init config carried enableAutoPopupPresentation to Android, where the plugin dropped it: the native SDK had no such setting before 2.39.0. It is now passed into Rees46Config, as iOS already does, and kept in the shop store so an instance brought up on a cold push start gets it too. --- .../rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt | 1 + .../com/rees46/rees46_flutter_sdk/push/Rees46ShopStore.kt | 4 +++- lib/src/ui/components/personalization_in_app_popup.dart | 8 +++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index 9b2f4b6..32479cd 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -142,6 +142,7 @@ class Rees46FlutterSdkPlugin : stream = config.stream, autoSendPushToken = config.autoSendPushToken, needReInitialization = config.needReInitialization, + enableAutoPopupPresentation = config.enableAutoPopupPresentation, ) // F3: initialize (and register) the instance through the multi-instance // `Rees46` facade so it is reachable by shopId via Rees46.getInstance. diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/push/Rees46ShopStore.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/push/Rees46ShopStore.kt index 72e31ac..e5292d7 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/push/Rees46ShopStore.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/push/Rees46ShopStore.kt @@ -35,7 +35,8 @@ internal object Rees46ShopStore { .put("apiDomain", c.apiDomain) .put("stream", c.stream) .put("autoSendPushToken", c.autoSendPushToken) - .put("needReInitialization", c.needReInitialization), + .put("needReInitialization", c.needReInitialization) + .put("enableAutoPopupPresentation", c.enableAutoPopupPresentation), ) } prefs(context).edit().putString(KEY_CONFIGS, array.toString()).apply() @@ -56,6 +57,7 @@ internal object Rees46ShopStore { stream = obj.optString("stream", "android"), autoSendPushToken = obj.optBoolean("autoSendPushToken", true), needReInitialization = obj.optBoolean("needReInitialization", false), + enableAutoPopupPresentation = obj.optBoolean("enableAutoPopupPresentation", true), ) } } catch (t: Throwable) { diff --git a/lib/src/ui/components/personalization_in_app_popup.dart b/lib/src/ui/components/personalization_in_app_popup.dart index 0295f73..0bf65d3 100644 --- a/lib/src/ui/components/personalization_in_app_popup.dart +++ b/lib/src/ui/components/personalization_in_app_popup.dart @@ -44,15 +44,13 @@ enum PersonalizationInAppPopupPresentation { modal, fullscreen } // pigeon едет один булев флаг enableAutoPopupPresentation — payload до Dart не доходит, // поэтому виджет пока только свёрстан и показывается в витрине примера. // Чтобы включить: -// 1. android-sdk: точка перехвата готова, но ещё не в релизе — плагин сидит на -// v2.38.0. Нужен релиз с SDK.popupPresentationListener и -// Rees46Config.enableAutoPopupPresentation (контракт тот же, что у iOS +// 1. android-sdk: точка перехвата вышла в v2.39.0, плагин на ней — +// SDK.popupPresentationListener (контракт тот же, что у iOS // PopupPresentationDelegate: вернул null — натив не показывает). // 2. pigeon: PopupWire (id, position, delay, components, popupActions) и // onPopup(shopId, popup) в PersonalizationFlutterApi. // 3. Плагины: поставить листенер / делегат, возвращать null, payload переслать в -// Dart. На Android заодно прокинуть в Rees46Config флаг -// enableAutoPopupPresentation — сейчас плагин его игнорирует. +// Dart. Флаг enableAutoPopupPresentation на Android уже доходит до Rees46Config. // 4. Показ трекает Dart, когда виджет действительно на экране: придержанный попап // натив не трекает и не запоминает (так и на iOS). Значит, дедуп на 60 секунд // тоже на стороне Dart, иначе повтор с сервера покажется дважды. From 7ebab07c73a3d4d123a6b0e36313baef406b57d8 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 20:38:12 +0400 Subject: [PATCH 45/79] chore(example): neutral logo on the loyalty card exhibits The loyalty card exhibits used a brand wordmark as the host logo. The example is mirrored as it is, and a picture is not something a text rewrite can rename, so the logo is now a neutral mark: a ring with the kit's star, tinted to the content colour as before. --- example/assets/uikit/loyalty_logo.png | Bin 6945 -> 3281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/example/assets/uikit/loyalty_logo.png b/example/assets/uikit/loyalty_logo.png index b8a93dee5393fb9073e62064e118c2be1c6ed38a..61f9e6189dab5240df5db32faa029bd7498c282c 100644 GIT binary patch literal 3281 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 From 8672f2ea1ce86b6a9aeceafdac405814c31a5d27 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:00:28 +0400 Subject: [PATCH 46/79] feat(stories): block data through the bridge A new host method returns the stories block (`stories/{code}`) as the server JSON, untouched, so Dart parses one shape on both platforms: - Android calls the public raw entry point `sdk.stories(code, listener)`; - iOS sends the same request as `getStories(code:)` through the SDK's public `getRequest` on its session queue. `StoryContent` keeps most fields internal and drops the rest, so it cannot be re-encoded. `openUrl` opens a link with the system handler, for story buttons and products when the host does not handle links itself. The Dart models (block, story, slide, elements, product) sit under `lib/src/stories` and are reached through `getStories` / `openUrl` on a handle. Both stay out of the package barrel until the UI kit's release. --- .../Rees46FlutterSdkPlugin.kt | 46 ++ .../pigeon/PersonalizationApi.g.kt | 53 +++ ios/Classes/Rees46FlutterSdkPlugin.swift | 39 ++ ios/Classes/pigeon/PersonalizationApi.g.swift | 49 +++ lib/rees46_sdk.dart | 3 +- lib/src/personalization_sdk.dart | 18 + lib/src/pigeon/personalization_api.g.dart | 62 +++ lib/src/stories/stories_response.dart | 406 ++++++++++++++++++ pigeons/personalization_api.dart | 12 + test/stories/stories_response_test.dart | 272 ++++++++++++ 10 files changed, 959 insertions(+), 1 deletion(-) create mode 100644 lib/src/stories/stories_response.dart create mode 100644 test/stories/stories_response_test.dart diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index 32479cd..f65ef8b 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -1,7 +1,9 @@ package com.rees46.rees46_flutter_sdk +import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent +import android.net.Uri import android.os.Bundle import android.os.SystemClock import com.rees46.rees46_flutter_sdk.pigeon.FlutterError @@ -492,6 +494,50 @@ class Rees46FlutterSdkPlugin : } } + override fun getStories(code: String, shopId: String?, callback: (Result) -> Unit) { + if (code.isBlank()) { + callback(Result.failure(FlutterError("bad_args", "code is required", null))) + return + } + try { + // The public raw entry point: the listener gets the server JSON as is, the same payload + // the iOS bridge hands over, so Dart parses one shape. The typed loader + // (storiesManager.loadStories) is internal to the SDK module. + sdk(shopId).stories( + code, + object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + callback(Result.success(response?.toString() ?: "{}")) + } + + override fun onError(code: Int, msg: String?) { + callback(Result.failure(FlutterError("get_stories_failed", msg ?: "error $code", null))) + } + }, + ) + } catch (t: Throwable) { + callback(Result.failure(FlutterError("get_stories_failed", t.message, null))) + } + } + + override fun openUrl(url: String, callback: (Result) -> Unit) { + val uri = Uri.parse(url) + if (url.isBlank() || uri.scheme.isNullOrEmpty()) { + callback(Result.success(false)) + return + } + // The activity when there is one: from the application context a new task is required. + val activity = activityBinding?.activity + val intent = Intent(Intent.ACTION_VIEW, uri) + if (activity == null) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + try { + (activity ?: applicationContext).startActivity(intent) + callback(Result.success(true)) + } catch (e: ActivityNotFoundException) { + callback(Result.success(false)) + } + } + override fun getSid(shopId: String?): String = sdk(shopId).getSid() override fun getDid(shopId: String?): String? = sdk(shopId).getDid() diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt index 3721566..aecfbf7 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt @@ -493,6 +493,18 @@ interface PersonalizationHostApi { * Dart layer parses the result into [CollectionResponse]. */ fun getCollection(collectionId: String, shopId: String?, callback: (Result) -> Unit) + /** + * Returns the stories block [code] (`stories/{code}`) as the server's JSON string, + * untouched: `{ "id": ..., "stories": [...], "settings": {...} }`. Both platforms hand + * over the same raw payload, so Dart parses one shape. + * Dart layer parses the result into [StoriesBlock]. + */ + fun getStories(code: String, shopId: String?, callback: (Result) -> Unit) + /** + * Opens [url] with the system handler (browser or the app that claims the link). + * Returns false when nothing could open it. + */ + fun openUrl(url: String, callback: (Result) -> Unit) /** * Routes a push to the shop it belongs to (payload `shop_id`) and tracks it * via the native `REES46.handlePush`. [event] is the index of the Dart @@ -913,6 +925,47 @@ interface PersonalizationHostApi { channel.setMessageHandler(null) } } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStories$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val codeArg = args[0] as String + val shopIdArg = args[1] as String? + api.getStories(codeArg, shopIdArg) { result: Result -> + val error = result.exceptionOrNull() + if (error != null) { + reply.reply(PersonalizationApiPigeonUtils.wrapError(error)) + } else { + val data = result.getOrNull() + reply.reply(PersonalizationApiPigeonUtils.wrapResult(data)) + } + } + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.openUrl$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val urlArg = args[0] as String + api.openUrl(urlArg) { result: Result -> + val error = result.exceptionOrNull() + if (error != null) { + reply.reply(PersonalizationApiPigeonUtils.wrapError(error)) + } else { + val data = result.getOrNull() + reply.reply(PersonalizationApiPigeonUtils.wrapResult(data)) + } + } + } + } else { + channel.setMessageHandler(null) + } + } run { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.handlePush$separatedMessageChannelSuffix", codec) if (api != null) { diff --git a/ios/Classes/Rees46FlutterSdkPlugin.swift b/ios/Classes/Rees46FlutterSdkPlugin.swift index a6ab650..7edc9cb 100644 --- a/ios/Classes/Rees46FlutterSdkPlugin.swift +++ b/ios/Classes/Rees46FlutterSdkPlugin.swift @@ -721,6 +721,45 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { } } + func getStories(code: String, shopId: String?, completion: @escaping (Result) -> Void) { + guard let sdk = sdk(shopId) else { + completion(.failure(PigeonError(code: "not_initialized", message: "SDK is not initialized", details: nil))) + return + } + if code.isEmpty { + completion(.failure(PigeonError(code: "bad_args", message: "code is required", details: nil))) + return + } + // The same request `getStories(code:)` sends, through the SDK's public raw entry point, + // so the server JSON reaches Dart as is — the payload the Android bridge hands over. + // `StoryContent` keeps most of the fields internal and drops the rest, so it cannot be + // re-encoded. Queued on the session queue like `getStories`: it waits for the init that + // provides the device id. + sdk.sessionQueue.addOperation { + let params: [String: String] = ["shop_id": sdk.shopId, "did": sdk.deviceId] + sdk.getRequest(path: "stories/\(code)", params: params, false) { result in + switch result { + case .success(let dict): + Self._encodeCatalog(dict, errorCode: "get_stories_failed", completion: completion) + case .failure(let err): + completion(.failure(PigeonError(code: "get_stories_failed", message: String(describing: err), details: nil))) + } + } + } + } + + func openUrl(url: String, completion: @escaping (Result) -> Void) { + guard let target = URL(string: url), target.scheme?.isEmpty == false else { + completion(.success(false)) + return + } + DispatchQueue.main.async { + UIApplication.shared.open(target, options: [:]) { opened in + completion(.success(opened)) + } + } + } + private static func _profileResponseToDict(_ p: GetProfileResponse) -> [String: Any] { var d: [String: Any] = [:] if let v = p.id { d["id"] = v } diff --git a/ios/Classes/pigeon/PersonalizationApi.g.swift b/ios/Classes/pigeon/PersonalizationApi.g.swift index 59a99a8..30aaad4 100644 --- a/ios/Classes/pigeon/PersonalizationApi.g.swift +++ b/ios/Classes/pigeon/PersonalizationApi.g.swift @@ -530,6 +530,14 @@ protocol PersonalizationHostApi { /// Returns a merchandised collection's products as a JSON string. /// Dart layer parses the result into [CollectionResponse]. func getCollection(collectionId: String, shopId: String?, completion: @escaping (Result) -> Void) + /// Returns the stories block [code] (`stories/{code}`) as the server's JSON string, + /// untouched: `{ "id": ..., "stories": [...], "settings": {...} }`. Both platforms hand + /// over the same raw payload, so Dart parses one shape. + /// Dart layer parses the result into [StoriesBlock]. + func getStories(code: String, shopId: String?, completion: @escaping (Result) -> Void) + /// Opens [url] with the system handler (browser or the app that claims the link). + /// Returns false when nothing could open it. + func openUrl(url: String, completion: @escaping (Result) -> Void) /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side @@ -934,6 +942,47 @@ class PersonalizationHostApiSetup { } else { getCollectionChannel.setMessageHandler(nil) } + /// Returns the stories block [code] (`stories/{code}`) as the server's JSON string, + /// untouched: `{ "id": ..., "stories": [...], "settings": {...} }`. Both platforms hand + /// over the same raw payload, so Dart parses one shape. + /// Dart layer parses the result into [StoriesBlock]. + let getStoriesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStories\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + getStoriesChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let codeArg = args[0] as! String + let shopIdArg: String? = nilOrValue(args[1]) + api.getStories(code: codeArg, shopId: shopIdArg) { result in + switch result { + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) + } + } + } + } else { + getStoriesChannel.setMessageHandler(nil) + } + /// Opens [url] with the system handler (browser or the app that claims the link). + /// Returns false when nothing could open it. + let openUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.openUrl\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + openUrlChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let urlArg = args[0] as! String + api.openUrl(url: urlArg) { result in + switch result { + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) + } + } + } + } else { + openUrlChannel.setMessageHandler(nil) + } /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side diff --git a/lib/rees46_sdk.dart b/lib/rees46_sdk.dart index 6cd497a..02e9728 100644 --- a/lib/rees46_sdk.dart +++ b/lib/rees46_sdk.dart @@ -1,4 +1,5 @@ -export 'src/personalization_sdk.dart'; +// Stories stay with the UI kit until its release: the kit imports them from src. +export 'src/personalization_sdk.dart' hide PersonalizationStoriesBridge; export 'src/multi_instance/rees46.dart'; export 'src/multi_instance/rees46_config.dart'; export 'src/multi_instance/push_event.dart'; diff --git a/lib/src/personalization_sdk.dart b/lib/src/personalization_sdk.dart index 04b57ef..79c70d0 100644 --- a/lib/src/personalization_sdk.dart +++ b/lib/src/personalization_sdk.dart @@ -18,6 +18,7 @@ import 'products/products_list_response.dart'; import 'search/search_params.dart'; import 'search/search_response.dart'; import 'sdk_init_config.dart'; +import 'stories/stories_response.dart'; import 'tracking/purchase_line_item.dart'; import 'tracking/tracking_api.dart'; @@ -344,3 +345,20 @@ class PersonalizationSdk { ); } } + +/// Stories for the UI kit — hidden from the package barrel (`export ... hide`) until the +/// kit's release, and reached by the kit through a direct `src` import. It lives in this +/// library because it calls the host API the handle owns. +extension PersonalizationStoriesBridge on PersonalizationSdk { + /// The stories block [code] (`stories/{code}`). + Future getStories(String code) async { + if (code.isEmpty) { + throw ArgumentError.value(code, 'code', 'must be non-empty'); + } + final json = await _api.getStories(code, shopId); + return StoriesBlock.fromJson(jsonDecode(json) as Map); + } + + /// Opens [url] with the system handler; `false` when nothing could open it. + Future openUrl(String url) => _api.openUrl(url); +} diff --git a/lib/src/pigeon/personalization_api.g.dart b/lib/src/pigeon/personalization_api.g.dart index f5a1867..5603d41 100644 --- a/lib/src/pigeon/personalization_api.g.dart +++ b/lib/src/pigeon/personalization_api.g.dart @@ -1036,6 +1036,68 @@ class PersonalizationHostApi { } } + /// Returns the stories block [code] (`stories/{code}`) as the server's JSON string, + /// untouched: `{ "id": ..., "stories": [...], "settings": {...} }`. Both platforms hand + /// over the same raw payload, so Dart parses one shape. + /// Dart layer parses the result into [StoriesBlock]. + Future getStories(String code, String? shopId) async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStories$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([code, shopId]); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else if (pigeonVar_replyList[0] == null) { + throw PlatformException( + code: 'null-error', + message: 'Host platform returned null value for non-null return value.', + ); + } else { + return (pigeonVar_replyList[0] as String?)!; + } + } + + /// Opens [url] with the system handler (browser or the app that claims the link). + /// Returns false when nothing could open it. + Future openUrl(String url) async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.openUrl$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([url]); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else if (pigeonVar_replyList[0] == null) { + throw PlatformException( + code: 'null-error', + message: 'Host platform returned null value for non-null return value.', + ); + } else { + return (pigeonVar_replyList[0] as bool?)!; + } + } + /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side diff --git a/lib/src/stories/stories_response.dart b/lib/src/stories/stories_response.dart new file mode 100644 index 0000000..9db6c56 --- /dev/null +++ b/lib/src/stories/stories_response.dart @@ -0,0 +1,406 @@ +import '../json_number.dart'; + +/// A stories block (`GET stories/{code}`), parsed from the server JSON both bridges hand +/// over untouched. +/// +/// Internal to the UI kit until its release: the package barrel does not export it, the +/// kit barrel (`src/ui/personalization_ui.dart`) does. +/// +/// Parsing is tolerant, the way the native SDKs read the same payload: numbers may arrive +/// as strings (`font_size`, `y_offset`, `duration`), ids as numbers or strings, and a +/// missing field takes the native default. The block-level `settings` (legacy colours of +/// the old stories) are not carried: the kit styles stories with its own tokens. +class StoriesBlock { + /// Block id on the server. + final String id; + final List stories; + + const StoriesBlock({required this.id, required this.stories}); + + factory StoriesBlock.fromJson(Map json) { + return StoriesBlock( + id: json['id']?.toString() ?? '', + stories: _maps(json['stories']).map(Story.fromJson).toList(), + ); + } +} + +/// One story: a cover in the bar and the slides the viewer plays. +class Story { + final String id; + final String name; + + /// Cover image URL. + final String avatar; + + /// Seen by this device, as the server remembers it. + final bool viewed; + + /// Pinned by the shop to the start of the bar. + final bool pinned; + + /// Slide to start from — the first one the user has not seen yet. + final int startPosition; + final List slides; + + const Story({ + required this.id, + required this.name, + required this.avatar, + this.viewed = false, + this.pinned = false, + this.startPosition = 0, + required this.slides, + }); + + factory Story.fromJson(Map json) { + return Story( + id: json['id']?.toString() ?? '', + name: json['name'] as String? ?? '', + avatar: json['avatar'] as String? ?? '', + viewed: json['viewed'] == true, + pinned: json['pinned'] == true, + startPosition: toIntOrNull(json['start_position']) ?? 0, + slides: _maps(json['slides']).map(StorySlide.fromJson).toList(), + ); + } +} + +/// What a slide shows behind its elements. +enum StorySlideType { + /// `image`: [StorySlide.background] is a picture. + image, + + /// `video`: [StorySlide.background] is a video, [StorySlide.preview] its poster. + video, + + /// `""`: a dynamic product slide, the product comes in a [StoryProductElement]. + product, +} + +/// One slide of a story. +class StorySlide { + /// Slide id: a number for media slides, a string like `"39_0"` for dynamic ones. + final String id; + final StorySlideType type; + + /// Image or video URL; empty on product slides. + final String background; + + /// Colour behind the background, `#RRGGBB`; empty when not set. + final String backgroundColor; + + /// Poster of a video slide; empty when not set. + final String preview; + + /// How long the slide stays on screen. + final Duration duration; + final List elements; + + /// Seconds a slide lasts when the server does not say. + static const int defaultDurationSeconds = 5; + + const StorySlide({ + required this.id, + required this.type, + this.background = '', + this.backgroundColor = '', + this.preview = '', + this.duration = const Duration(seconds: defaultDurationSeconds), + this.elements = const [], + }); + + factory StorySlide.fromJson(Map json) { + final seconds = toIntOrNull(json['duration']); + return StorySlide( + id: json['id']?.toString() ?? '', + type: switch (json['type']) { + 'image' => StorySlideType.image, + 'video' => StorySlideType.video, + _ => StorySlideType.product, + }, + background: json['background'] as String? ?? '', + backgroundColor: json['background_color'] as String? ?? '', + preview: json['preview'] as String? ?? '', + duration: Duration( + seconds: seconds == null || seconds <= 0 + ? defaultDurationSeconds + : seconds, + ), + elements: _maps( + json['elements'], + ).map(StoryElement.fromJson).whereType().toList(), + ); + } + + /// The product of a dynamic product slide, if it has one. + StoryProduct? get product { + for (final element in elements) { + if (element is StoryProductElement) return element.item; + } + return null; + } +} + +/// An element placed on a slide. Unknown types and `header` (not drawn by the kit) are +/// dropped while parsing. +sealed class StoryElement { + const StoryElement(); + + /// The element for [json], or `null` for a type the kit does not draw. + static StoryElement? fromJson(Map json) { + return switch (json['type']) { + 'button' => StoryButtonElement.fromJson(json), + 'product' => StoryProductElement.fromJson(json), + 'products' => StoryProductsElement.fromJson(json), + 'text_block' => StoryTextBlockElement.fromJson(json), + _ => null, + }; + } +} + +/// `button`: a call to action with a link. +class StoryButtonElement extends StoryElement { + final String title; + final String link; + final String linkAndroid; + final String linkIos; + + /// Legacy colours of the old stories; the kit draws its own primary button. + final String background; + final String color; + final bool textBold; + + const StoryButtonElement({ + required this.title, + this.link = '', + this.linkAndroid = '', + this.linkIos = '', + this.background = '', + this.color = '', + this.textBold = false, + }); + + factory StoryButtonElement.fromJson(Map json) { + return StoryButtonElement( + title: json['title'] as String? ?? '', + link: json['link'] as String? ?? '', + linkAndroid: json['link_android'] as String? ?? '', + linkIos: json['link_ios'] as String? ?? '', + background: json['background'] as String? ?? '', + color: json['color'] as String? ?? '', + textBold: json['text_bold'] == true || json['bold'] == true, + ); + } +} + +/// `product`: the product of a dynamic product slide. +class StoryProductElement extends StoryElement { + final String title; + final StoryProduct? item; + + const StoryProductElement({this.title = '', this.item}); + + factory StoryProductElement.fromJson(Map json) { + final item = json['item']; + return StoryProductElement( + title: json['title'] as String? ?? '', + item: item is Map && item.isNotEmpty + ? StoryProduct.fromJson(Map.from(item)) + : null, + ); + } +} + +/// `products`: the products "used" on a media slide, behind a show / hide toggle. +class StoryProductsElement extends StoryElement { + /// Toggle label while collapsed (`labels.show_carousel`); empty when not set. + final String showLabel; + + /// Toggle label while expanded (`labels.hide_carousel`); empty when not set. + final String hideLabel; + final List products; + + const StoryProductsElement({ + this.showLabel = '', + this.hideLabel = '', + required this.products, + }); + + factory StoryProductsElement.fromJson(Map json) { + final labels = json['labels']; + String label(String key) => + labels is Map ? (labels[key] as String? ?? '') : ''; + return StoryProductsElement( + showLabel: label('show_carousel'), + hideLabel: label('hide_carousel'), + products: _maps(json['products']).map(StoryProduct.fromJson).toList(), + ); + } +} + +/// `text_block`: a text over a media slide. +class StoryTextBlockElement extends StoryElement { + final String text; + + /// Font size in logical pixels; 14 when not set, as in the native SDKs. + final double fontSize; + + /// `serif`, `sans-serif`, `monospaced` or empty. + final String fontType; + final bool bold; + final bool italic; + + /// `left`, `center`, `right` or empty. + final String textAlign; + + /// `#RRGGBB`; empty — the kit's colour. + final String textColor; + + /// `#RRGGBB` behind the text; see [backgroundOpacity]. + final String backgroundColor; + + /// 0…1, from `"0%"`…`"100%"`. 0 — the text has no frame. + final double backgroundOpacity; + + /// Line height as a multiple of the font size; 0 — the font's own. + final double lineSpacing; + + /// Top of the block, in percent of the slide height. + final double yOffset; + + /// A code the block copies on tap; `null` when it has none. + final String? promocode; + + static const double defaultFontSize = 14; + + const StoryTextBlockElement({ + required this.text, + this.fontSize = defaultFontSize, + this.fontType = '', + this.bold = false, + this.italic = false, + this.textAlign = '', + this.textColor = '', + this.backgroundColor = '', + this.backgroundOpacity = 0, + this.lineSpacing = 0, + this.yOffset = 0, + this.promocode, + }); + + factory StoryTextBlockElement.fromJson(Map json) { + final promocode = json['promocode']; + return StoryTextBlockElement( + text: json['text_input'] as String? ?? '', + fontSize: toDoubleOrNull(json['font_size']) ?? defaultFontSize, + fontType: json['font_type'] as String? ?? '', + bold: json['bold'] == true || json['text_bold'] == true, + italic: json['italic'] == true, + textAlign: json['text_align'] as String? ?? '', + textColor: json['text_color'] as String? ?? '', + backgroundColor: json['text_background_color'] as String? ?? '', + backgroundOpacity: parseStoryOpacity( + json['text_background_color_opacity'], + ), + lineSpacing: toDoubleOrNull(json['text_line_spacing']) ?? 0, + yOffset: toDoubleOrNull(json['y_offset']) ?? 0, + promocode: promocode is String && promocode.isNotEmpty ? promocode : null, + ); + } +} + +/// A product of a stories block — the fields the kit shows and links to. +class StoryProduct { + final String id; + final String name; + final String brand; + + /// Resized copy of the image (`picture`), the one to show; empty when not set. + final String picture; + + /// Original image (`image_url`). + final String imageUrl; + final double price; + final String priceFormatted; + + /// Price before the discount, 0 when there is none. + final double oldPrice; + final String oldPriceFormatted; + + /// Discount in percent (`discount_percent`), 0 when there is none. + final int discountPercent; + + /// Promo code for this product, empty when there is none. + final String promocode; + + /// Price with the promo code applied. + final String priceWithPromocodeFormatted; + final String currency; + final String url; + final String deeplinkAndroid; + final String deeplinkIos; + + const StoryProduct({ + required this.id, + required this.name, + this.brand = '', + this.picture = '', + this.imageUrl = '', + this.price = 0, + this.priceFormatted = '', + this.oldPrice = 0, + this.oldPriceFormatted = '', + this.discountPercent = 0, + this.promocode = '', + this.priceWithPromocodeFormatted = '', + this.currency = '', + this.url = '', + this.deeplinkAndroid = '', + this.deeplinkIos = '', + }); + + factory StoryProduct.fromJson(Map json) { + String text(String key) => json[key]?.toString() ?? ''; + return StoryProduct( + id: text('id'), + name: text('name'), + brand: text('brand'), + picture: text('picture'), + imageUrl: text('image_url'), + price: toDoubleOrNull(json['price']) ?? 0, + priceFormatted: text('price_formatted'), + oldPrice: toDoubleOrNull(json['oldprice']) ?? 0, + oldPriceFormatted: text('oldprice_formatted'), + discountPercent: toIntOrNull(json['discount_percent']) ?? 0, + promocode: text('promocode'), + priceWithPromocodeFormatted: text('price_with_promocode_formatted'), + currency: text('currency'), + url: text('url'), + deeplinkAndroid: text('deeplink_android'), + deeplinkIos: text('deeplink_ios'), + ); + } + + /// The old price is worth showing: it is set and above the current one. + bool get hasOldPrice => oldPrice > price && oldPriceFormatted.isNotEmpty; + + /// The image to show: the resized copy, else the original; empty when neither is set. + String get image => picture.isNotEmpty ? picture : imageUrl; +} + +/// Reads an opacity into 0…1. A string is percents with or without the sign (`"50%"`, +/// `"50"`), as the admin sends it and the native SDKs read it; a number above 1 is +/// percents too, otherwise a fraction. +double parseStoryOpacity(dynamic value) { + final isText = value is String; + final number = toDoubleOrNull(isText ? value.replaceAll('%', '') : value); + if (number == null || number <= 0) return 0; + final fraction = isText || number > 1 ? number / 100 : number; + return fraction.clamp(0, 1).toDouble(); +} + +Iterable> _maps(dynamic raw) { + if (raw is! List) return const []; + return raw.whereType().map(Map.from); +} diff --git a/pigeons/personalization_api.dart b/pigeons/personalization_api.dart index a7c73a5..9555ccc 100644 --- a/pigeons/personalization_api.dart +++ b/pigeons/personalization_api.dart @@ -250,6 +250,18 @@ abstract class PersonalizationHostApi { @async String getCollection(String collectionId, String? shopId); + /// Returns the stories block [code] (`stories/{code}`) as the server's JSON string, + /// untouched: `{ "id": ..., "stories": [...], "settings": {...} }`. Both platforms hand + /// over the same raw payload, so Dart parses one shape. + /// Dart layer parses the result into [StoriesBlock]. + @async + String getStories(String code, String? shopId); + + /// Opens [url] with the system handler (browser or the app that claims the link). + /// Returns false when nothing could open it. + @async + bool openUrl(String url); + /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side diff --git a/test/stories/stories_response_test.dart b/test/stories/stories_response_test.dart new file mode 100644 index 0000000..74ac500 --- /dev/null +++ b/test/stories/stories_response_test.dart @@ -0,0 +1,272 @@ +import 'dart:convert'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/rees46_sdk.dart'; +import 'package:rees46_sdk/src/personalization_sdk.dart' + show PersonalizationStoriesBridge; +import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; +import 'package:rees46_sdk/src/stories/stories_response.dart'; + +/// A trimmed copy of a real `stories/{code}` answer (block 115bd0b6…, demo shop): a +/// dynamic product slide, a video slide, an image slide with a button and products, plus +/// a text block and a header the kit drops. +final Map _block = { + 'id': 35, + 'settings': {'color': '#212529'}, + 'stories': >[ + { + 'id': 39, + 'name': 'Test story', + 'avatar': 'https://cdn.example/avatar.jpg', + 'viewed': false, + 'start_position': 0, + 'pinned': false, + 'slides': >[ + { + 'id': '39_0', + 'duration': 10, + 'background': '', + 'preview': '', + 'type': '', + 'elements': >[ + { + 'type': 'button', + 'title': 'Buy', + 'link': 'https://shop.example/p/1?recommended_by=dynamic', + 'link_ios': 'https://shop.example/p/1', + 'link_android': 'https://shop.example/p/1', + 'background': '#3b82f6', + 'color': '#ffffff', + }, + { + 'type': 'product', + 'title': ' ', + 'item': { + 'id': '216908', + 'name': 'Надувной бассейн INTEX', + 'brand': 'INTEX', + 'picture': 'https://pictures.example/180/135478.jpg', + 'image_url': 'https://api.example/216908_1.jpg', + 'price': 19990, + 'price_formatted': '19 990 ₽', + 'oldprice': 27990, + 'oldprice_formatted': '27 990 ₽', + 'discount_percent': 28, + 'currency': '₽', + 'url': 'https://shop.example/p/1?recommended_by=stories', + 'deeplink_android': 'https://shop.example/p/1', + 'deeplink_ios': 'https://shop.example/p/1', + }, + }, + ], + }, + ], + }, + { + 'id': 40, + 'name': 'Test story', + 'avatar': 'https://cdn.example/avatar2.jpg', + 'viewed': true, + 'start_position': '1', + 'pinned': true, + 'slides': >[ + { + 'id': 36, + 'duration': 10, + 'background': 'https://cdn.example/clip.mp4', + 'preview': 'https://cdn.example/poster.jpg', + 'type': 'video', + }, + { + 'id': 37, + 'duration': 0, + 'background': 'https://cdn.example/slide.jpg', + 'background_color': '#000000', + 'preview': '', + 'type': 'image', + 'elements': >[ + { + 'link': 'https://demo.example/', + 'type': 'button', + 'color': '#ffffff', + 'title': 'Go gaming!', + 'link_ios': '', + 'text_bold': false, + 'background': '#3b82f6', + 'link_android': 'https://demo.example/', + }, + { + 'type': 'products', + 'labels': { + 'hide_carousel': 'Скрыть товары', + 'show_carousel': 'Товары для геймеров', + }, + 'products': >[ + { + 'id': 1, + 'name': 'Mouse', + 'price': '1990.0', + 'price_formatted': '1 990 ₽', + 'oldprice': 0, + }, + ], + }, + { + 'type': 'text_block', + 'text_input': 'Скидки до 10%', + 'font_size': '24', + 'font_type': 'serif', + 'bold': true, + 'italic': false, + 'text_align': 'center', + 'text_color': '#FFFFFF', + 'text_background_color': '#16AE13', + 'text_background_color_opacity': '40%', + 'text_line_spacing': '1.2', + 'y_offset': 12, + 'promocode': 'SALE10', + }, + {'type': 'header', 'title': 'dropped'}, + ], + }, + { + 'id': 38, + 'background': 'https://cdn.example/plain.jpg', + 'type': 'image', + }, + ], + }, + ], +}; + +class _FakeHostApi extends pigeon.PersonalizationHostApi { + final List<(String, String?)> requests = <(String, String?)>[]; + + @override + Future getStories(String code, String? shopId) async { + requests.add((code, shopId)); + return jsonEncode(_block); + } +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('StoriesBlock.fromJson', () { + final block = StoriesBlock.fromJson(_block); + + test('reads the block and its stories, ids as strings', () { + expect(block.id, '35'); + expect(block.stories.map((story) => story.id), ['39', '40']); + final second = block.stories[1]; + expect(second.viewed, isTrue); + expect(second.pinned, isTrue); + expect(second.startPosition, 1, reason: 'a string number is tolerated'); + expect(second.slides.map((slide) => slide.id), [ + '36', + '37', + '38', + ]); + }); + + test('slide types, backgrounds and durations', () { + final product = block.stories[0].slides[0]; + expect(product.type, StorySlideType.product); + expect(product.duration, const Duration(seconds: 10)); + + final video = block.stories[1].slides[0]; + expect(video.type, StorySlideType.video); + expect(video.background, 'https://cdn.example/clip.mp4'); + expect(video.preview, 'https://cdn.example/poster.jpg'); + expect(video.elements, isEmpty); + + final image = block.stories[1].slides[1]; + expect(image.type, StorySlideType.image); + expect(image.backgroundColor, '#000000'); + expect( + image.duration, + const Duration(seconds: StorySlide.defaultDurationSeconds), + reason: 'zero falls back to the default', + ); + expect( + block.stories[1].slides[2].duration, + const Duration(seconds: StorySlide.defaultDurationSeconds), + reason: 'missing falls back to the default', + ); + }); + + test('the dynamic product slide carries a button and the product', () { + final slide = block.stories[0].slides[0]; + final button = slide.elements.whereType().single; + expect(button.title, 'Buy'); + expect(button.linkAndroid, 'https://shop.example/p/1'); + expect(button.linkIos, 'https://shop.example/p/1'); + + final product = slide.product!; + expect(product.id, '216908'); + expect(product.brand, 'INTEX'); + expect(product.priceFormatted, '19 990 ₽'); + expect(product.oldPrice, 27990); + expect(product.hasOldPrice, isTrue); + expect(product.discountPercent, 28); + expect(product.promocode, isEmpty); + expect(product.image, 'https://pictures.example/180/135478.jpg'); + }); + + test('products, text block; header dropped', () { + final elements = block.stories[1].slides[1].elements; + expect(elements, hasLength(3), reason: 'header is not drawn by the kit'); + + final products = elements.whereType().single; + expect(products.showLabel, 'Товары для геймеров'); + expect(products.hideLabel, 'Скрыть товары'); + expect(products.products.single.id, '1'); + expect(products.products.single.price, 1990); + expect(products.products.single.hasOldPrice, isFalse); + + final text = elements.whereType().single; + expect(text.text, 'Скидки до 10%'); + expect(text.fontSize, 24); + expect(text.fontType, 'serif'); + expect(text.bold, isTrue); + expect(text.textAlign, 'center'); + expect(text.backgroundOpacity, closeTo(0.4, 1e-9)); + expect(text.lineSpacing, closeTo(1.2, 1e-9)); + expect(text.yOffset, 12); + expect(text.promocode, 'SALE10'); + }); + + test('a text block without fields takes the native defaults', () { + final text = StoryTextBlockElement.fromJson(const { + 'type': 'text_block', + }); + expect(text.fontSize, StoryTextBlockElement.defaultFontSize); + expect(text.backgroundOpacity, 0); + expect(text.promocode, isNull); + }); + }); + + test('parseStoryOpacity reads percents and fractions', () { + expect(parseStoryOpacity('0%'), 0); + expect(parseStoryOpacity('100%'), 1); + expect(parseStoryOpacity('50'), 0.5); + expect(parseStoryOpacity(' 25% '), 0.25); + expect(parseStoryOpacity(0.3), closeTo(0.3, 1e-9)); + expect(parseStoryOpacity(80), closeTo(0.8, 1e-9)); + expect(parseStoryOpacity(null), 0); + expect(parseStoryOpacity('bad'), 0); + }); + + test('getStories goes through the bridge with the handle\'s shop', () async { + final api = _FakeHostApi(); + final sdk = PersonalizationSdk(api: api, shopId: 'shop-a'); + + final block = await sdk.getStories('115bd0b67cf5989a1b60c841790b2af6'); + + expect(api.requests, <(String, String?)>[ + ('115bd0b67cf5989a1b60c841790b2af6', 'shop-a'), + ]); + expect(block.stories, hasLength(2)); + expect(() => sdk.getStories(''), throwsArgumentError); + }); +} From d813ac155e0208a7857b920032e57cff4f08f837 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:01:06 +0400 Subject: [PATCH 47/79] feat(ui): stories v2 components The visual pieces of Stories V2, fed by the host, on the kit's tokens: - StoryCover (ring states, pinned star, slide segments, skeleton) and StoryPreview, StoriesBar with skeleton previews while loading; - StoryProgress and StoryNavigation (progress plus the cross); - StoryPrice: price, discount and promo code; tapping the code zooms the block, copies it and shows the kit toast; - StoryTimer (merged and separate), StoryTextBlock (solid and transparent, size presets), StoryUsedProducts on the kit carousel, StorySoundButton. New tokens: neutral100 (timer fill), semanticInfo (text block presets), neutralSubtle (viewed ring). New icons: speaker, speaker-off. The products carousel takes padding inside its scroll. --- assets/icons/speaker-off.svg | 4 + assets/icons/speaker.svg | 6 + .../personalization_loyalty_card.dart | 4 +- .../personalization_products_list.dart | 6 + .../personalization_stories_bar.dart | 110 +++++ .../personalization_story_cover.dart | 210 ++++++++++ .../personalization_story_navigation.dart | 88 ++++ .../personalization_story_preview.dart | 115 ++++++ .../personalization_story_price.dart | 383 ++++++++++++++++++ .../personalization_story_progress.dart | 65 +++ .../personalization_story_shimmer.dart | 73 ++++ .../personalization_story_sound_button.dart | 61 +++ .../personalization_story_text_block.dart | 114 ++++++ .../personalization_story_timer.dart | 197 +++++++++ .../personalization_story_used_products.dart | 122 ++++++ lib/src/ui/personalization_colors.dart | 27 ++ lib/src/ui/personalization_icons.dart | 7 + lib/src/ui/personalization_ui.dart | 12 + ...personalization_story_components_test.dart | 307 ++++++++++++++ 19 files changed, 1909 insertions(+), 2 deletions(-) create mode 100644 assets/icons/speaker-off.svg create mode 100644 assets/icons/speaker.svg create mode 100644 lib/src/ui/components/personalization_stories_bar.dart create mode 100644 lib/src/ui/components/personalization_story_cover.dart create mode 100644 lib/src/ui/components/personalization_story_navigation.dart create mode 100644 lib/src/ui/components/personalization_story_preview.dart create mode 100644 lib/src/ui/components/personalization_story_price.dart create mode 100644 lib/src/ui/components/personalization_story_progress.dart create mode 100644 lib/src/ui/components/personalization_story_shimmer.dart create mode 100644 lib/src/ui/components/personalization_story_sound_button.dart create mode 100644 lib/src/ui/components/personalization_story_text_block.dart create mode 100644 lib/src/ui/components/personalization_story_timer.dart create mode 100644 lib/src/ui/components/personalization_story_used_products.dart create mode 100644 test/ui/personalization_story_components_test.dart diff --git a/assets/icons/speaker-off.svg b/assets/icons/speaker-off.svg new file mode 100644 index 0000000..c5a44f3 --- /dev/null +++ b/assets/icons/speaker-off.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/icons/speaker.svg b/assets/icons/speaker.svg new file mode 100644 index 0000000..ce0e662 --- /dev/null +++ b/assets/icons/speaker.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/src/ui/components/personalization_loyalty_card.dart b/lib/src/ui/components/personalization_loyalty_card.dart index 73e4a78..aa2503f 100644 --- a/lib/src/ui/components/personalization_loyalty_card.dart +++ b/lib/src/ui/components/personalization_loyalty_card.dart @@ -48,8 +48,8 @@ class PersonalizationLoyaltyCardField { /// Скругление 2XL, обводка 1 внутрь цветом Line/Generic Subtle, тень Elevation 3 /// цветом Shadow/Heavy темы. Фон — Background/Card, подписи и значения — /// Text/Primary; оба переопределяются через [cardColor] и [contentColor]. Так в -/// тёмном примере макета карта фирменная синяя: #0087E8 — Semantic/Info, такого -/// токена в ките нет, цвет передаёт хост. +/// тёмном примере макета карта фирменная синяя — Semantic/Info +/// ([PersonalizationColors.semanticInfo]), цвет передаёт хост. class PersonalizationLoyaltyCard extends StatelessWidget { const PersonalizationLoyaltyCard({ super.key, diff --git a/lib/src/ui/components/personalization_products_list.dart b/lib/src/ui/components/personalization_products_list.dart index 75df7b9..ab269d7 100644 --- a/lib/src/ui/components/personalization_products_list.dart +++ b/lib/src/ui/components/personalization_products_list.dart @@ -26,6 +26,7 @@ class PersonalizationProductsList extends StatefulWidget { this.onProductAction, this.onProductTap, this.onFirstVisibleChanged, + this.carouselPadding, this.iconBuilder, }); @@ -40,6 +41,10 @@ class PersonalizationProductsList extends StatefulWidget { final ValueChanged? onProductTap; final ValueChanged? onFirstVisibleChanged; + /// Поля карусели внутри её прокрутки: крайние карточки уезжают под край, а не + /// обрезаются полем. У плитки и списка поля задаёт разметка хоста. + final EdgeInsetsGeometry? carouselPadding; + final Widget Function( BuildContext context, String asset, @@ -123,6 +128,7 @@ class _PersonalizationProductsListState return SingleChildScrollView( controller: _controller, scrollDirection: Axis.horizontal, + padding: widget.carouselPadding, child: IntrinsicHeight( child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/src/ui/components/personalization_stories_bar.dart b/lib/src/ui/components/personalization_stories_bar.dart new file mode 100644 index 0000000..46c210f --- /dev/null +++ b/lib/src/ui/components/personalization_stories_bar.dart @@ -0,0 +1,110 @@ +import 'package:flutter/widgets.dart'; + +import 'personalization_story_cover.dart'; +import 'personalization_story_preview.dart'; + +/// Данные превью в ленте сторис. +@immutable +class PersonalizationStoryItem { + const PersonalizationStoryItem({ + required this.id, + required this.label, + this.image, + this.pinned = false, + this.viewed = false, + this.segments = 0, + this.seenSegments = 0, + }); + + final String id; + final String label; + + /// Картинку даёт хост — кит не тянет сеть. + final ImageProvider? image; + final bool pinned; + final bool viewed; + + /// См. [PersonalizationStoryCover.segments]. + final int segments; + + /// См. [PersonalizationStoryCover.seenSegments]. + final int seenSegments; +} + +/// Лента сторис: превью в горизонтальной прокрутке. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), фреймы «Блок сторис на +/// странице» (светлый и тёмный). +/// +/// Превью [PersonalizationStoryPreview] с шагом 16, поля ленты 16 — оба хост может +/// переопределить. Пока идёт загрузка ([loading]), вместо превью — [skeletonCount] +/// заглушек. +class PersonalizationStoriesBar extends StatelessWidget { + const PersonalizationStoriesBar({ + super.key, + this.items = const [], + this.loading = false, + this.skeletonCount = 4, + this.padding = const EdgeInsets.all(16), + this.gap = 16, + this.onItemTap, + this.iconBuilder, + }); + + final List items; + + /// Идёт загрузка: вместо [items] — заглушки. + final bool loading; + final int skeletonCount; + final EdgeInsetsGeometry padding; + final double gap; + final ValueChanged? onItemTap; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + Widget build(BuildContext context) { + final previews = [ + if (loading) + for (int i = 0; i < skeletonCount; i++) + const PersonalizationStoryPreview( + state: PersonalizationStoryCoverState.skeleton, + ) + else + for (final item in items) + PersonalizationStoryPreview( + key: ValueKey(item.id), + label: item.label, + image: item.image, + state: item.viewed + ? PersonalizationStoryCoverState.viewed + : PersonalizationStoryCoverState.unviewed, + pinned: item.pinned, + segments: item.segments, + seenSegments: item.seenSegments, + onTap: onItemTap == null ? null : () => onItemTap!(item), + iconBuilder: iconBuilder, + ), + ]; + + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + padding: padding, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (int i = 0; i < previews.length; i++) ...[ + if (i > 0) SizedBox(width: gap), + previews[i], + ], + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_cover.dart b/lib/src/ui/components/personalization_story_cover.dart new file mode 100644 index 0000000..d849e34 --- /dev/null +++ b/lib/src/ui/components/personalization_story_cover.dart @@ -0,0 +1,210 @@ +import 'dart:math' as math; + +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import 'personalization_favorites_badge.dart'; +import 'personalization_story_shimmer.dart'; + +/// Состояние обложки сторис. +/// +/// В макете у Story/Cover четыре состояния: Default, Pinned, Viewed, Skeleton. Pinned +/// здесь не состояние, а флаг [PersonalizationStoryCover.pinned]: в данных «закреплена» +/// и «просмотрена» независимы, и закреплённая сторис остаётся со звездой и после +/// просмотра — так и в прежних сторис SDK. Default — [unviewed]. +enum PersonalizationStoryCoverState { unviewed, viewed, skeleton } + +/// Обложка сторис: круглая картинка в кольце. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент Story/Cover, +/// сегменты кольца — Progress/Circular. +/// +/// Круг 88. Кольцо — обводка 4 внутрь; картинка — круг 76 с отступом 6, то есть между +/// ними зазор 2. Цвет кольца: Button/Primary у непросмотренной, Semantic/Warning у +/// закреплённой, Semantic/Neutral Subtle у просмотренной. Закреплённой в правом нижнем +/// углу (x62, y62) — метка Favorites 24: звезда на Semantic/Warning. У заглушки кольцо и +/// картинка переливаются градиентом (см. [PersonalizationStoryShimmer]). +/// +/// Сегменты: при [segments] > 1 кольцо делится на столько дуг с небольшими зазорами — +/// по дуге на слайд. Первые [seenSegments] — уже показанные слайды — красятся в +/// Button/Primary Disabled (Brand/Primary 65%), остальные в цвет состояния. У +/// просмотренной все дуги цвета Viewed. +class PersonalizationStoryCover extends StatelessWidget { + const PersonalizationStoryCover({ + super.key, + this.image, + this.state = PersonalizationStoryCoverState.unviewed, + this.pinned = false, + this.segments = 0, + this.seenSegments = 0, + this.iconBuilder, + }); + + /// Картинку даёт хост — кит не тянет сеть. + final ImageProvider? image; + final PersonalizationStoryCoverState state; + + /// Закреплена магазином: кольцо Semantic/Warning (пока не просмотрена) и звезда. + final bool pinned; + + /// На сколько дуг поделить кольцо; 0 и 1 — сплошное. + final int segments; + + /// Сколько первых дуг уже показано. + final int seenSegments; + + /// Как нарисовать звезду метки закреплённой: пакет не рисует SVG сам. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + static const double size = 88; + static const double _ring = 4; + static const double _imageInset = 6; + static const double _badgeOffset = 62; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + + if (state == PersonalizationStoryCoverState.skeleton) { + return PersonalizationStoryShimmer( + builder: (context, gradient) => SizedBox.square( + dimension: size, + child: CustomPaint( + painter: _RingPainter( + colors: const [], + gradient: gradient, + segments: 1, + ), + child: Padding( + padding: const EdgeInsets.all(_imageInset), + child: DecoratedBox( + decoration: BoxDecoration( + shape: BoxShape.circle, + gradient: gradient, + ), + ), + ), + ), + ), + ); + } + + final viewed = state == PersonalizationStoryCoverState.viewed; + final stateColor = viewed + ? colors.neutralSubtle + : pinned + ? colors.semanticWarning + : colors.buttonPrimary; + final count = math.max(1, segments); + final ringColors = [ + for (int i = 0; i < count; i++) + !viewed && segments > 1 && i < seenSegments + ? colors.buttonPrimaryDisabled + : stateColor, + ]; + + return SizedBox.square( + dimension: size, + child: Stack( + clipBehavior: Clip.none, + children: [ + Positioned.fill( + child: CustomPaint( + painter: _RingPainter(colors: ringColors, segments: count), + ), + ), + Positioned.fill( + child: Padding( + padding: const EdgeInsets.all(_imageInset), + child: ClipOval( + child: ColoredBox( + // Заглушка до загрузки — Neutral 50, как у картинки товара. + color: colors.neutral50, + child: image == null + ? null + : Image(image: image!, fit: BoxFit.cover), + ), + ), + ), + ), + if (pinned) + Positioned( + left: _badgeOffset, + top: _badgeOffset, + child: PersonalizationFavoritesBadge(iconBuilder: iconBuilder), + ), + ], + ), + ); + } +} + +/// Кольцо обложки: обводка 4 внутрь круга, сплошная или дугами с зазорами. +class _RingPainter extends CustomPainter { + const _RingPainter({ + required this.colors, + required this.segments, + this.gradient, + }); + + /// Цвет каждой дуги; игнорируется, если задан [gradient]. + final List colors; + final int segments; + final Gradient? gradient; + + /// Зазор между дугами по средней линии кольца. + static const double _gap = 4; + + @override + void paint(Canvas canvas, Size size) { + const stroke = PersonalizationStoryCover._ring; + final rect = (Offset.zero & size).deflate(stroke / 2); + final paint = Paint() + ..style = PaintingStyle.stroke + ..strokeWidth = stroke; + final shader = gradient?.createShader(Offset.zero & size); + + if (segments <= 1) { + if (shader != null) { + paint.shader = shader; + } else { + paint.color = colors.first; + } + canvas.drawOval(rect, paint); + return; + } + + final gapAngle = _gap / (rect.width / 2); + final sweep = (math.pi * 2 - gapAngle * segments) / segments; + for (int i = 0; i < segments; i++) { + if (shader != null) { + paint.shader = shader; + } else { + paint.color = colors[i]; + } + // Первая дуга начинается сверху, после половины зазора. + final start = -math.pi / 2 + gapAngle / 2 + i * (sweep + gapAngle); + canvas.drawArc(rect, start, sweep, false, paint); + } + } + + @override + bool shouldRepaint(_RingPainter oldDelegate) => + oldDelegate.segments != segments || + oldDelegate.gradient != gradient || + !_sameColors(oldDelegate.colors, colors); + + static bool _sameColors(List a, List b) { + if (a.length != b.length) return false; + for (int i = 0; i < a.length; i++) { + if (a[i] != b[i]) return false; + } + return true; + } +} diff --git a/lib/src/ui/components/personalization_story_navigation.dart b/lib/src/ui/components/personalization_story_navigation.dart new file mode 100644 index 0000000..2a06bca --- /dev/null +++ b/lib/src/ui/components/personalization_story_navigation.dart @@ -0,0 +1,88 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; +import 'personalization_story_progress.dart'; + +/// Шапка просмотра сторис: прогресс слайдов и крестик. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент +/// Navigation/Story. +/// +/// Колонка с шагом 12: [PersonalizationStoryProgress] и строка высотой 32, в конце +/// которой крестик — иконка cross 32 (глиф 18) цвета Text/Secondary с прозрачностью 65%. +class PersonalizationStoryNavigation extends StatelessWidget { + const PersonalizationStoryNavigation({ + super.key, + required this.count, + this.current = 0, + this.progress = 0, + this.onClose, + this.closeLabel = 'Close', + this.iconBuilder, + }); + + /// См. [PersonalizationStoryProgress]. + final int count; + final int current; + final double progress; + + final VoidCallback? onClose; + + /// Подпись крестика для скринридера. + final String closeLabel; + + /// Как нарисовать крестик: пакет не рисует SVG сам. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + static const double _close = 32; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationStoryProgress( + count: count, + current: current, + progress: progress, + ), + const SizedBox(height: 12), + SizedBox( + height: _close, + child: Align( + alignment: AlignmentDirectional.centerEnd, + child: Semantics( + button: true, + label: closeLabel, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: onClose, + child: SizedBox.square( + dimension: _close, + child: Opacity( + opacity: 0.65, + child: iconBuilder?.call( + context, + PersonalizationIcons.cross, + _close, + colors.textSecondary, + ), + ), + ), + ), + ), + ), + ), + ], + ); + } +} diff --git a/lib/src/ui/components/personalization_story_preview.dart b/lib/src/ui/components/personalization_story_preview.dart new file mode 100644 index 0000000..506b028 --- /dev/null +++ b/lib/src/ui/components/personalization_story_preview.dart @@ -0,0 +1,115 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; +import '../personalization_typography.dart'; +import 'personalization_story_cover.dart'; +import 'personalization_story_shimmer.dart'; + +/// Превью сторис в ленте: обложка и подпись под ней. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент Story/Preview. +/// +/// Колонка шириной 88 с шагом 8: [PersonalizationStoryCover] и подпись Regular 12/16 +/// (ступень XS) цветом Text/Primary, по центру, в одну строку с многоточием. У заглушки +/// вместо подписи — переливающаяся плашка 64×8 со скруглением 5 на месте строки. +class PersonalizationStoryPreview extends StatelessWidget { + const PersonalizationStoryPreview({ + super.key, + this.label = '', + this.image, + this.state = PersonalizationStoryCoverState.unviewed, + this.pinned = false, + this.segments = 0, + this.seenSegments = 0, + this.onTap, + this.iconBuilder, + }); + + final String label; + final ImageProvider? image; + final PersonalizationStoryCoverState state; + final bool pinned; + + /// См. [PersonalizationStoryCover.segments]. + final int segments; + + /// См. [PersonalizationStoryCover.seenSegments]. + final int seenSegments; + + /// Нажатие на превью — открыть сторис. У заглушки не вызывается. + final VoidCallback? onTap; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + static const double width = PersonalizationStoryCover.size; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final skeleton = state == PersonalizationStoryCoverState.skeleton; + const style = PersonalizationTypography.xsDefault; + + final column = SizedBox( + width: width, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + PersonalizationStoryCover( + image: image, + state: state, + pinned: pinned, + segments: segments, + seenSegments: seenSegments, + iconBuilder: iconBuilder, + ), + const SizedBox(height: 8), + if (skeleton) + // Плашка на месте строки: высота превью та же, что с подписью. + SizedBox( + height: 16, + child: Center( + child: PersonalizationStoryShimmer( + builder: (context, gradient) => Container( + width: 64, + height: 8, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + gradient: gradient, + ), + ), + ), + ), + ) + else + Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: style.copyWith( + color: theme.colors.textPrimary, + fontFamily: theme.fontFamily.familyFor(style.fontWeight!), + package: theme.fontFamily.package, + ), + ), + ], + ), + ); + + if (skeleton || onTap == null) return column; + return Semantics( + button: true, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: onTap, + child: column, + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_price.dart b/lib/src/ui/components/personalization_story_price.dart new file mode 100644 index 0000000..71fbf59 --- /dev/null +++ b/lib/src/ui/components/personalization_story_price.dart @@ -0,0 +1,383 @@ +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; +import 'personalization_toast.dart'; + +/// Вид блока цены сторис. +/// +/// В макете есть ещё Installment (рассрочка), но в данных сторис её нет — не собран. +enum PersonalizationStoryPriceType { + /// Только цена (и старая цена, если есть). + price, + + /// Цена и справа скидка на Brand/Primary. + discount, + + /// Цена и справа промокод на чёрном; нажатие копирует код. + promoCode, +} + +/// Блок цены на слайде с товаром. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент +/// Card/Story/Price — виды Price, Discount и Promo code. +/// +/// Коробка со скруглением 12 и заливкой #F2F2F2 95% — в макете сырой цвет, не +/// переменная, и он одинаков в обеих темах, поэтому текст на ней всегда тёмный +/// (Text/Dark). Левая колонка с полями 12/16: старая цена (если есть) с прозрачностью +/// 50% — сумма SemiBold 14 зачёркнутая и валюта Regular 14/16 цвета Text/Dark Secondary; +/// под ней цена — сумма SemiBold 24 и валюта Regular 14/16 с шагом 4 по базовой линии, +/// Text/Dark Primary. Валюту от суммы отделяет [splitCurrency]. +/// +/// Справа, по [type]: +/// - discount — блок Brand/Primary с полями 0/16, скидка SemiBold 36 Text/Light Primary; +/// левая колонка забирает остаток; +/// - promoCode — чёрный блок (Text/Dark Primary) с полями 12/16: подпись SemiBold 14 +/// Text/Light Secondary и код SemiBold 24 Text/Light Primary по центру, иконка copy 24 +/// (глиф 20) Text/Light Hint в правом верхнем углу с отступом 4. Колонки делят ширину +/// поровну, длинный код забирает сколько нужно. Нажатие слегка увеличивает блок (как +/// Tap Zoom Effect макета), копирует код в буфер, показывает тост [copiedText] и +/// зовёт [onPromoCopied]. +class PersonalizationStoryPrice extends StatefulWidget { + const PersonalizationStoryPrice({ + super.key, + this.type = PersonalizationStoryPriceType.price, + required this.price, + this.oldPrice, + this.discount, + this.promoCode, + this.promoCodeCaption = 'Promo code', + this.copiedText = 'Copied', + this.onPromoCopied, + this.iconBuilder, + }); + + final PersonalizationStoryPriceType type; + + /// Цена уже отформатированной, с валютой — в макете «1 190 900 ₽». + final String price; + + /// Старая цена; `null` — не показывать. + final String? oldPrice; + + /// Скидка для вида discount, например «10%». + final String? discount; + + /// Код для вида promoCode. + final String? promoCode; + + /// Подпись над кодом. + final String promoCodeCaption; + + /// Текст тоста после копирования. + final String copiedText; + + /// Код скопирован. + final ValueChanged? onPromoCopied; + + /// Как нарисовать иконку копирования: пакет не рисует SVG сам. + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + /// Заливка коробки: #F2F2F2 с прозрачностью 95%. + static const Color boxColor = Color(0xF2F2F2F2); + + /// Увеличение промокода при нажатии. + static const double pressedScale = 1.03; + + /// Делит отформатированную цену на сумму и валюту: валюта — нецифровой хвост строки. + /// `"1 190 900 ₽"` → (`"1 190 900"`, `"₽"`), `"9 999₽"` → (`"9 999"`, `"₽"`). Если + /// строка кончается цифрой (`"$140"`), валюты нет — вся строка сумма. + static (String amount, String currency) splitCurrency(String formatted) { + final text = formatted.trim(); + final match = RegExp(r'^(.*\d)\s*(\D+)$').firstMatch(text); + if (match == null) return (text, ''); + return (match.group(1)!.trim(), match.group(2)!.trim()); + } + + @override + State createState() => + _PersonalizationStoryPriceState(); +} + +class _PersonalizationStoryPriceState extends State { + bool _pressed = false; + + static const double _radius = 12; + + String get _code => widget.promoCode ?? ''; + + bool get _hasSide => switch (widget.type) { + PersonalizationStoryPriceType.price => false, + PersonalizationStoryPriceType.discount => + (widget.discount ?? '').isNotEmpty, + PersonalizationStoryPriceType.promoCode => _code.isNotEmpty, + }; + + void _copy() { + final code = _code; + Clipboard.setData(ClipboardData(text: code)); + PersonalizationToast.show(context, widget.copiedText); + widget.onPromoCopied?.call(code); + } + + TextStyle _style( + PersonalizationTheme theme, + double size, + double lineHeight, + FontWeight weight, + Color color, + ) => TextStyle( + fontSize: size, + height: lineHeight / size, + fontWeight: weight, + letterSpacing: 0, + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + color: color, + ); + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final side = _hasSide; + const radius = Radius.circular(_radius); + + final left = DecoratedBox( + decoration: BoxDecoration( + color: PersonalizationStoryPrice.boxColor, + borderRadius: side + ? const BorderRadius.horizontal(left: radius) + : const BorderRadius.all(radius), + ), + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: _prices(theme), + ), + ); + + if (!side) return left; + + if (widget.type == PersonalizationStoryPriceType.discount) { + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded(child: left), + DecoratedBox( + decoration: BoxDecoration( + color: colors.brandPrimary, + borderRadius: const BorderRadius.horizontal(right: radius), + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Center( + child: Text( + widget.discount!, + maxLines: 1, + style: _style( + theme, + 36, + 44, + FontWeight.w600, + colors.textLightPrimary, + ), + ), + ), + ), + ), + ], + ), + ); + } + + // Промокод: колонки поровну, длинный код забирает сколько нужно — но не больше 70%, + // чтобы цене осталось место; дальше код ужимается. + return LayoutBuilder( + builder: (context, constraints) { + final width = constraints.maxWidth; + return IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded(child: left), + ConstrainedBox( + constraints: BoxConstraints( + minWidth: width / 2, + maxWidth: width * 0.7, + ), + // Ширина по содержимому в пределах ограничений выше. + child: IntrinsicWidth(child: _promo(context, theme)), + ), + ], + ), + ); + }, + ); + } + + Widget _prices(PersonalizationTheme theme) { + final colors = theme.colors; + final (amount, currency) = PersonalizationStoryPrice.splitCurrency( + widget.price, + ); + final old = widget.oldPrice; + + Widget line(Widget amountText, String currencyText, Color color) => + FittedBox( + fit: BoxFit.scaleDown, + alignment: AlignmentDirectional.centerStart, + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + amountText, + if (currencyText.isNotEmpty) ...[ + const SizedBox(width: 4), + Text( + currencyText, + style: _style(theme, 14, 16, FontWeight.w400, color), + ), + ], + ], + ), + ); + + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if ((old ?? '').isNotEmpty) + Opacity( + opacity: 0.5, + child: Builder( + builder: (context) { + final (oldAmount, oldCurrency) = + PersonalizationStoryPrice.splitCurrency(old!); + return line( + Text( + oldAmount, + style: _style( + theme, + 14, + 16, + FontWeight.w600, + colors.textDarkSecondary, + ).copyWith(decoration: TextDecoration.lineThrough), + ), + oldCurrency, + colors.textDarkSecondary, + ); + }, + ), + ), + line( + Text( + amount, + style: _style( + theme, + 24, + 28, + FontWeight.w600, + colors.textDarkPrimary, + ), + ), + currency, + colors.textDarkPrimary, + ), + ], + ); + } + + Widget _promo(BuildContext context, PersonalizationTheme theme) { + final colors = theme.colors; + final block = DecoratedBox( + decoration: BoxDecoration( + color: colors.textDarkPrimary, + borderRadius: const BorderRadius.horizontal( + right: Radius.circular(_radius), + ), + ), + child: Stack( + fit: StackFit.expand, + children: [ + Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + widget.promoCodeCaption, + maxLines: 1, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: _style( + theme, + 14, + 20, + FontWeight.w600, + colors.textLightSecondary, + ), + ), + FittedBox( + fit: BoxFit.scaleDown, + child: Text( + _code, + maxLines: 1, + style: _style( + theme, + 24, + 28, + FontWeight.w600, + colors.textLightPrimary, + ), + ), + ), + ], + ), + ), + Positioned( + top: 4, + right: 4, + child: SizedBox.square( + dimension: 24, + child: widget.iconBuilder?.call( + context, + PersonalizationIcons.copy, + 24, + colors.textLightHint, + ), + ), + ), + ], + ), + ); + + return Semantics( + button: true, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTapDown: (_) => setState(() => _pressed = true), + onTapUp: (_) => setState(() => _pressed = false), + onTapCancel: () => setState(() => _pressed = false), + onTap: _copy, + child: AnimatedScale( + scale: _pressed ? PersonalizationStoryPrice.pressedScale : 1, + duration: const Duration(milliseconds: 120), + child: block, + ), + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_progress.dart b/lib/src/ui/components/personalization_story_progress.dart new file mode 100644 index 0000000..557987f --- /dev/null +++ b/lib/src/ui/components/personalization_story_progress.dart @@ -0,0 +1,65 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; + +/// Прогресс сторис: по отрезку на слайд. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), шапка Navigation/Story. +/// +/// [count] отрезков равной ширины, высота 2, шаг 2, скругление 1. Дорожка — Line/Generic, +/// заливка — Text/Secondary. Отрезки до [current] залиты целиком, текущий — на +/// [progress] (0…1), после него — пустые. +class PersonalizationStoryProgress extends StatelessWidget { + const PersonalizationStoryProgress({ + super.key, + required this.count, + this.current = 0, + this.progress = 0, + }); + + final int count; + + /// Индекс текущего слайда. + final int current; + + /// Сколько показано из текущего слайда, 0…1. + final double progress; + + static const double height = 2; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + final radius = BorderRadius.circular(1); + return SizedBox( + height: height, + child: Row( + children: [ + for (int i = 0; i < count; i++) ...[ + if (i > 0) const SizedBox(width: 2), + Expanded( + child: ClipRRect( + borderRadius: radius, + child: ColoredBox( + color: colors.lineGeneric, + child: Align( + alignment: AlignmentDirectional.centerStart, + child: FractionallySizedBox( + widthFactor: i < current + ? 1 + : i == current + ? progress.clamp(0, 1).toDouble() + : 0, + heightFactor: 1, + child: ColoredBox(color: colors.textSecondary), + ), + ), + ), + ), + ), + ], + ], + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_shimmer.dart b/lib/src/ui/components/personalization_story_shimmer.dart new file mode 100644 index 0000000..0c2989e --- /dev/null +++ b/lib/src/ui/components/personalization_story_shimmer.dart @@ -0,0 +1,73 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; + +/// Переливание заглушек сторис: кольцо и картинка обложки, подпись превью. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), состояние Skeleton у +/// Story/Cover и Story/Preview — градиент чёрный 5% → 30% → 5%. Здесь он идёт от +/// Text/Primary, а не от сырого чёрного: в тёмной схеме чёрная заглушка пропала бы на +/// фоне, а белая с той же прозрачностью читается так же, как чёрная на светлом. +/// +/// Градиент проезжает по заглушке слева направо за [period]; [builder] получает его на +/// каждом кадре и сам решает, чем залить — фоном или шейдером кисти. +/// +/// Внутренняя деталь обложки и превью: из кита не экспортируется. +class PersonalizationStoryShimmer extends StatefulWidget { + const PersonalizationStoryShimmer({ + super.key, + required this.builder, + this.period = const Duration(milliseconds: 1200), + }); + + final Widget Function(BuildContext context, Gradient gradient) builder; + final Duration period; + + @override + State createState() => + _PersonalizationStoryShimmerState(); +} + +class _PersonalizationStoryShimmerState + extends State + with SingleTickerProviderStateMixin { + late final AnimationController _controller = AnimationController( + vsync: this, + duration: widget.period, + )..repeat(); + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final base = PersonalizationTheme.of(context).colors.textPrimary; + final faint = base.withValues(alpha: 0.05); + final strong = base.withValues(alpha: 0.30); + return AnimatedBuilder( + animation: _controller, + builder: (context, _) => widget.builder( + context, + LinearGradient( + colors: [faint, strong, faint], + // Полоса шириной в заглушку въезжает слева и уходит вправо. + transform: _Slide(_controller.value * 2 - 1), + ), + ), + ); + } +} + +/// Сдвиг градиента по горизонтали в долях ширины заглушки. +class _Slide extends GradientTransform { + const _Slide(this.fraction); + + final double fraction; + + @override + Matrix4 transform(Rect bounds, {TextDirection? textDirection}) => + Matrix4.translationValues(bounds.width * fraction, 0, 0); +} diff --git a/lib/src/ui/components/personalization_story_sound_button.dart b/lib/src/ui/components/personalization_story_sound_button.dart new file mode 100644 index 0000000..4340b14 --- /dev/null +++ b/lib/src/ui/components/personalization_story_sound_button.dart @@ -0,0 +1,61 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; + +/// Кнопка звука видео-слайда: динамик или перечёркнутый динамик. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), слайды с видео — +/// иконки speaker / speaker-off 32 цвета Text/Secondary в левом нижнем углу. +class PersonalizationStorySoundButton extends StatelessWidget { + const PersonalizationStorySoundButton({ + super.key, + required this.muted, + this.onPressed, + this.mutedLabel = 'Unmute', + this.unmutedLabel = 'Mute', + this.iconBuilder, + }); + + /// Звук выключен: показывается перечёркнутый динамик. + final bool muted; + final VoidCallback? onPressed; + + /// Подписи для скринридера — действие, которое сделает нажатие. + final String mutedLabel; + final String unmutedLabel; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + static const double size = 32; + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + return Semantics( + button: true, + label: muted ? mutedLabel : unmutedLabel, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: onPressed, + child: SizedBox.square( + dimension: size, + child: iconBuilder?.call( + context, + muted + ? PersonalizationIcons.speakerOff + : PersonalizationIcons.speaker, + size, + colors.textSecondary, + ), + ), + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_text_block.dart b/lib/src/ui/components/personalization_story_text_block.dart new file mode 100644 index 0000000..2f748f4 --- /dev/null +++ b/lib/src/ui/components/personalization_story_text_block.dart @@ -0,0 +1,114 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; + +/// Кегль текстового блока сторис: заготовки макета для текста хоста. +enum PersonalizationStoryTextSize { + /// Regular 48/48. + large, + + /// Regular 30/36. + medium, + + /// Regular 20/24. + small, +} + +/// Текстовый блок на слайде сторис. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент Text Block, +/// секция «Текстовый блок». +/// +/// Два вида. Сплошной — когда у [background] есть непрозрачность: скругление 12, поля +/// 12/16 у крупного текста и 8/16 у мелкого (кегль до 20), фон — цвет сервера со своей +/// прозрачностью. Прозрачный — без полей и фона: текст прямо на картинке слайда. +/// +/// Кегль, интерлиньяж, цвет, выключка, жирность и курсив приходят с элементом; для текста +/// хоста есть заготовки [size]. Цвет по умолчанию — Text/Light Primary на сплошном фоне +/// и Text/Primary на прозрачном. +class PersonalizationStoryTextBlock extends StatelessWidget { + const PersonalizationStoryTextBlock({ + super.key, + required this.text, + this.size = PersonalizationStoryTextSize.medium, + this.fontSize, + this.lineHeight, + this.color, + this.background, + this.textAlign = TextAlign.start, + this.bold = false, + this.italic = false, + this.fontFamily, + this.fontFamilyFallback, + }); + + final String text; + + /// Заготовка кегля и интерлиньяжа; [fontSize] и [lineHeight] её перекрывают. + final PersonalizationStoryTextSize size; + final double? fontSize; + + /// Интерлиньяж в долях кегля, как `TextStyle.height`. + final double? lineHeight; + + /// Цвет текста; `null` — по виду блока. + final Color? color; + + /// Фон блока вместе с прозрачностью; `null` или прозрачный — блок без рамки. + final Color? background; + final TextAlign textAlign; + final bool bold; + final bool italic; + + /// Семейство шрифта элемента (serif, monospace); `null` — шрифт темы. + final String? fontFamily; + final List? fontFamilyFallback; + + /// Блок со сплошным фоном: у фона есть непрозрачность. + bool get solid => background != null && background!.a > 0; + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final (presetSize, presetHeight) = switch (size) { + PersonalizationStoryTextSize.large => (48.0, 48.0), + PersonalizationStoryTextSize.medium => (30.0, 36.0), + PersonalizationStoryTextSize.small => (20.0, 24.0), + }; + final effectiveSize = fontSize ?? presetSize; + final weight = bold ? FontWeight.w600 : FontWeight.w400; + + final label = Text( + text, + textAlign: textAlign, + style: TextStyle( + fontSize: effectiveSize, + height: + lineHeight ?? (fontSize == null ? presetHeight / presetSize : null), + fontWeight: weight, + fontStyle: italic ? FontStyle.italic : FontStyle.normal, + letterSpacing: 0, + fontFamily: fontFamily ?? theme.fontFamily.familyFor(weight), + fontFamilyFallback: fontFamilyFallback, + package: fontFamily == null ? theme.fontFamily.package : null, + color: color ?? (solid ? colors.textLightPrimary : colors.textPrimary), + ), + ); + + if (!solid) return label; + return DecoratedBox( + decoration: BoxDecoration( + color: background, + borderRadius: BorderRadius.circular(12), + ), + child: Padding( + padding: EdgeInsets.symmetric( + vertical: effectiveSize <= 20 ? 8 : 12, + horizontal: 16, + ), + child: label, + ), + ); + } +} diff --git a/lib/src/ui/components/personalization_story_timer.dart b/lib/src/ui/components/personalization_story_timer.dart new file mode 100644 index 0000000..cccc808 --- /dev/null +++ b/lib/src/ui/components/personalization_story_timer.dart @@ -0,0 +1,197 @@ +import 'dart:async'; + +import 'package:flutter/widgets.dart'; + +import '../personalization_theme.dart'; + +/// Вид таймера: одной плашкой или по плашке на единицу. +enum PersonalizationStoryTimerView { merged, separate } + +/// Обратный отсчёт до [endTime]: дни, часы, минуты, секунды. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент Timer на +/// слайдах Action. +/// +/// Каждая единица — число SemiBold 36 Text/Primary и подпись Regular 20 Text/Secondary с +/// шагом 2 по базовой линии. merged — одна плашка со скруглением 12, полями 8/12 и шагом +/// 12 между единицами, заливка Neutral/Neutral 100; separate — четыре плашки со +/// скруглением 8, полями 8/12 и шагом 8, каждая тянется на равную долю ширины. Часы, +/// минуты и секунды — двумя цифрами. +/// +/// Тикает раз в секунду и останавливается на нуле, тогда же зовёт [onFinished]. В данных +/// сторис таймера нет: время конца даёт хост. +class PersonalizationStoryTimer extends StatefulWidget { + const PersonalizationStoryTimer({ + super.key, + required this.endTime, + this.view = PersonalizationStoryTimerView.merged, + this.daysLabel = 'd', + this.hoursLabel = 'h', + this.minutesLabel = 'm', + this.secondsLabel = 's', + this.onFinished, + }); + + final DateTime endTime; + final PersonalizationStoryTimerView view; + final String daysLabel; + final String hoursLabel; + final String minutesLabel; + final String secondsLabel; + + /// Отсчёт дошёл до нуля. + final VoidCallback? onFinished; + + /// Остаток, разложенный на единицы: `(дни, часы, минуты, секунды)` строками, как их + /// показывает таймер. Отрицательный остаток — нули. + static (String, String, String, String) format(Duration remaining) { + final total = remaining.isNegative ? 0 : remaining.inSeconds; + String two(int value) => value.toString().padLeft(2, '0'); + return ( + '${total ~/ Duration.secondsPerDay}', + two(total % Duration.secondsPerDay ~/ Duration.secondsPerHour), + two(total % Duration.secondsPerHour ~/ Duration.secondsPerMinute), + two(total % Duration.secondsPerMinute), + ); + } + + @override + State createState() => + _PersonalizationStoryTimerState(); +} + +class _PersonalizationStoryTimerState extends State { + Timer? _ticker; + Duration _remaining = Duration.zero; + + @override + void initState() { + super.initState(); + _start(); + } + + @override + void didUpdateWidget(PersonalizationStoryTimer oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.endTime != widget.endTime) _start(); + } + + @override + void dispose() { + _ticker?.cancel(); + super.dispose(); + } + + void _start() { + _ticker?.cancel(); + _remaining = _left(); + if (_remaining <= Duration.zero) return; + _ticker = Timer.periodic(const Duration(seconds: 1), (_) => _tick()); + } + + Duration _left() { + final left = widget.endTime.difference(DateTime.now()); + return left.isNegative ? Duration.zero : left; + } + + void _tick() { + final left = _left(); + setState(() => _remaining = left); + if (left <= Duration.zero) { + _ticker?.cancel(); + _ticker = null; + widget.onFinished?.call(); + } + } + + @override + Widget build(BuildContext context) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final (days, hours, minutes, seconds) = PersonalizationStoryTimer.format( + _remaining, + ); + + TextStyle style(double size, double height, FontWeight weight, Color c) => + TextStyle( + fontSize: size, + height: height / size, + fontWeight: weight, + letterSpacing: 0, + fontFamily: theme.fontFamily.familyFor(weight), + package: theme.fontFamily.package, + color: c, + ); + + Widget unit(String value, String label) => Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text(value, style: style(36, 44, FontWeight.w600, colors.textPrimary)), + const SizedBox(width: 2), + Text( + label, + style: style(20, 28, FontWeight.w400, colors.textSecondary), + ), + ], + ); + + final units = [ + unit(days, widget.daysLabel), + unit(hours, widget.hoursLabel), + unit(minutes, widget.minutesLabel), + unit(seconds, widget.secondsLabel), + ]; + + const padding = EdgeInsets.symmetric(vertical: 8, horizontal: 12); + switch (widget.view) { + case PersonalizationStoryTimerView.merged: + return Container( + padding: padding, + decoration: BoxDecoration( + color: colors.neutral100, + borderRadius: BorderRadius.circular(12), + ), + child: _fit( + Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + for (int i = 0; i < units.length; i++) ...[ + if (i > 0) const SizedBox(width: 12), + units[i], + ], + ], + ), + ), + ); + case PersonalizationStoryTimerView.separate: + return Row( + children: [ + for (int i = 0; i < units.length; i++) ...[ + if (i > 0) const SizedBox(width: 8), + Expanded( + child: Container( + padding: padding, + decoration: BoxDecoration( + color: colors.neutral100, + borderRadius: BorderRadius.circular(8), + ), + child: _fit(units[i]), + ), + ), + ], + ], + ); + } + } + + // По центру плашки; не влезает по ширине — ужимается целиком, а не переносится. Высота + // по содержимому: FittedBox без Center растянул бы плашку по пропорции. + Widget _fit(Widget child) => Center( + heightFactor: 1, + child: FittedBox(fit: BoxFit.scaleDown, child: child), + ); +} diff --git a/lib/src/ui/components/personalization_story_used_products.dart b/lib/src/ui/components/personalization_story_used_products.dart new file mode 100644 index 0000000..a521cc9 --- /dev/null +++ b/lib/src/ui/components/personalization_story_used_products.dart @@ -0,0 +1,122 @@ +import 'package:flutter/widgets.dart'; + +import '../personalization_icons.dart'; +import '../personalization_theme.dart'; +import 'personalization_button.dart'; +import 'personalization_product.dart'; +import 'personalization_products_list.dart'; + +/// Товары со слайда сторис: кнопка-переключатель внизу и карусель над ней. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), слайды Slide с товарами +/// (свёрнуто и развёрнуто). +/// +/// Свёрнуто — строка высотой 64 с полями 16, по центру пилюля: кнопка SM Secondary со +/// скруглением Rounded, подпись [showText] (SemiBold 14/24) и иконка angle-up. Развёрнуто — +/// лист Background/Card: карусель кита (карточки 220, поля 16/0/16/16, шаг 16) и та же +/// строка с подписью [hideText] и иконкой angle-down. В начале строки — необязательный +/// [leading]: во вьюере это кнопка звука видео. +/// +/// Раскрытие ведёт сам виджет; [onExpandedChanged] сообщает о нём — вьюер на это время +/// ставит слайд на паузу. +class PersonalizationStoryUsedProducts extends StatefulWidget { + const PersonalizationStoryUsedProducts({ + super.key, + required this.products, + this.showText = 'Used products', + this.hideText = 'Hide products', + this.initiallyExpanded = false, + this.onExpandedChanged, + this.onProductTap, + this.leading, + this.iconBuilder, + }); + + final List products; + + /// Подпись свёрнутого переключателя. + final String showText; + + /// Подпись развёрнутого переключателя. + final String hideText; + final bool initiallyExpanded; + final ValueChanged? onExpandedChanged; + + /// Нажатие на карточку — открыть товар. + final ValueChanged? onProductTap; + + /// Виджет в начале строки переключателя. + final Widget? leading; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => + _PersonalizationStoryUsedProductsState(); +} + +class _PersonalizationStoryUsedProductsState + extends State { + late bool _expanded = widget.initiallyExpanded; + + void _toggle() { + setState(() => _expanded = !_expanded); + widget.onExpandedChanged?.call(_expanded); + } + + @override + Widget build(BuildContext context) { + final colors = PersonalizationTheme.of(context).colors; + final row = SizedBox( + height: 64, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Stack( + alignment: Alignment.center, + children: [ + if (widget.leading != null) + Align( + alignment: AlignmentDirectional.centerStart, + child: widget.leading, + ), + PersonalizationButton( + label: _expanded ? widget.hideText : widget.showText, + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.secondary, + rounded: true, + iconEnd: _expanded + ? PersonalizationIcons.angleDown + : PersonalizationIcons.angleUp, + iconBuilder: widget.iconBuilder, + onPressed: _toggle, + ), + ], + ), + ), + ); + + if (!_expanded) return row; + return ColoredBox( + color: colors.backgroundCard, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + PersonalizationProductsList( + products: widget.products, + carouselPadding: const EdgeInsets.fromLTRB(16, 16, 0, 16), + onProductTap: widget.onProductTap, + iconBuilder: widget.iconBuilder, + ), + row, + ], + ), + ); + } +} diff --git a/lib/src/ui/personalization_colors.dart b/lib/src/ui/personalization_colors.dart index d1908d9..f008be2 100644 --- a/lib/src/ui/personalization_colors.dart +++ b/lib/src/ui/personalization_colors.dart @@ -16,8 +16,17 @@ class PersonalizationColors { /// Neutral 50: полупрозрачная ступень, одинаково заметна на любом фоне — заглушки картинок. final Color neutral50; + /// Neutral 100: вдвое плотнее Neutral 50 — подложка таймера сторис. + final Color neutral100; + final Color semanticWarning; final Color semanticDanger; + + /// Semantic/Info: синий для информационных плашек — фон текстовых блоков сторис. + final Color semanticInfo; + + /// Semantic/Neutral Subtle: приглушённый нейтральный — кольцо просмотренной сторис. + final Color neutralSubtle; final Color backgroundGeneric; final Color backgroundCard; @@ -65,8 +74,11 @@ class PersonalizationColors { const PersonalizationColors({ required this.brandPrimary, required this.neutral50, + required this.neutral100, required this.semanticWarning, required this.semanticDanger, + required this.semanticInfo, + required this.neutralSubtle, required this.backgroundGeneric, required this.backgroundCard, required this.backgroundFloat, @@ -108,8 +120,11 @@ class PersonalizationColors { static const PersonalizationColors light = PersonalizationColors( brandPrimary: Color(0xFF007DF2), neutral50: Color(0x0D000000), + neutral100: Color(0x1A000000), semanticWarning: Color(0xFFF37A17), semanticDanger: Color(0xFFE51919), + semanticInfo: Color(0xFF0087E8), + neutralSubtle: Color(0xFFCCCCCC), backgroundGeneric: Color(0xFFF2F2F2), backgroundCard: Color(0xFFFFFFFF), backgroundFloat: Color(0xFFFFFFFF), @@ -152,8 +167,11 @@ class PersonalizationColors { static const PersonalizationColors dark = PersonalizationColors( brandPrimary: Color(0xFF007DF2), neutral50: Color(0x0DFFFFFF), + neutral100: Color(0x1AFFFFFF), semanticWarning: Color(0xFFF37A17), semanticDanger: Color(0xFFE51919), + semanticInfo: Color(0xFF0087E8), + neutralSubtle: Color(0xFF262626), backgroundGeneric: Color(0xFF0D0D0D), backgroundCard: Color(0xFF1A1A1A), backgroundFloat: Color(0xFF262626), @@ -201,8 +219,11 @@ class PersonalizationColors { PersonalizationColors copyWith({ Color? brandPrimary, Color? neutral50, + Color? neutral100, Color? semanticWarning, Color? semanticDanger, + Color? semanticInfo, + Color? neutralSubtle, Color? backgroundGeneric, Color? backgroundCard, Color? backgroundFloat, @@ -243,8 +264,11 @@ class PersonalizationColors { return PersonalizationColors( brandPrimary: brandPrimary ?? this.brandPrimary, neutral50: neutral50 ?? this.neutral50, + neutral100: neutral100 ?? this.neutral100, semanticWarning: semanticWarning ?? this.semanticWarning, semanticDanger: semanticDanger ?? this.semanticDanger, + semanticInfo: semanticInfo ?? this.semanticInfo, + neutralSubtle: neutralSubtle ?? this.neutralSubtle, backgroundGeneric: backgroundGeneric ?? this.backgroundGeneric, backgroundCard: backgroundCard ?? this.backgroundCard, backgroundFloat: backgroundFloat ?? this.backgroundFloat, @@ -294,8 +318,11 @@ class PersonalizationColors { return PersonalizationColors( brandPrimary: Color.lerp(brandPrimary, other.brandPrimary, t)!, neutral50: Color.lerp(neutral50, other.neutral50, t)!, + neutral100: Color.lerp(neutral100, other.neutral100, t)!, semanticWarning: Color.lerp(semanticWarning, other.semanticWarning, t)!, semanticDanger: Color.lerp(semanticDanger, other.semanticDanger, t)!, + semanticInfo: Color.lerp(semanticInfo, other.semanticInfo, t)!, + neutralSubtle: Color.lerp(neutralSubtle, other.neutralSubtle, t)!, backgroundGeneric: Color.lerp( backgroundGeneric, other.backgroundGeneric, diff --git a/lib/src/ui/personalization_icons.dart b/lib/src/ui/personalization_icons.dart index 8b4dd40..a197cdf 100644 --- a/lib/src/ui/personalization_icons.dart +++ b/lib/src/ui/personalization_icons.dart @@ -37,6 +37,11 @@ abstract final class PersonalizationIcons { static const String rosette = 'packages/rees46_sdk/assets/icons/rosette.svg'; static const String spacingMd = 'packages/rees46_sdk/assets/icons/spacing-md.svg'; + + /// Звук видео-слайда сторис: включён / выключен. Страница Stories (1:32). + static const String speaker = 'packages/rees46_sdk/assets/icons/speaker.svg'; + static const String speakerOff = + 'packages/rees46_sdk/assets/icons/speaker-off.svg'; static const String starFill = 'packages/rees46_sdk/assets/icons/star-fill.svg'; @@ -59,6 +64,8 @@ abstract final class PersonalizationIcons { magnifier, rosette, spacingMd, + speaker, + speakerOff, starFill, ]; } diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index e9e8ae9..8ca89e5 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -56,6 +56,18 @@ export 'components/personalization_toast.dart'; // внутренность штрихкода. export 'components/personalization_barcode.dart'; export 'components/personalization_loyalty_card.dart'; +// Сторис V2. Заглушка-переливание (personalization_story_shimmer.dart) не +// экспортируется — это внутренность обложки и превью. +export 'components/personalization_story_cover.dart'; +export 'components/personalization_story_preview.dart'; +export 'components/personalization_stories_bar.dart'; +export 'components/personalization_story_progress.dart'; +export 'components/personalization_story_navigation.dart'; +export 'components/personalization_story_sound_button.dart'; +export 'components/personalization_story_price.dart'; +export 'components/personalization_story_timer.dart'; +export 'components/personalization_story_text_block.dart'; +export 'components/personalization_story_used_products.dart'; // Виджеты с данными SDK: сами резолвят инстанс по shopId, ходят в поиск и держат состояние. export 'widgets/search_support.dart' show PersonalizationSearchCategory; diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart new file mode 100644 index 0000000..7450551 --- /dev/null +++ b/test/ui/personalization_story_components_test.dart @@ -0,0 +1,307 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; + +Widget _host(Widget child) => MaterialApp( + home: Scaffold( + body: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: 400, child: child), + ), + ), +); + +void main() { + group('StoryPrice', () { + test('the currency is the trailing non-digit token', () { + expect(PersonalizationStoryPrice.splitCurrency('1 190 900 ₽'), ( + '1 190 900', + '₽', + )); + expect(PersonalizationStoryPrice.splitCurrency('9 999₽'), ('9 999', '₽')); + expect(PersonalizationStoryPrice.splitCurrency('1,190.00 USD'), ( + '1,190.00', + 'USD', + )); + expect(PersonalizationStoryPrice.splitCurrency('10 000 тг.'), ( + '10 000', + 'тг.', + )); + expect(PersonalizationStoryPrice.splitCurrency(r'$140'), (r'$140', '')); + expect(PersonalizationStoryPrice.splitCurrency(''), ('', '')); + }); + + testWidgets('discount draws the percent on the brand block', ( + tester, + ) async { + await tester.pumpWidget( + _host( + const PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.discount, + price: '1 190 900 ₽', + oldPrice: '245 000 ₽', + discount: '10%', + ), + ), + ); + expect(find.text('10%'), findsOneWidget); + expect(find.text('1 190 900'), findsOneWidget); + expect(find.text('245 000'), findsOneWidget); + expect(find.text('₽'), findsNWidgets(2)); + final brand = find.byWidgetPredicate( + (widget) => + widget is DecoratedBox && + widget.decoration is BoxDecoration && + (widget.decoration as BoxDecoration).color == + PersonalizationColors.light.brandPrimary, + ); + expect(brand, findsOneWidget); + }); + + testWidgets('tapping the promo code copies it, toasts and reports', ( + tester, + ) async { + String? clipboard; + tester.binding.defaultBinaryMessenger.setMockMethodCallHandler( + SystemChannels.platform, + (call) async { + if (call.method == 'Clipboard.setData') { + clipboard = (call.arguments as Map)['text'] as String; + } + return null; + }, + ); + addTearDown( + () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler( + SystemChannels.platform, + null, + ), + ); + final copied = []; + await tester.pumpWidget( + _host( + PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.promoCode, + price: '1 190 900 ₽', + promoCode: 'YAGODA-MALINA', + copiedText: 'Code copied', + onPromoCopied: copied.add, + ), + ), + ); + + final gesture = await tester.startGesture( + tester.getCenter(find.text('YAGODA-MALINA')), + ); + await tester.pump(const Duration(milliseconds: 200)); + final scale = tester.widget(find.byType(AnimatedScale)); + expect(scale.scale, PersonalizationStoryPrice.pressedScale); + await gesture.up(); + await tester.pump(); + + expect(clipboard, 'YAGODA-MALINA'); + expect(copied, ['YAGODA-MALINA']); + expect(find.text('Code copied'), findsOneWidget); + expect(tester.widget(find.byType(AnimatedScale)).scale, 1); + // The toast leaves by itself. + await tester.pump(const Duration(seconds: 3)); + expect(find.text('Code copied'), findsNothing); + }); + + testWidgets('columns share the width; a long code takes more', ( + tester, + ) async { + Future promoWidth(String code) async { + await tester.pumpWidget( + _host( + PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.promoCode, + price: '1 190 900 ₽', + promoCode: code, + ), + ), + ); + return tester.getSize(find.byType(AnimatedScale)).width; + } + + expect(await promoWidth('PROMO'), 200); + final long = await promoWidth('A-VERY-LONG-PROMO-CODE-2026'); + expect(long, greaterThan(200)); + expect(long, lessThanOrEqualTo(400 * 0.7)); + }); + }); + + test('the timer splits the rest into days and two-digit units', () { + expect( + PersonalizationStoryTimer.format( + const Duration(days: 2, hours: 18, minutes: 33, seconds: 24), + ), + ('2', '18', '33', '24'), + ); + expect( + PersonalizationStoryTimer.format( + const Duration(hours: 1, minutes: 2, seconds: 3), + ), + ('0', '01', '02', '03'), + ); + expect(PersonalizationStoryTimer.format(const Duration(seconds: -5)), ( + '0', + '00', + '00', + '00', + )); + }); + + testWidgets('a finished timer shows zeros and reports once', (tester) async { + var finished = 0; + await tester.pumpWidget( + _host( + PersonalizationStoryTimer( + endTime: DateTime.now().subtract(const Duration(seconds: 1)), + view: PersonalizationStoryTimerView.separate, + onFinished: () => finished++, + ), + ), + ); + expect(find.text('0'), findsOneWidget); + expect(find.text('00'), findsNWidgets(3)); + expect(find.text('d'), findsOneWidget); + await tester.pump(const Duration(seconds: 2)); + expect(finished, 0, reason: 'already over when shown: nothing to count'); + }); + + group('StoryTextBlock', () { + BoxDecoration? frame(WidgetTester tester) { + final boxes = find.descendant( + of: find.byType(PersonalizationStoryTextBlock), + matching: find.byType(DecoratedBox), + ); + if (boxes.evaluate().isEmpty) return null; + return tester.widget(boxes.first).decoration + as BoxDecoration; + } + + testWidgets('solid: server colour, radius 12, padding by size', ( + tester, + ) async { + const green = Color(0x6616AE13); + await tester.pumpWidget( + _host( + const PersonalizationStoryTextBlock( + text: 'Open eat dear winding belonging.', + size: PersonalizationStoryTextSize.large, + background: green, + ), + ), + ); + expect(frame(tester)!.color, green); + expect(frame(tester)!.borderRadius, BorderRadius.circular(12)); + final padding = tester.widget( + find.descendant( + of: find.byType(PersonalizationStoryTextBlock), + matching: find.byType(Padding), + ), + ); + expect( + padding.padding, + const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + ); + final text = tester.widget(find.byType(Text)); + expect(text.style!.color, PersonalizationColors.light.textLightPrimary); + expect(text.style!.fontSize, 48); + + await tester.pumpWidget( + _host( + const PersonalizationStoryTextBlock( + text: 'Small', + size: PersonalizationStoryTextSize.small, + background: green, + ), + ), + ); + expect( + tester + .widget( + find.descendant( + of: find.byType(PersonalizationStoryTextBlock), + matching: find.byType(Padding), + ), + ) + .padding, + const EdgeInsets.symmetric(vertical: 8, horizontal: 16), + ); + }); + + testWidgets('transparent: no frame, Text/Primary', (tester) async { + await tester.pumpWidget( + _host( + const PersonalizationStoryTextBlock( + text: 'Plain', + background: Color(0x0016AE13), + ), + ), + ); + expect(frame(tester), isNull); + final text = tester.widget(find.byType(Text)); + expect(text.style!.color, PersonalizationColors.light.textPrimary); + expect(text.style!.fontSize, 30); + }); + }); + + testWidgets('a pinned cover wears the star; a skeleton has none', ( + tester, + ) async { + await tester.pumpWidget( + _host( + const Align( + alignment: Alignment.topLeft, + child: PersonalizationStoryPreview( + label: 'Pinned', + pinned: true, + segments: 5, + seenSegments: 2, + ), + ), + ), + ); + expect(find.byType(PersonalizationFavoritesBadge), findsOneWidget); + expect(find.text('Pinned'), findsOneWidget); + expect( + tester.getSize(find.byType(PersonalizationStoryPreview)), + const Size(88, 88 + 8 + 16), + ); + + await tester.pumpWidget( + _host( + const Align( + alignment: Alignment.topLeft, + child: PersonalizationStoryPreview( + state: PersonalizationStoryCoverState.skeleton, + ), + ), + ), + ); + expect(find.byType(PersonalizationFavoritesBadge), findsNothing); + expect( + tester.getSize(find.byType(PersonalizationStoryPreview)), + const Size(88, 88 + 8 + 16), + reason: 'the skeleton keeps the height of a labelled preview', + ); + }); + + testWidgets('progress fills the passed segments and part of the current', ( + tester, + ) async { + await tester.pumpWidget( + _host( + const PersonalizationStoryProgress(count: 4, current: 1, progress: 0.5), + ), + ); + final fills = tester + .widgetList(find.byType(FractionallySizedBox)) + .map((box) => box.widthFactor) + .toList(); + expect(fills, [1, 0.5, 0, 0]); + }); +} From 973cddd1c7fd4ac075e3186d47532bd174301436 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:01:39 +0400 Subject: [PATCH 48/79] feat(ui): stories v2 viewer and widget PersonalizationStoryViewer plays a block full screen: slides by their duration once the media has loaded, taps on the left third go back and the rest forward, a long press pauses, a swipe down closes, a side swipe changes the story, the last slide of the last story closes. Media slides take the kit's dark tokens and keep the host's brand; product slides follow the app theme. Video slides play through video_player, muted by default with a speaker toggle. Every shown slide tracks `view`; buttons, products and promo codes track `click`. Links go to `onLinkClick`, or to the system handler through the SDK. PersonalizationStories is the data widget: it resolves the SDK like the search widgets (explicit sdk, shopId, or the only shop), shows skeletons while loading, hides itself when the block is empty or fails, opens the viewer from the bar and remembers the slides seen: a story turns viewed once all its slides were shown, and reopens at the first unseen one. Adds the video_player dependency. --- example/ios/Podfile.lock | 7 + example/pubspec.lock | 56 ++ lib/src/ui/personalization_ui.dart | 6 + .../ui/widgets/personalization_stories.dart | 251 +++++ .../widgets/personalization_story_viewer.dart | 883 ++++++++++++++++++ lib/src/ui/widgets/stories_support.dart | 161 ++++ pubspec.yaml | 2 + test/ui/personalization_stories_test.dart | 401 ++++++++ 8 files changed, 1767 insertions(+) create mode 100644 lib/src/ui/widgets/personalization_stories.dart create mode 100644 lib/src/ui/widgets/personalization_story_viewer.dart create mode 100644 lib/src/ui/widgets/stories_support.dart create mode 100644 test/ui/personalization_stories_test.dart diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d6f7fb4..3c6a452 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -14,6 +14,9 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS + - video_player_avfoundation (0.0.1): + - Flutter + - FlutterMacOS DEPENDENCIES: - Flutter (from `Flutter`) @@ -21,6 +24,7 @@ DEPENDENCIES: - patrol (from `.symlinks/plugins/patrol/darwin`) - rees46_sdk (from `.symlinks/plugins/rees46_sdk/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) SPEC REPOS: trunk: @@ -38,6 +42,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/rees46_sdk/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/darwin" SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 @@ -47,6 +53,7 @@ SPEC CHECKSUMS: REES46: fcc2b0e20747439ed15b24e22d810d13ce059654 rees46_sdk: e3c4432522f341a644a483e6e94acc1f956d85e5 shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb + video_player_avfoundation: 3453f792138786248960ca029747fcd9f318ef52 PODFILE CHECKSUM: b6e248ac4c1eff5807c8b044b39b8bc326af3f5f diff --git a/example/pubspec.lock b/example/pubspec.lock index 628d132..b6a2dee 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -49,6 +49,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.19.1" + csslib: + dependency: transitive + description: + name: csslib + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" + source: hosted + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -138,6 +146,14 @@ packages: description: flutter source: sdk version: "0.0.0" + html: + dependency: transitive + description: + name: html + sha256: "43b67b8f43321ab066817dfac5619596c98bb1b61624e77203bb4351785f9699" + url: "https://pub.dev" + source: hosted + version: "0.15.7" http: dependency: transitive description: @@ -491,6 +507,46 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" + video_player: + dependency: transitive + description: + name: video_player + sha256: "48a7bdaa38a3d50ec10c78627abdbfad863fdf6f0d6e08c7c3c040cfd80ae36f" + url: "https://pub.dev" + source: hosted + version: "2.11.1" + video_player_android: + dependency: transitive + description: + name: video_player_android + sha256: "877a6c7ba772456077d7bfd71314629b3fe2b73733ce503fc77c3314d43a0ca0" + url: "https://pub.dev" + source: hosted + version: "2.9.5" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + sha256: "2fc56e537324a19eb649fca991aa308ac961b5406292876fa657b062de461fd8" + url: "https://pub.dev" + source: hosted + version: "2.12.0" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + sha256: "92c0fbabe20c788e71fd10d26cea998d0d253282e65d145aed0818731cf593ce" + url: "https://pub.dev" + source: hosted + version: "6.9.0" + video_player_web: + dependency: transitive + description: + name: video_player_web + sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb" + url: "https://pub.dev" + source: hosted + version: "2.4.0" vm_service: dependency: transitive description: diff --git a/lib/src/ui/personalization_ui.dart b/lib/src/ui/personalization_ui.dart index 8ca89e5..ba1442c 100644 --- a/lib/src/ui/personalization_ui.dart +++ b/lib/src/ui/personalization_ui.dart @@ -73,3 +73,9 @@ export 'components/personalization_story_used_products.dart'; export 'widgets/search_support.dart' show PersonalizationSearchCategory; export 'widgets/personalization_instant_search_field.dart'; export 'widgets/personalization_search_results_screen.dart'; +// Модели блока сторис живут рядом с остальными ответами SDK, но до релиза кита +// видны только отсюда: пакетный барель их не экспортирует. +export '../stories/stories_response.dart' hide parseStoryOpacity; +export 'widgets/stories_support.dart' show PersonalizationStoryImageProvider; +export 'widgets/personalization_story_viewer.dart'; +export 'widgets/personalization_stories.dart'; diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart new file mode 100644 index 0000000..b38d1b0 --- /dev/null +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -0,0 +1,251 @@ +import 'dart:math' as math; + +import 'package:flutter/widgets.dart'; + +import '../../multi_instance/rees46.dart'; +import '../../personalization_sdk.dart'; +import '../../stories/stories_response.dart'; +import '../components/personalization_stories_bar.dart'; +import 'personalization_story_viewer.dart'; +import 'stories_support.dart'; + +/// Блок сторис с данными SDK: лента превью, по нажатию — полноэкранный просмотр. +/// +/// Паттерн «Блок сторис на странице» из Figma (страница Stories, 1:32), источник — +/// `stories/{code}`. Визуальный слой — [PersonalizationStoriesBar] и +/// [PersonalizationStoryViewer]. Прежние сторис SDK не затрагивает. +/// +/// Инстанс SDK: [sdk] явно, иначе [shopId] выбирает магазин при нескольких +/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). Если +/// магазин не зарегистрирован, виджет остаётся пустым и пишет об этом в лог. +/// +/// Пока блок грузится, в ленте заглушки; пустой блок или ошибка — виджет исчезает (ошибка +/// уходит в [onError]). Кольцо обложки поделено по слайдам; показанные слайды и +/// просмотренные сторис виджет помнит, пока жив: сторис считается просмотренной, когда +/// показаны все её слайды, а следующее открытие продолжает с первого непоказанного. +/// Сервер со своей стороны помнит просмотры по трекингу — при новой загрузке они придут в +/// `viewed` и `start_position`. +class PersonalizationStories extends StatefulWidget { + const PersonalizationStories({ + super.key, + required this.code, + this.sdk, + this.shopId, + this.onLinkClick, + this.onProductClick, + this.onPromoCopied, + this.onError, + this.promoCopiedText = 'Copied', + this.promoCodeCaption = 'Promo code', + this.moreInfoText = 'More info', + this.usedProductsText = 'Used products', + this.hideProductsText = 'Hide products', + this.padding = const EdgeInsets.all(16), + this.imageProvider, + this.iconBuilder, + }); + + /// Код блока сторис. + final String code; + + /// Явный инстанс; иначе резолв по [shopId]. + final PersonalizationSdk? sdk; + + /// Магазин при нескольких зарегистрированных; без него — единственный. + final String? shopId; + + /// См. [PersonalizationStoryViewer.onLinkClick]. + final ValueChanged? onLinkClick; + + /// См. [PersonalizationStoryViewer.onProductClick]. + final ValueChanged? onProductClick; + final ValueChanged? onPromoCopied; + final ValueChanged? onError; + + final String promoCopiedText; + final String promoCodeCaption; + final String moreInfoText; + final String usedProductsText; + final String hideProductsText; + + /// Поля ленты. + final EdgeInsetsGeometry padding; + + /// Картинка по адресу; не задан — [NetworkImage]. + final PersonalizationStoryImageProvider? imageProvider; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + @override + State createState() => _PersonalizationStoriesState(); +} + +class _PersonalizationStoriesState extends State { + PersonalizationSdk? _sdk; + List _stories = const []; + bool _loading = true; + int _seq = 0; + + /// Сколько первых слайдов показано, по id сторис. + final Map _seen = {}; + + /// Сторис, досмотренные в этом виджете. + final Set _viewed = {}; + + @override + void initState() { + super.initState(); + _resolve(); + } + + @override + void didUpdateWidget(PersonalizationStories oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.sdk != widget.sdk || + oldWidget.shopId != widget.shopId || + oldWidget.code != widget.code) { + _resolve(); + } + } + + void _resolve() { + PersonalizationSdk? sdk = widget.sdk; + if (sdk == null) { + try { + sdk = REES46.getInstance(widget.shopId); + } catch (error) { + debugPrint( + 'PersonalizationStories: cannot resolve an SDK for ' + 'shopId=${widget.shopId} — $error', + ); + // После кадра: резолв идёт и из initState, а хост в ответ может, например, + // показать снекбар — посреди сборки это запрещено. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) widget.onError?.call(error); + }); + } + } + _sdk = sdk; + _load(); + } + + Future _load() async { + final seq = ++_seq; + final sdk = _sdk; + _seen.clear(); + _viewed.clear(); + if (sdk == null || widget.code.isEmpty) { + setState(() { + _loading = false; + _stories = const []; + }); + return; + } + setState(() => _loading = true); + try { + final block = await sdk.getStories(widget.code); + if (!mounted || seq != _seq) return; + setState(() { + _loading = false; + _stories = block.stories + .where((story) => story.slides.isNotEmpty) + .toList(); + }); + } catch (error) { + if (!mounted || seq != _seq) return; + setState(() { + _loading = false; + _stories = const []; + }); + widget.onError?.call(error); + } + } + + int _seenOf(Story story) => _seen[story.id] ?? story.startPosition; + + bool _isViewed(Story story) => story.viewed || _viewed.contains(story.id); + + /// С какого слайда открыть: первый непоказанный, у досмотренной — с начала. + int _startOf(Story story) { + final seen = _seenOf(story); + return seen >= story.slides.length ? 0 : math.max(0, seen); + } + + void _shown(Story story, int slideIndex) { + if (!mounted) return; + setState(() { + final seen = math.max(_seenOf(story), slideIndex + 1); + _seen[story.id] = seen; + if (seen >= story.slides.length) _viewed.add(story.id); + }); + } + + void _open(int index) { + final stories = _stories; + final viewer = PersonalizationStoryViewer( + stories: stories, + initialStory: index, + startSlides: { + for (final story in stories) story.id: _startOf(story), + }, + code: widget.code, + sdk: _sdk, + onSlideShown: _shown, + onLinkClick: widget.onLinkClick, + onProductClick: widget.onProductClick, + onPromoCopied: widget.onPromoCopied, + moreInfoText: widget.moreInfoText, + promoCodeCaption: widget.promoCodeCaption, + promoCopiedText: widget.promoCopiedText, + usedProductsText: widget.usedProductsText, + hideProductsText: widget.hideProductsText, + imageProvider: widget.imageProvider, + iconBuilder: widget.iconBuilder, + ); + final navigator = Navigator.of(context, rootNavigator: true); + // Тема ленты едет с просмотром: хост мог задать её поддереву, а не приложению. + navigator.push( + PersonalizationStoryViewer.route( + InheritedTheme.capture( + from: context, + to: navigator.context, + ).wrap(viewer), + ), + ); + } + + @override + Widget build(BuildContext context) { + if (_loading) { + return PersonalizationStoriesBar(loading: true, padding: widget.padding); + } + final stories = _stories; + if (stories.isEmpty) return const SizedBox.shrink(); + return PersonalizationStoriesBar( + padding: widget.padding, + items: [ + for (final story in stories) + PersonalizationStoryItem( + id: story.id, + label: story.name, + image: storyImage(story.avatar, widget.imageProvider), + pinned: story.pinned, + viewed: _isViewed(story), + segments: story.slides.length, + seenSegments: _seenOf(story), + ), + ], + onItemTap: (item) { + final index = stories.indexWhere((story) => story.id == item.id); + if (index >= 0) _open(index); + }, + iconBuilder: widget.iconBuilder, + ); + } +} diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart new file mode 100644 index 0000000..f00b0ce --- /dev/null +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -0,0 +1,883 @@ +import 'dart:math' as math; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:video_player/video_player.dart'; + +import '../../personalization_sdk.dart'; +import '../../stories/stories_response.dart'; +import '../components/personalization_button.dart'; +import '../components/personalization_product.dart'; +import '../components/personalization_story_navigation.dart'; +import '../components/personalization_story_price.dart'; +import '../components/personalization_story_sound_button.dart'; +import '../components/personalization_story_used_products.dart'; +import '../components/personalization_toast.dart'; +import '../personalization_colors.dart'; +import '../personalization_theme.dart'; +import 'stories_support.dart'; + +/// Полноэкранный просмотр сторис: слайды по таймеру, листание, товары, ссылки. +/// +/// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), фреймы Card/Story +/// (Product, Promo, Discount, Action, Slide, Text) 402×874. +/// +/// Раскладка: поля 16, шаг 16. Фон — картинка или видео слайда (cover), под ними цвет +/// `background_color`; сверху и снизу затемнение: чёрный 30% (50% на слайдах с медиа) +/// до прозрачного к 21% и от 86% высоты. +/// +/// - Слайды с медиа (`image` / `video`) всегда в тёмных токенах кита — белые хром и +/// текст, тёмный лист товаров: поддерево переключается на тёмную тему. Бренд темы +/// хоста (Brand/Primary и кнопки) сохраняется. +/// - Слайд с товаром следует теме приложения: фон Background/Generic, текст +/// Text/Primary. Сверху шапка (бренд SemiBold 20, название SemiBold 16, межстрочный +/// 140%, шаг 8), посередине белая карточка картинки (скругление 12, поля 16, +/// квадрат по ширине — на низком экране ужимается), внизу с шагом 16 +/// [PersonalizationStoryPrice] и кнопка LG — подпись кнопки слайда, без неё +/// [moreInfoText]. Вид цены: промокод — promoCode, скидка — discount, иначе price. +/// - На слайде с медиа текстовые блоки стоят на `y_offset` процентов высоты слайда во +/// всю ширину без полей, кнопки — внизу кнопками LG, товары — +/// [PersonalizationStoryUsedProducts]. У видео слева внизу кнопка звука; звук по +/// умолчанию выключен, как в прежних сторис Android, и переключается на весь просмотр. +/// +/// Поведение: слайд идёт `duration` секунд (отсчёт начинается, когда загрузилась +/// картинка или видео); касание левой трети — предыдущий слайд, остального — следующий; +/// удержание — пауза прогресса и видео; раскрытые товары — тоже пауза; свайп вниз +/// закрывает; свайп вбок — соседняя сторис; после последнего слайда последней сторис +/// просмотр закрывается. Каждая сторис начинается со слайда из [startSlides], иначе с +/// `start_position`. +/// +/// Трекинг через [sdk]: `view` на каждый показанный слайд, `click` на кнопку, товар и +/// промокод. О показе слайда узнаёт и хост — [onSlideShown] (лента по нему отмечает +/// просмотренное). Ссылки: [onLinkClick], если задан, иначе системный обработчик через +/// SDK (`link_android` / `link_ios`, иначе `link`; у товара — диплинк, иначе `url`). +/// +/// Открывается маршрутом [route] или встраивается как обычный виджет с [onClose]. +class PersonalizationStoryViewer extends StatefulWidget { + const PersonalizationStoryViewer({ + super.key, + required this.stories, + this.initialStory = 0, + this.startSlides = const {}, + this.code, + this.sdk, + this.onSlideShown, + this.onClose, + this.onLinkClick, + this.onProductClick, + this.onPromoCopied, + this.moreInfoText = 'More info', + this.promoCodeCaption = 'Promo code', + this.promoCopiedText = 'Copied', + this.usedProductsText = 'Used products', + this.hideProductsText = 'Hide products', + this.imageProvider, + this.iconBuilder, + }); + + final List stories; + + /// С какой сторис начать. + final int initialStory; + + /// С какого слайда начать сторис, по её id; нет в списке — `start_position`. + final Map startSlides; + + /// Код блока для трекинга. + final String? code; + + /// Инстанс для трекинга и системных ссылок; `null` — без них. + final PersonalizationSdk? sdk; + + /// Показан слайд [slideIndex] сторис [story]. + final void Function(Story story, int slideIndex)? onSlideShown; + + /// Закрыть просмотр; не задан — `Navigator.maybePop`. + final VoidCallback? onClose; + + /// Ссылка кнопки или товара; не задан — ссылку открывает система. + final ValueChanged? onLinkClick; + + /// Нажатие на товар в карусели слайда; не задан — открывается ссылка товара. + final ValueChanged? onProductClick; + + /// Промокод скопирован. + final ValueChanged? onPromoCopied; + + /// Подпись кнопки слайда с товаром, когда у слайда своей кнопки нет. + final String moreInfoText; + final String promoCodeCaption; + + /// Текст тоста после копирования промокода. + final String promoCopiedText; + + /// Подписи переключателя товаров, когда их не прислал сервер. + final String usedProductsText; + final String hideProductsText; + + /// Картинка по адресу; не задан — [NetworkImage]. + final PersonalizationStoryImageProvider? imageProvider; + + final Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder; + + /// Маршрут просмотра: во весь экран, с появлением. Непрозрачен только сам просмотр — + /// при свайпе вниз под ним виден экран хоста. + static Route route(Widget viewer) => PageRouteBuilder( + opaque: false, + transitionDuration: const Duration(milliseconds: 250), + reverseTransitionDuration: const Duration(milliseconds: 200), + pageBuilder: (context, animation, secondaryAnimation) => viewer, + transitionsBuilder: (context, animation, secondaryAnimation, child) { + final curved = CurvedAnimation(parent: animation, curve: Curves.easeOut); + return FadeTransition( + opacity: curved, + child: ScaleTransition( + scale: Tween(begin: 0.96, end: 1).animate(curved), + child: child, + ), + ); + }, + ); + + @override + State createState() => + _PersonalizationStoryViewerState(); +} + +class _PersonalizationStoryViewerState + extends State { + late final int _initial = widget.stories.isEmpty + ? 0 + : widget.initialStory.clamp(0, widget.stories.length - 1); + late final PageController _pages = PageController(initialPage: _initial); + late int _current = _initial; + bool _muted = true; + double _drag = 0; + bool _closing = false; + + static const Duration _turn = Duration(milliseconds: 300); + + /// Свайп вниз дальше этого — закрыть. + static const double _closeDistance = 120; + + @override + void dispose() { + _pages.dispose(); + super.dispose(); + } + + void _close() { + if (_closing) return; + _closing = true; + final onClose = widget.onClose; + if (onClose != null) { + onClose(); + } else { + Navigator.maybePop(context); + } + } + + void _nextStory() { + if (_current < widget.stories.length - 1) { + _pages.nextPage(duration: _turn, curve: Curves.easeInOut); + } else { + _close(); + } + } + + /// К предыдущей сторис; `false` — это первая. + bool _previousStory() { + if (_current == 0) return false; + _pages.previousPage(duration: _turn, curve: Curves.easeInOut); + return true; + } + + int _startOf(Story story) { + final start = widget.startSlides[story.id] ?? story.startPosition; + return story.slides.isEmpty ? 0 : start.clamp(0, story.slides.length - 1); + } + + @override + Widget build(BuildContext context) { + final stories = widget.stories; + // В корневом маршруте нет Material: без этого Text взял бы аварийный стиль + // приложения — с жёлтым подчёркиванием. + return DefaultTextStyle( + style: const TextStyle(), + child: GestureDetector( + onVerticalDragUpdate: (details) => + setState(() => _drag = math.max(0, _drag + details.delta.dy)), + onVerticalDragEnd: (details) { + if (_drag > _closeDistance || (details.primaryVelocity ?? 0) > 800) { + _close(); + } else { + setState(() => _drag = 0); + } + }, + onVerticalDragCancel: () => setState(() => _drag = 0), + child: Transform.translate( + offset: Offset(0, _drag), + child: Transform.scale( + scale: 1 - math.min(_drag / 2000, 0.1), + child: stories.isEmpty + ? const ColoredBox(color: Color(0xFF000000)) + : PageView.builder( + controller: _pages, + itemCount: stories.length, + onPageChanged: (index) => setState(() => _current = index), + itemBuilder: (context, index) { + final story = stories[index]; + return _StoryPage( + key: ValueKey('story-${story.id}-$index'), + story: story, + startSlide: _startOf(story), + active: index == _current, + held: _drag > 0, + muted: _muted, + config: widget, + onToggleMute: () => setState(() => _muted = !_muted), + onFinished: _nextStory, + onBeforeFirst: _previousStory, + onClose: _close, + ); + }, + ), + ), + ), + ), + ); + } +} + +/// Одна сторис: текущий слайд, его таймер, медиа и касания. +class _StoryPage extends StatefulWidget { + const _StoryPage({ + super.key, + required this.story, + required this.startSlide, + required this.active, + required this.held, + required this.muted, + required this.config, + required this.onToggleMute, + required this.onFinished, + required this.onBeforeFirst, + required this.onClose, + }); + + final Story story; + final int startSlide; + + /// Сторис на экране; остальные страницы стоят. + final bool active; + + /// Просмотр придержан снаружи — тянут вниз. + final bool held; + final bool muted; + final PersonalizationStoryViewer config; + final VoidCallback onToggleMute; + + /// Последний слайд досмотрен или пролистан. + final VoidCallback onFinished; + + /// Листают назад с первого слайда; `false` — предыдущей сторис нет. + final bool Function() onBeforeFirst; + final VoidCallback onClose; + + @override + State<_StoryPage> createState() => _StoryPageState(); +} + +class _StoryPageState extends State<_StoryPage> + with SingleTickerProviderStateMixin { + late final AnimationController _progress = AnimationController(vsync: this) + ..addStatusListener(_onStatus); + late int _slide = widget.startSlide; + VideoPlayerController? _video; + bool _videoReady = false; + + /// Медиа слайда загружено — можно считать время. + bool _ready = false; + + /// Удерживают палец. + bool _hold = false; + + /// Раскрыты товары слайда. + bool _productsOpen = false; + + /// Номер захода на слайд: ответы загрузок от прошлых заходов отбрасываются. + int _generation = 0; + + PersonalizationStoryViewer get _config => widget.config; + + StorySlide? get _current => + widget.story.slides.isEmpty ? null : widget.story.slides[_slide]; + + bool get _running => + widget.active && !widget.held && !_hold && !_productsOpen && _ready; + + @override + void initState() { + super.initState(); + // Загрузка картинки читает контекст (MediaQuery, ассеты) — после первой сборки. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted && widget.active) _enter(); + }); + } + + @override + void didUpdateWidget(_StoryPage oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.muted != widget.muted) { + _video?.setVolume(widget.muted ? 0 : 1); + } + if (widget.active && !oldWidget.active) { + _enter(); + } else { + _sync(); + } + } + + @override + void dispose() { + _progress.dispose(); + _video?.dispose(); + super.dispose(); + } + + /// Заход на текущий слайд: прогресс с нуля, загрузка медиа, трекинг показа. + void _enter() { + final slide = _current; + if (slide == null) { + // Сторис без слайдов пропускается — после кадра: заход бывает посреди сборки. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) widget.onFinished(); + }); + return; + } + final generation = ++_generation; + _progress + ..stop() + ..value = 0 + ..duration = slide.duration; + _ready = false; + _productsOpen = false; + _disposeVideo(); + if (mounted) setState(() {}); + _prepare(slide, generation); + _shown(slide, generation); + } + + void _disposeVideo() { + final video = _video; + _video = null; + _videoReady = false; + video?.dispose(); + } + + Future _prepare(StorySlide slide, int generation) async { + switch (slide.type) { + case StorySlideType.product: + break; + case StorySlideType.image: + final image = storyImage(slide.background, _config.imageProvider); + if (image != null) { + await precacheImage(image, context, onError: (_, _) {}); + } + case StorySlideType.video: + final uri = Uri.tryParse(slide.background); + if (uri != null && slide.background.isNotEmpty) { + final video = VideoPlayerController.networkUrl(uri); + _video = video; + try { + await video.initialize(); + if (generation != _generation) return; + await video.setLooping(true); + await video.setVolume(widget.muted ? 0 : 1); + _videoReady = true; + } catch (error) { + // Видео не открылось — остаётся постер, слайд идёт по таймеру. + debugPrint( + 'PersonalizationStoryViewer: video ${slide.id} — $error', + ); + } + } + } + if (!mounted || generation != _generation) return; + setState(() => _ready = true); + _sync(); + } + + /// Прогресс и видео идут, только когда ничто их не держит. + void _sync() { + if (_running) { + if (!_progress.isAnimating && _progress.value < 1) _progress.forward(); + _video?.play(); + } else { + _progress.stop(); + _video?.pause(); + } + } + + void _onStatus(AnimationStatus status) { + if (status == AnimationStatus.completed) _next(); + } + + void _next() { + if (_slide < widget.story.slides.length - 1) { + _slide++; + _enter(); + } else { + _progress.stop(); + widget.onFinished(); + } + } + + void _previous() { + if (_slide > 0) { + _slide--; + _enter(); + } else if (!widget.onBeforeFirst()) { + _enter(); + } + } + + void _setHold(bool hold) { + _hold = hold; + _sync(); + } + + // --- Трекинг и действия ---------------------------------------------------------------- + + void _shown(StorySlide slide, int generation) { + // Хосту — после кадра: заход на слайд бывает посреди сборки (смена сторис), а хост + // в ответ перестраивает свой экран под маршрутом. + final index = _slide; + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted && generation == _generation) { + _config.onSlideShown?.call(widget.story, index); + } + }); + final sdk = _config.sdk; + if (sdk == null || widget.story.id.isEmpty || slide.id.isEmpty) return; + sdk.tracking + .storyView( + storyId: widget.story.id, + slideId: slide.id, + code: _config.code, + ) + .catchError((Object error) { + debugPrint('PersonalizationStoryViewer: storyView — $error'); + }); + } + + void _clicked() { + final slide = _current; + final sdk = _config.sdk; + if (slide == null || + sdk == null || + widget.story.id.isEmpty || + slide.id.isEmpty) { + return; + } + sdk.tracking + .storyClick( + storyId: widget.story.id, + slideId: slide.id, + code: _config.code, + ) + .catchError((Object error) { + debugPrint('PersonalizationStoryViewer: storyClick — $error'); + }); + } + + void _open(String url) { + if (url.isEmpty) return; + final onLink = _config.onLinkClick; + if (onLink != null) { + onLink(url); + return; + } + _config.sdk?.openUrl(url).catchError((Object error) { + debugPrint('PersonalizationStoryViewer: cannot open $url — $error'); + return false; + }); + } + + void _productTapped(StoryProduct product) { + _clicked(); + final onProduct = _config.onProductClick; + if (onProduct != null) { + onProduct(product); + } else { + _open(storyProductLink(product)); + } + } + + void _promoCopied(String code) { + _clicked(); + _config.onPromoCopied?.call(code); + } + + // --- Сборка ------------------------------------------------------------------------------ + + @override + Widget build(BuildContext context) { + final slide = _current; + if (slide == null) return const ColoredBox(color: Color(0xFF000000)); + final media = slide.type != StorySlideType.product; + final base = Theme.of(context); + return Theme( + data: media ? _mediaTheme(base) : base, + child: Builder(builder: (context) => _body(context, slide, media)), + ); + } + + /// Тема слайдов с медиа: тёмные токены кита. Тема хоста уже тёмная — берётся она, + /// иначе тёмный набор кита с брендом, радиусами и шрифтом хоста. + ThemeData _mediaTheme(ThemeData base) { + final host = base.extension(); + final PersonalizationTheme dark; + if (host != null && base.brightness == Brightness.dark) { + dark = host; + } else { + final source = host ?? PersonalizationTheme.light; + final brand = source.colors; + dark = PersonalizationTheme.dark.copyWith( + radius: source.radius, + fontFamily: source.fontFamily, + colors: PersonalizationColors.dark.copyWith( + brandPrimary: brand.brandPrimary, + buttonPrimary: brand.buttonPrimary, + buttonPrimaryDisabled: brand.buttonPrimaryDisabled, + lineBrand: brand.lineBrand, + textBrand: brand.textBrand, + ), + ); + } + return base.copyWith( + extensions: [ + for (final extension in base.extensions.values) + if (extension is! PersonalizationTheme) extension, + dark, + ], + ); + } + + Widget _body(BuildContext context, StorySlide slide, bool media) { + final colors = PersonalizationTheme.of(context).colors; + final background = + parseStoryColor(slide.backgroundColor) ?? + (media ? const Color(0xFF000000) : colors.backgroundGeneric); + final light = colors.textPrimary.computeLuminance() > 0.5; + final product = slide.product; + + return AnnotatedRegion( + value: light ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark, + child: LayoutBuilder( + builder: (context, constraints) => GestureDetector( + behavior: HitTestBehavior.opaque, + onTapUp: (details) => + details.localPosition.dx < constraints.maxWidth / 3 + ? _previous() + : _next(), + onLongPressStart: (_) => _setHold(true), + onLongPressEnd: (_) => _setHold(false), + child: ColoredBox( + color: background, + child: Stack( + fit: StackFit.expand, + children: [ + if (media) _background(slide), + _scrim(media), + SafeArea( + child: media || product == null + ? _mediaContent(context, slide) + : _productContent(context, slide, product), + ), + ], + ), + ), + ), + ), + ); + } + + Widget _background(StorySlide slide) { + final video = _video; + if (slide.type == StorySlideType.video && video != null && _videoReady) { + final size = video.value.size; + return ClipRect( + child: FittedBox( + fit: BoxFit.cover, + child: SizedBox( + width: size.width, + height: size.height, + child: VideoPlayer(video), + ), + ), + ); + } + final url = slide.type == StorySlideType.video + ? slide.preview + : slide.background; + final image = storyImage(url, _config.imageProvider); + if (image == null) return const SizedBox.shrink(); + return Image(image: image, fit: BoxFit.cover, gaplessPlayback: true); + } + + Widget _scrim(bool media) { + final shade = const Color(0xFF000000).withValues(alpha: media ? 0.5 : 0.3); + const clear = Color(0x00000000); + return IgnorePointer( + child: DecoratedBox( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [shade, clear, clear, shade], + stops: const [0, 0.21, 0.86, 1], + ), + ), + ), + ); + } + + Widget _navigation() => AnimatedBuilder( + animation: _progress, + builder: (context, _) => PersonalizationStoryNavigation( + count: widget.story.slides.length, + current: _slide, + progress: _progress.value, + onClose: widget.onClose, + iconBuilder: _config.iconBuilder, + ), + ); + + Widget _productContent( + BuildContext context, + StorySlide slide, + StoryProduct product, + ) { + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final price = storyPriceOf(product); + StoryButtonElement? button; + for (final element in slide.elements) { + if (element is StoryButtonElement) { + button = element; + break; + } + } + final buttonLink = button == null ? '' : storyButtonLink(button); + final image = storyImage(product.image, _config.imageProvider); + + TextStyle header(double size) => TextStyle( + fontSize: size, + height: 1.4, + fontWeight: FontWeight.w600, + letterSpacing: 0, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, + color: colors.textPrimary, + ); + + return Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _navigation(), + const SizedBox(height: 16), + if (product.brand.isNotEmpty) ...[ + Text( + product.brand, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: header(20), + ), + const SizedBox(height: 8), + ], + Text( + product.name, + maxLines: 4, + overflow: TextOverflow.ellipsis, + style: header(16), + ), + // Карточка — квадрат во всю ширину; на низком экране ужимается по высоте. + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 16), + child: Center( + child: AspectRatio( + aspectRatio: 1, + child: DecoratedBox( + decoration: BoxDecoration( + color: const Color(0xFFFFFFFF), + borderRadius: BorderRadius.circular(12), + ), + child: Padding( + padding: const EdgeInsets.all(16), + child: image == null + ? null + : Image(image: image, fit: BoxFit.contain), + ), + ), + ), + ), + ), + ), + PersonalizationStoryPrice( + type: price.type, + price: price.price, + oldPrice: price.oldPrice, + discount: price.discount, + promoCode: price.promoCode, + promoCodeCaption: _config.promoCodeCaption, + copiedText: _config.promoCopiedText, + onPromoCopied: _promoCopied, + iconBuilder: _config.iconBuilder, + ), + const SizedBox(height: 16), + PersonalizationButton( + label: button != null && button.title.trim().isNotEmpty + ? button.title + : _config.moreInfoText, + iconBuilder: _config.iconBuilder, + onPressed: () { + _clicked(); + _open( + buttonLink.isNotEmpty ? buttonLink : storyProductLink(product), + ); + }, + ), + ], + ), + ); + } + + Widget _mediaContent(BuildContext context, StorySlide slide) { + final texts = slide.elements.whereType().toList(); + final buttons = slide.elements + .whereType() + .where((button) => button.title.trim().isNotEmpty) + .toList(); + StoryProductsElement? products; + for (final element in slide.elements) { + if (element is StoryProductsElement && element.products.isNotEmpty) { + products = element; + break; + } + } + final sound = slide.type == StorySlideType.video + ? PersonalizationStorySoundButton( + muted: widget.muted, + onPressed: widget.onToggleMute, + iconBuilder: _config.iconBuilder, + ) + : null; + + return LayoutBuilder( + builder: (context, constraints) => Stack( + fit: StackFit.expand, + children: [ + for (final text in texts) + Positioned( + left: 16, + right: 16, + top: constraints.maxHeight * text.yOffset.clamp(0, 100) / 100, + child: _textBlock(context, text), + ), + Positioned(left: 16, top: 16, right: 16, child: _navigation()), + Positioned( + left: 0, + right: 0, + bottom: 0, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (final button in buttons) + Padding( + padding: const EdgeInsets.fromLTRB(16, 0, 16, 16), + child: PersonalizationButton( + label: button.title, + iconBuilder: _config.iconBuilder, + onPressed: () { + _clicked(); + _open(storyButtonLink(button)); + }, + ), + ), + if (products != null) + _usedProducts(products, sound) + else if (sound != null) + SizedBox( + height: 64, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Align( + alignment: AlignmentDirectional.centerStart, + child: sound, + ), + ), + ), + ], + ), + ), + ], + ), + ); + } + + Widget _usedProducts(StoryProductsElement element, Widget? sound) { + final byId = { + for (final product in element.products) product.id: product, + }; + return PersonalizationStoryUsedProducts( + key: ValueKey('products-$_slide'), + products: [ + for (final product in element.products) + storyCardProduct(product, _config.imageProvider), + ], + showText: element.showLabel.isNotEmpty + ? element.showLabel + : _config.usedProductsText, + hideText: element.hideLabel.isNotEmpty + ? element.hideLabel + : _config.hideProductsText, + onExpandedChanged: (open) { + _productsOpen = open; + _sync(); + }, + onProductTap: (card) { + final product = byId[card.id]; + if (product != null) _productTapped(product); + }, + leading: sound, + iconBuilder: _config.iconBuilder, + ); + } + + Widget _textBlock(BuildContext context, StoryTextBlockElement element) { + final block = storyTextBlock(element); + final code = element.promocode; + if (code == null) return block; + // Блок с промокодом копирует его, как в прежних сторис. + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + Clipboard.setData(ClipboardData(text: code)); + PersonalizationToast.show(context, _config.promoCopiedText); + _promoCopied(code); + }, + child: block, + ); + } +} diff --git a/lib/src/ui/widgets/stories_support.dart b/lib/src/ui/widgets/stories_support.dart new file mode 100644 index 0000000..9dba867 --- /dev/null +++ b/lib/src/ui/widgets/stories_support.dart @@ -0,0 +1,161 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; + +import '../../stories/stories_response.dart'; +import '../components/personalization_product.dart'; +import '../components/personalization_story_price.dart'; +import '../components/personalization_story_text_block.dart'; + +/// Как получить картинку по адресу из данных сторис. Не задан — [NetworkImage]; хост +/// подставляет свой провайдер, например с кэшем. +typedef PersonalizationStoryImageProvider = ImageProvider Function(String url); + +/// Картинка по адресу; пустой адрес — `null`. +ImageProvider? storyImage( + String url, + PersonalizationStoryImageProvider? custom, +) { + if (url.isEmpty) return null; + return custom?.call(url) ?? NetworkImage(url); +} + +/// Цвет из `#RRGGBB`, `#RGB` или `#AARRGGBB`; не разобрать — `null`. +Color? parseStoryColor(String value, {double opacity = 1}) { + var hex = value.trim(); + if (hex.startsWith('#')) hex = hex.substring(1); + if (hex.length == 3) hex = hex.split('').map((c) => '$c$c').join(); + if (hex.length == 6) hex = 'FF$hex'; + if (hex.length != 8) return null; + final argb = int.tryParse(hex, radix: 16); + if (argb == null) return null; + final color = Color(argb); + return color.withValues(alpha: color.a * opacity.clamp(0, 1)); +} + +/// Цена товара для [PersonalizationStoryPrice]: вид блока и его строки. +/// +/// Есть промокод — вид promoCode, цена с промокодом (`price_with_promocode_formatted`, +/// без неё обычная); иначе скидка больше нуля — вид discount («N%»); иначе просто цена. +/// Старая цена — когда она выше текущей. +({ + PersonalizationStoryPriceType type, + String price, + String? oldPrice, + String? discount, + String? promoCode, +}) +storyPriceOf(StoryProduct product) { + final oldPrice = product.hasOldPrice ? product.oldPriceFormatted : null; + final price = product.priceFormatted.isNotEmpty + ? product.priceFormatted + : _plainPrice(product); + if (product.promocode.isNotEmpty) { + return ( + type: PersonalizationStoryPriceType.promoCode, + price: product.priceWithPromocodeFormatted.isNotEmpty + ? product.priceWithPromocodeFormatted + : price, + oldPrice: oldPrice, + discount: null, + promoCode: product.promocode, + ); + } + if (product.discountPercent > 0) { + return ( + type: PersonalizationStoryPriceType.discount, + price: price, + oldPrice: oldPrice, + discount: '${product.discountPercent}%', + promoCode: null, + ); + } + return ( + type: PersonalizationStoryPriceType.price, + price: price, + oldPrice: oldPrice, + discount: null, + promoCode: null, + ); +} + +String _plainPrice(StoryProduct product) { + final amount = product.price == product.price.roundToDouble() + ? product.price.toStringAsFixed(0) + : product.price.toString(); + return '$amount ${product.currency}'.trim(); +} + +/// Товар сторис → данные карточки кита для карусели товаров слайда. +PersonalizationProduct storyCardProduct( + StoryProduct product, + PersonalizationStoryImageProvider? image, +) { + final hasOldPrice = product.hasOldPrice; + return PersonalizationProduct( + id: product.id, + name: product.name, + price: product.priceFormatted.isNotEmpty + ? product.priceFormatted + : _plainPrice(product), + image: storyImage(product.image, image), + brand: product.brand.isEmpty ? null : product.brand, + oldPrice: hasOldPrice ? product.oldPriceFormatted : null, + discount: hasOldPrice && product.discountPercent > 0 + ? '-${product.discountPercent}%' + : null, + ); +} + +/// Ссылка кнопки для текущей платформы: своя, иначе общая `link`. +String storyButtonLink(StoryButtonElement button) { + final own = switch (defaultTargetPlatform) { + TargetPlatform.android => button.linkAndroid, + TargetPlatform.iOS => button.linkIos, + _ => '', + }; + return own.isNotEmpty ? own : button.link; +} + +/// Ссылка товара для текущей платформы: диплинк, иначе `url`. +String storyProductLink(StoryProduct product) { + final own = switch (defaultTargetPlatform) { + TargetPlatform.android => product.deeplinkAndroid, + TargetPlatform.iOS => product.deeplinkIos, + _ => '', + }; + return own.isNotEmpty ? own : product.url; +} + +/// Текстовый блок сервера → [PersonalizationStoryTextBlock]. +/// +/// Шрифт `serif` / `monospaced` — системные семейства с запасными для iOS, где имён +/// `serif` и `monospace` нет; `sans-serif` и пусто — шрифт темы. Интерлиньяж 0 — свой +/// у шрифта. +PersonalizationStoryTextBlock storyTextBlock(StoryTextBlockElement element) { + final (family, fallback) = switch (element.fontType) { + 'serif' => ('serif', const ['Georgia', 'Times New Roman']), + 'monospaced' => ('monospace', const ['Menlo', 'Courier']), + _ => (null, null), + }; + return PersonalizationStoryTextBlock( + text: element.text, + fontSize: element.fontSize, + lineHeight: element.lineSpacing > 0 ? element.lineSpacing : null, + color: parseStoryColor(element.textColor), + background: element.backgroundOpacity > 0 + ? parseStoryColor( + element.backgroundColor, + opacity: element.backgroundOpacity, + ) + : null, + textAlign: switch (element.textAlign) { + 'center' => TextAlign.center, + 'right' => TextAlign.end, + _ => TextAlign.start, + }, + bold: element.bold, + italic: element.italic, + fontFamily: family, + fontFamilyFallback: fallback, + ); +} diff --git a/pubspec.yaml b/pubspec.yaml index d5d4e3c..b77904f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,6 +15,8 @@ dependencies: plugin_platform_interface: ^2.0.2 # История поисковых запросов виджета мгновенного поиска. shared_preferences: ^2.3.0 + # Видео-слайды сторис. + video_player: ^2.11.1 dev_dependencies: flutter_test: diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart new file mode 100644 index 0000000..286502c --- /dev/null +++ b/test/ui/personalization_stories_test.dart @@ -0,0 +1,401 @@ +import 'dart:async'; +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/rees46_sdk.dart'; +import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_support.dart'; + +/// A 1×1 transparent PNG: slides and covers need an image that loads offline. +final ImageProvider _pixel = MemoryImage( + Uint8List.fromList(const [ + 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, // + 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, // + 0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, // + 0x0A, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, // + 0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x49, // + 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82, // + ]), +); + +ImageProvider _offline(String url) => _pixel; + +StoryProduct _product({ + String promocode = '', + int discountPercent = 0, + double oldPrice = 0, +}) => StoryProduct( + id: 'p1', + name: 'Laptop', + brand: 'Apple', + price: 1190900, + priceFormatted: '1 190 900 ₽', + oldPrice: oldPrice, + oldPriceFormatted: oldPrice > 0 ? '245 000 ₽' : '', + discountPercent: discountPercent, + promocode: promocode, + priceWithPromocodeFormatted: promocode.isEmpty ? '' : '1 000 000 ₽', + url: 'https://shop.example/p1', +); + +/// A block of two one-slide product stories, one second each. +String _blockJson() => jsonEncode({ + 'id': 1, + 'stories': >[ + for (final id in [1, 2]) + { + 'id': id, + 'name': 'Story $id', + 'avatar': 'https://cdn.example/$id.jpg', + 'slides': >[ + { + 'id': '${id}_0', + 'duration': 1, + 'type': '', + 'elements': >[ + { + 'type': 'product', + 'item': { + 'id': 'p$id', + 'name': 'Product $id', + 'price': 100, + 'price_formatted': '100 ₽', + 'picture': 'https://cdn.example/p$id.jpg', + 'url': 'https://shop.example/p$id', + }, + }, + ], + }, + ], + }, + ], +}); + +class _FakeHostApi extends pigeon.PersonalizationHostApi { + _FakeHostApi(this.answer); + + /// What `getStories` answers; `null` — the call fails. + final String? answer; + Completer? hold; + final List views = []; + final List clicks = []; + + @override + Future getStories(String code, String? shopId) async { + await hold?.future; + final json = answer; + if (json == null) throw PlatformException(code: 'get_stories_failed'); + return json; + } + + @override + Future trackStoryView( + String storyId, + String slideId, + String? code, + String? shopId, + ) async => views.add('$storyId/$slideId/$code'); + + @override + Future trackStoryClick( + String storyId, + String slideId, + String? code, + String? shopId, + ) async => clicks.add('$storyId/$slideId/$code'); +} + +Widget _host(Widget child) => MaterialApp( + home: Scaffold( + body: Align( + alignment: Alignment.topLeft, + child: SizedBox(width: 400, child: child), + ), + ), +); + +void main() { + group('storyPriceOf', () { + test('promo code wins over discount, discount over plain price', () { + final promo = storyPriceOf( + _product(promocode: 'PROMO', discountPercent: 10, oldPrice: 245000), + ); + expect(promo.type, PersonalizationStoryPriceType.promoCode); + expect(promo.price, '1 000 000 ₽', reason: 'the price with the code'); + expect(promo.promoCode, 'PROMO'); + + final discount = storyPriceOf(_product(discountPercent: 10)); + expect(discount.type, PersonalizationStoryPriceType.discount); + expect(discount.discount, '10%'); + expect(discount.price, '1 190 900 ₽'); + + final plain = storyPriceOf(_product()); + expect(plain.type, PersonalizationStoryPriceType.price); + expect(plain.discount, isNull); + expect(plain.promoCode, isNull); + }); + + test('the old price shows only when it is above the price', () { + expect(storyPriceOf(_product(oldPrice: 245000)).oldPrice, isNull); + expect(storyPriceOf(_product(oldPrice: 2000000)).oldPrice, '245 000 ₽'); + }); + }); + + group('storyTextBlock', () { + test('a server block maps opacity, alignment and font', () { + final solid = storyTextBlock( + const StoryTextBlockElement( + text: 'Sale', + fontSize: 24, + fontType: 'serif', + textAlign: 'center', + backgroundColor: '#16AE13', + backgroundOpacity: 0.4, + ), + ); + expect(solid.solid, isTrue); + expect(solid.background!.a, closeTo(0.4, 0.01)); + expect(solid.textAlign, TextAlign.center); + expect(solid.fontFamily, 'serif'); + expect(solid.fontSize, 24); + + final clear = storyTextBlock( + const StoryTextBlockElement( + text: 'Sale', + backgroundColor: '#16AE13', + backgroundOpacity: 0, + ), + ); + expect(clear.solid, isFalse); + }); + }); + + group('PersonalizationStoryViewer', () { + /// One story: two image slides, a text block on the first. + final story = Story.fromJson({ + 'id': 7, + 'name': 'Media', + 'avatar': '', + 'slides': >[ + for (final id in [70, 71]) + { + 'id': id, + 'duration': 5, + 'type': 'image', + 'background': 'https://cdn.example/$id.jpg', + 'elements': >[ + { + 'type': 'text_block', + 'text_input': 'Slide $id', + 'y_offset': 30, + }, + ], + }, + ], + }); + + Future> open(WidgetTester tester) async { + final api = _FakeHostApi(null); + await tester.pumpWidget( + MaterialApp( + home: PersonalizationStoryViewer( + stories: [story], + code: 'block', + sdk: PersonalizationSdk(api: api), + imageProvider: _offline, + onClose: () {}, + ), + ), + ); + await tester.pump(); + // The slide's clock starts once its image is decoded, and decoding needs real + // async: let it finish, then pump the result in. + await tester.runAsync( + () => precacheImage( + _pixel, + tester.element(find.byType(PersonalizationStoryViewer)), + ), + ); + await tester.pump(); + await tester.pump(); + return api.views; + } + + testWidgets('media slides take the dark tokens in a light app', ( + tester, + ) async { + await open(tester); + final text = tester.widget(find.text('Slide 70')); + expect(text.style!.color, PersonalizationColors.dark.textPrimary); + final fill = tester + .widgetList( + find.descendant( + of: find.byType(PersonalizationStoryProgress), + matching: find.byType(ColoredBox), + ), + ) + .last; + expect(fill.color, PersonalizationColors.dark.textSecondary); + }); + + testWidgets('taps move between slides, holding pauses', (tester) async { + final views = await open(tester); + expect(views, ['7/70/block']); + + final size = tester.getSize(find.byType(PersonalizationStoryViewer)); + // Right two thirds: the next slide. + await tester.tapAt(Offset(size.width * 0.8, size.height / 2)); + await tester.pump(); + await tester.pump(); + expect(find.text('Slide 71'), findsOneWidget); + expect(views, ['7/70/block', '7/71/block']); + + // Left third: back. + await tester.tapAt(Offset(size.width * 0.1, size.height / 2)); + await tester.pump(); + await tester.pump(); + expect(find.text('Slide 70'), findsOneWidget); + + // Held longer than the slide lasts: still there. + final hold = await tester.startGesture( + Offset(size.width / 2, size.height / 2), + ); + await tester.pump(const Duration(seconds: 1)); + await tester.pump(const Duration(seconds: 6)); + expect(find.text('Slide 70'), findsOneWidget); + await hold.up(); + await tester.pump(); + await tester.pump(const Duration(seconds: 6)); + expect(find.text('Slide 71'), findsOneWidget); + }); + }); + + group('PersonalizationStories', () { + testWidgets('skeletons while loading, hidden when empty', (tester) async { + final api = _FakeHostApi(jsonEncode({'stories': []})) + ..hold = Completer(); + await tester.pumpWidget( + _host( + PersonalizationStories( + code: 'block', + sdk: PersonalizationSdk(api: api), + ), + ), + ); + final skeletons = find.byWidgetPredicate( + (widget) => + widget is PersonalizationStoryPreview && + widget.state == PersonalizationStoryCoverState.skeleton, + ); + expect(skeletons, findsNWidgets(4)); + + api.hold!.complete(); + await tester.pump(); + await tester.pump(); + expect(find.byType(PersonalizationStoriesBar), findsNothing); + }); + + testWidgets('an error hides the block and reaches onError', (tester) async { + final errors = []; + await tester.pumpWidget( + _host( + PersonalizationStories( + code: 'block', + sdk: PersonalizationSdk(api: _FakeHostApi(null)), + onError: errors.add, + ), + ), + ); + await tester.pump(); + await tester.pump(); + expect(find.byType(PersonalizationStoriesBar), findsNothing); + expect(errors.single, isA()); + }); + + testWidgets('a story played to the end turns viewed in the bar', ( + tester, + ) async { + final api = _FakeHostApi(_blockJson()); + await tester.pumpWidget( + _host( + PersonalizationStories( + code: 'block', + sdk: PersonalizationSdk(api: api), + imageProvider: _offline, + ), + ), + ); + await tester.pump(); + await tester.pump(); + + PersonalizationStoryPreview preview(String label) => + tester.widget( + find.ancestor( + of: find.text(label), + matching: find.byType(PersonalizationStoryPreview), + ), + ); + expect(preview('Story 2').state, PersonalizationStoryCoverState.unviewed); + expect(preview('Story 2').segments, 1); + + // Open the last story: its only slide plays, then the viewer closes. + await tester.tap(find.text('Story 2')); + await tester.pump(); // route pushed + await tester.pump(const Duration(milliseconds: 300)); // transition + expect(find.byType(PersonalizationStoryViewer), findsOneWidget); + expect(find.text('Product 2'), findsOneWidget); + expect(find.text('More info'), findsOneWidget); + expect(api.views, ['2/2_0/block']); + + await tester.pump(const Duration(milliseconds: 1100)); // the slide + await tester.pump(const Duration(milliseconds: 300)); // pop transition + expect(find.byType(PersonalizationStoryViewer), findsNothing); + + expect(preview('Story 2').state, PersonalizationStoryCoverState.viewed); + expect(preview('Story 2').seenSegments, 1); + expect(preview('Story 1').state, PersonalizationStoryCoverState.unviewed); + }); + + testWidgets('the button tracks a click and hands the link to the host', ( + tester, + ) async { + final api = _FakeHostApi(_blockJson()); + final links = []; + await tester.pumpWidget( + _host( + PersonalizationStories( + code: 'block', + sdk: PersonalizationSdk(api: api), + imageProvider: _offline, + moreInfoText: 'Open', + onLinkClick: links.add, + ), + ), + ); + await tester.pump(); + await tester.pump(); + await tester.tap(find.text('Story 1')); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); + + await tester.tap(find.text('Open')); + await tester.pump(); + expect(api.clicks, ['1/1_0/block']); + // No button on the slide: the product's own link. + expect(links, ['https://shop.example/p1']); + // Close with the cross before the slide runs out. + await tester.tap( + find.descendant( + of: find.byType(PersonalizationStoryNavigation), + matching: find.byType(GestureDetector), + ), + ); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + }); + }); +} From cc894be973a9bad19825dd2c9f18cf29c1f20231 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:01:44 +0400 Subject: [PATCH 49/79] feat(example): stories v2 exhibits A Stories tab in the UI kit showcase: the live block 115bd0b67cf5989a1b60c841790b2af6 of the demo shop, a sample viewer that runs offline on bundled photos (price, promo code, discount, text blocks, used products), and an exhibit for every component: covers in each state and with segments, the bar and its skeletons, progress, navigation, the price kinds and a long promo code, both timers, text blocks and used products on a media slide, the "Sale!" badge. The loyalty card exhibit takes its blue from the new Semantic/Info token. --- example/lib/ui_kit_pane.dart | 467 ++++++++++++++++++++++++++++++++++- 1 file changed, 462 insertions(+), 5 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index c28290d..8bd37d5 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -14,7 +14,9 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; /// (product cards, recommender layouts, instant search, the catalogue, the filters screen, /// in-app popups, the toast, the loyalty card); /// "Search" runs the two data-bound search widgets against the demo shop: the -/// instant search field, and the results screen it opens on submit. +/// instant search field, and the results screen it opens on submit; +/// "Stories" shows the Stories V2 components one by one, a sample viewer that runs +/// offline and the live stories block of the demo shop. /// Mirror of the Android `UiKitPane` / iOS `UIKitShowcaseViewController` / /// React Native `UiKitPane`. /// @@ -25,13 +27,13 @@ import 'package:rees46_sdk/src/ui/personalization_ui.dart'; class UiKitPane extends StatelessWidget { const UiKitPane({super.key, required this.shopId}); - /// Shop the Search tab's widgets resolve their SDK instance by. + /// Shop the Search and Stories tabs' widgets resolve their SDK instance by. final String shopId; @override Widget build(BuildContext context) { return DefaultTabController( - length: 3, + length: 4, child: Scaffold( appBar: AppBar( title: const Text('UI Kit'), @@ -41,6 +43,7 @@ class UiKitPane extends StatelessWidget { Tab(text: 'Components'), Tab(text: 'Blocks'), Tab(text: 'Search'), + Tab(text: 'Stories'), ], ), ), @@ -49,6 +52,7 @@ class UiKitPane extends StatelessWidget { _Showcase(exhibits: _componentExhibits), _Showcase(exhibits: _blockExhibits), _SearchFlow(shopId: shopId), + _Showcase(exhibits: _storyExhibits(shopId)), ], ), ), @@ -680,6 +684,459 @@ final List<_Exhibit> _blockExhibits = [ ), ]; +/// The Stories V2 block the demo shop serves (api.rees46.ru). +const String _storiesCode = '115bd0b67cf5989a1b60c841790b2af6'; + +/// End of the timer exhibits: fixed on first use, so a rebuild does not restart them. +final DateTime _timerEnd = DateTime.now().add( + const Duration(days: 2, hours: 18, minutes: 33, seconds: 24), +); + +List<_Exhibit> _storyExhibits(String shopId) => [ + _Exhibit( + 'Stories — live block $_storiesCode (demo shop); ' + 'links open in the system browser', + (context) => PersonalizationStories( + code: _storiesCode, + shopId: shopId, + padding: EdgeInsets.zero, + promoCopiedText: 'Code copied to clipboard', + onProductClick: (product) => + PersonalizationToast.show(context, 'Product: ${product.name}'), + onError: (error) => _snack(context, 'Stories error: $error'), + iconBuilder: _icon, + ), + ), + _Exhibit( + 'Story Viewer — sample slides: price, promo code, discount, text blocks, ' + 'used products (offline)', + (context) => Align( + alignment: Alignment.centerLeft, + child: PersonalizationButton( + label: 'Open sample stories', + size: PersonalizationButtonSize.md, + onPressed: () => _openSampleStories(context), + ), + ), + ), + _Exhibit('Story Cover — default, pinned, viewed, skeleton', (context) { + return _ScrollRow( + children: [ + PersonalizationStoryCover(image: _image('jacket')), + PersonalizationStoryCover( + image: _image('jacket'), + pinned: true, + iconBuilder: _icon, + ), + PersonalizationStoryCover( + image: _image('jacket'), + state: PersonalizationStoryCoverState.viewed, + ), + const PersonalizationStoryCover( + state: PersonalizationStoryCoverState.skeleton, + ), + ], + ); + }), + _Exhibit('Story Cover — segments: 5 slides, 2 seen', (context) { + return _ScrollRow( + children: [ + PersonalizationStoryCover( + image: _image('sneakers'), + segments: 5, + seenSegments: 2, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + pinned: true, + segments: 5, + seenSegments: 2, + iconBuilder: _icon, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + state: PersonalizationStoryCoverState.viewed, + segments: 5, + seenSegments: 5, + ), + ], + ); + }), + _Exhibit('Story Preview and Stories Bar — pinned, default, viewed', ( + context, + ) { + return PersonalizationStoriesBar( + padding: EdgeInsets.zero, + items: [ + PersonalizationStoryItem( + id: '1', + label: 'Pinned', + image: _image('watch'), + pinned: true, + segments: 3, + ), + PersonalizationStoryItem( + id: '2', + label: 'Default', + image: _image('headphones'), + segments: 4, + seenSegments: 1, + ), + PersonalizationStoryItem( + id: '3', + label: 'Viewed', + image: _image('backpack'), + viewed: true, + ), + PersonalizationStoryItem( + id: '4', + label: 'A label too long for one line', + image: _image('bottle'), + ), + ], + onItemTap: (item) => _snack(context, 'Story: ${item.label}'), + iconBuilder: _icon, + ); + }), + _Exhibit( + 'Stories Bar — loading', + (context) => const PersonalizationStoriesBar( + loading: true, + padding: EdgeInsets.zero, + ), + ), + _Exhibit( + 'Story Progress — 5 slides, the second at 40%', + (context) => + const PersonalizationStoryProgress(count: 5, current: 1, progress: 0.4), + ), + _Exhibit('Story Navigation — progress and the cross', (context) { + return PersonalizationStoryNavigation( + count: 5, + current: 1, + progress: 0.4, + onClose: () => _snack(context, 'Close'), + iconBuilder: _icon, + ); + }), + _Exhibit('Story Price — price, discount, promo code, long promo code', ( + context, + ) { + return _Column( + children: [ + const PersonalizationStoryPrice( + price: '1 190 900 ₽', + oldPrice: '245 000 ₽', + ), + const PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.discount, + price: '1 190 900 ₽', + oldPrice: '245 000 ₽', + discount: '10%', + ), + PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.promoCode, + price: '1 190 900 ₽', + oldPrice: '245 000 ₽', + promoCode: 'PROMO', + iconBuilder: _icon, + ), + PersonalizationStoryPrice( + type: PersonalizationStoryPriceType.promoCode, + price: '1 190 900 ₽', + oldPrice: '245 000 ₽', + promoCode: 'YAGODA-MALINA', + copiedText: 'Code copied to clipboard', + onPromoCopied: (code) => _snack(context, 'Copied: $code'), + iconBuilder: _icon, + ), + ], + ); + }), + _Exhibit('Story Timer — merged and separate', (context) { + return _Column( + children: [ + PersonalizationStoryTimer(endTime: _timerEnd), + PersonalizationStoryTimer( + endTime: _timerEnd, + view: PersonalizationStoryTimerView.separate, + ), + ], + ); + }), + _Exhibit( + 'Story Text Block — solid large / medium / small, transparent; ' + 'on a media slide (dark tokens)', + (context) => _OnMediaSlide( + child: _Column( + children: [ + const PersonalizationStoryTextBlock( + text: 'Open eat dear winding belonging.', + size: PersonalizationStoryTextSize.large, + background: Color(0xFF16AE13), + ), + PersonalizationStoryTextBlock( + text: 'Open eat dear winding belonging though differed stand left.', + background: PersonalizationColors.light.semanticWarning, + ), + PersonalizationStoryTextBlock( + text: 'Open eat dear winding belonging though differed stand left.', + size: PersonalizationStoryTextSize.small, + background: PersonalizationColors.light.semanticInfo, + ), + const PersonalizationStoryTextBlock( + text: 'Open eat dear winding belonging.', + textAlign: TextAlign.center, + ), + ], + ), + ), + ), + _Exhibit( + 'Story Used Products — collapsed with the sound button, expanded', + (context) => _OnMediaSlide( + padding: EdgeInsets.zero, + child: _Column( + children: [ + const _SoundedUsedProducts(), + PersonalizationStoryUsedProducts( + products: _products.take(4).toList(), + showText: 'Used products', + hideText: 'Hide products', + initiallyExpanded: true, + onProductTap: (product) => + _snack(context, 'Product: ${product.name}'), + iconBuilder: _icon, + ), + ], + ), + ), + ), + _Exhibit('Badge "Sale!" — LG warning, as on the Action slides', (context) { + return const _Row(children: [PersonalizationBadge(label: 'Sale!')]); + }), +]; + +/// A stand-in for a media slide: a photo under the kit's dark tokens, the way the +/// viewer renders image and video slides. +class _OnMediaSlide extends StatelessWidget { + const _OnMediaSlide({ + required this.child, + this.padding = const EdgeInsets.all(16), + }); + + final Widget child; + final EdgeInsetsGeometry padding; + + @override + Widget build(BuildContext context) { + final base = Theme.of(context); + return Theme( + data: base.copyWith(extensions: [PersonalizationTheme.dark]), + child: ClipRRect( + borderRadius: BorderRadius.circular(PersonalizationRadius.xl2), + child: DecoratedBox( + decoration: BoxDecoration( + image: DecorationImage( + image: _image('jacket'), + fit: BoxFit.cover, + colorFilter: const ColorFilter.mode( + Color(0x66000000), + BlendMode.darken, + ), + ), + ), + child: Padding(padding: padding, child: child), + ), + ), + ); + } +} + +/// Collapsed used products with a working mute toggle at the start of the row. +class _SoundedUsedProducts extends StatefulWidget { + const _SoundedUsedProducts(); + + @override + State<_SoundedUsedProducts> createState() => _SoundedUsedProductsState(); +} + +class _SoundedUsedProductsState extends State<_SoundedUsedProducts> { + bool _muted = true; + + @override + Widget build(BuildContext context) { + return PersonalizationStoryUsedProducts( + products: _products.take(4).toList(), + showText: 'Used products', + hideText: 'Hide products', + leading: PersonalizationStorySoundButton( + muted: _muted, + onPressed: () => setState(() => _muted = !_muted), + iconBuilder: _icon, + ), + iconBuilder: _icon, + ); + } +} + +/// Photos of the sample stories ship with the app: `asset:` stands for +/// `assets/uikit/.jpg`, anything else loads from the network. +ImageProvider _sampleImage(String url) => url.startsWith('asset:') + ? _image(url.substring('asset:'.length)) + : NetworkImage(url); + +Map _sampleProductSlide( + String id, + Map product, +) => { + 'id': id, + 'duration': 6, + 'type': '', + 'elements': [ + {'type': 'button', 'title': 'More info', 'link': 'https://example.com'}, + {'type': 'product', 'item': product}, + ], +}; + +/// Stories in the server's shape, so the sample runs through the same parsing as +/// the live block: product slides of every price kind, and a media slide with text +/// blocks, a button and used products. +final List _sampleStories = StoriesBlock.fromJson({ + 'id': 'sample', + 'stories': [ + { + 'id': 'products', + 'name': 'Products', + 'avatar': 'asset:headphones', + 'slides': [ + _sampleProductSlide('price', { + 'id': 'h1', + 'brand': 'Sony', + 'name': 'Wireless over-ear headphones, noise cancelling', + 'picture': 'asset:headphones', + 'price': 299, + 'price_formatted': r'299 $', + 'oldprice': 349, + 'oldprice_formatted': r'349 $', + 'url': 'https://example.com/headphones', + }), + _sampleProductSlide('promo', { + 'id': 'w1', + 'brand': 'Garmin', + 'name': 'GPS running watch', + 'picture': 'asset:watch', + 'price': 449, + 'price_formatted': r'449 $', + 'oldprice': 499, + 'oldprice_formatted': r'499 $', + 'promocode': 'YAGODA-MALINA', + 'price_with_promocode_formatted': r'399 $', + 'url': 'https://example.com/watch', + }), + _sampleProductSlide('discount', { + 'id': 's1', + 'brand': 'Nike', + 'name': 'Air Zoom Pegasus 41 running shoes', + 'picture': 'asset:pegasus', + 'price': 140, + 'price_formatted': r'140 $', + 'oldprice': 165, + 'oldprice_formatted': r'165 $', + 'discount_percent': 15, + 'url': 'https://example.com/pegasus', + }), + ], + }, + { + 'id': 'media', + 'name': 'Media', + 'avatar': 'asset:jacket', + 'slides': [ + { + 'id': 'text', + 'duration': 8, + 'type': 'image', + 'background': 'asset:jacket', + 'elements': [ + { + 'type': 'text_block', + 'text_input': 'Open eat dear winding belonging.', + 'font_size': 36, + 'text_background_color': '#16AE13', + 'text_background_color_opacity': '100%', + 'y_offset': 9, + }, + { + 'type': 'text_block', + 'text_input': 'Tap to copy the code SALE10', + 'font_size': 20, + 'text_align': 'center', + 'text_background_color': '#0087E8', + 'text_background_color_opacity': '100%', + 'y_offset': 30, + 'promocode': 'SALE10', + }, + { + 'type': 'text_block', + 'text_input': 'Open eat dear winding belonging though differed.', + 'font_size': 24, + 'y_offset': 45, + }, + { + 'type': 'button', + 'title': 'Go shopping', + 'link': 'https://example.com', + }, + { + 'type': 'products', + 'labels': { + 'show_carousel': 'Used products', + 'hide_carousel': 'Hide products', + }, + 'products': [ + for (final (index, name) in [ + 'backpack', + 'bottle', + 'sunglasses', + ].indexed) + { + 'id': 'm$index', + 'brand': 'Brand', + 'name': 'Product ${index + 1}', + 'picture': 'asset:$name', + 'price': 99, + 'price_formatted': r'99 $', + 'oldprice': 120, + 'oldprice_formatted': r'120 $', + 'discount_percent': 18, + }, + ], + }, + ], + }, + ], + }, + ], +}).stories; + +void _openSampleStories(BuildContext context) { + Navigator.of(context, rootNavigator: true).push( + PersonalizationStoryViewer.route( + PersonalizationStoryViewer( + stories: _sampleStories, + // No SDK: the sample does not track; links and products come back here. + onLinkClick: (url) => PersonalizationToast.show(context, 'Link: $url'), + onProductClick: (product) => + PersonalizationToast.show(context, 'Product: ${product.name}'), + promoCopiedText: 'Code copied to clipboard', + imageProvider: _sampleImage, + iconBuilder: _icon, + ), + ), + ); +} + void _snack(BuildContext context, String message) => ScaffoldMessenger.of( context, ).showSnackBar(SnackBar(content: Text(message))); @@ -735,8 +1192,8 @@ Widget _loyaltyCard( required int stamps, bool brand = false, }) { - // Semantic/Info from the design file's dark example; the kit has no token for it. - const brandBlue = Color(0xFF0087E8); + // Semantic/Info, as in the design file's dark example. + final brandBlue = PersonalizationTheme.of(context).colors.semanticInfo; const white = Color(0xFFFFFFFF); // The kit never tints the host's logo, so the demo tints it itself to the // content colour: Text/Primary by default, white on the brand card. From 30763a32324fb8e65c2d10b43013a4cd7e5a341d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:06:02 +0400 Subject: [PATCH 50/79] fix(ui): stories v2 follow the shared rules - A solid text block takes the 12/16 padding only above font size 30; Medium (30) and Small get 8/16, as in the design file. - The promo code toast shows at the top of the screen by default, as in the "Code copied to clipboard" frame; the price block, the viewer and the data widget take the position as a parameter. - Product slides sit on Background/Card (white in light, #1A1A1A in dark) instead of Background/Generic. --- .../personalization_story_price.dart | 15 ++++++++-- .../personalization_story_text_block.dart | 6 ++-- .../ui/widgets/personalization_stories.dart | 6 ++++ .../widgets/personalization_story_viewer.dart | 17 ++++++++--- test/ui/personalization_stories_test.dart | 12 ++++++++ ...personalization_story_components_test.dart | 28 +++++++++++++++++++ 6 files changed, 74 insertions(+), 10 deletions(-) diff --git a/lib/src/ui/components/personalization_story_price.dart b/lib/src/ui/components/personalization_story_price.dart index 71fbf59..28be474 100644 --- a/lib/src/ui/components/personalization_story_price.dart +++ b/lib/src/ui/components/personalization_story_price.dart @@ -38,8 +38,9 @@ enum PersonalizationStoryPriceType { /// Text/Light Secondary и код SemiBold 24 Text/Light Primary по центру, иконка copy 24 /// (глиф 20) Text/Light Hint в правом верхнем углу с отступом 4. Колонки делят ширину /// поровну, длинный код забирает сколько нужно. Нажатие слегка увеличивает блок (как -/// Tap Zoom Effect макета), копирует код в буфер, показывает тост [copiedText] и -/// зовёт [onPromoCopied]. +/// Tap Zoom Effect макета), копирует код в буфер, показывает тост [copiedText] — по +/// умолчанию у верхнего края, как во фрейме «Code copied to clipboard» (367:16106), — +/// и зовёт [onPromoCopied]. class PersonalizationStoryPrice extends StatefulWidget { const PersonalizationStoryPrice({ super.key, @@ -50,6 +51,7 @@ class PersonalizationStoryPrice extends StatefulWidget { this.promoCode, this.promoCodeCaption = 'Promo code', this.copiedText = 'Copied', + this.copiedToastPosition = PersonalizationToastPosition.top, this.onPromoCopied, this.iconBuilder, }); @@ -74,6 +76,9 @@ class PersonalizationStoryPrice extends StatefulWidget { /// Текст тоста после копирования. final String copiedText; + /// У какого края показать тост. + final PersonalizationToastPosition copiedToastPosition; + /// Код скопирован. final ValueChanged? onPromoCopied; @@ -124,7 +129,11 @@ class _PersonalizationStoryPriceState extends State { void _copy() { final code = _code; Clipboard.setData(ClipboardData(text: code)); - PersonalizationToast.show(context, widget.copiedText); + PersonalizationToast.show( + context, + widget.copiedText, + position: widget.copiedToastPosition, + ); widget.onPromoCopied?.call(code); } diff --git a/lib/src/ui/components/personalization_story_text_block.dart b/lib/src/ui/components/personalization_story_text_block.dart index 2f748f4..2ba268b 100644 --- a/lib/src/ui/components/personalization_story_text_block.dart +++ b/lib/src/ui/components/personalization_story_text_block.dart @@ -20,8 +20,8 @@ enum PersonalizationStoryTextSize { /// секция «Текстовый блок». /// /// Два вида. Сплошной — когда у [background] есть непрозрачность: скругление 12, поля -/// 12/16 у крупного текста и 8/16 у мелкого (кегль до 20), фон — цвет сервера со своей -/// прозрачностью. Прозрачный — без полей и фона: текст прямо на картинке слайда. +/// 12/16 у кегля больше 30 (Large) и 8/16 у остальных (Medium, Small), фон — цвет +/// сервера со своей прозрачностью. Прозрачный — без полей и фона: текст прямо на картинке слайда. /// /// Кегль, интерлиньяж, цвет, выключка, жирность и курсив приходят с элементом; для текста /// хоста есть заготовки [size]. Цвет по умолчанию — Text/Light Primary на сплошном фоне @@ -104,7 +104,7 @@ class PersonalizationStoryTextBlock extends StatelessWidget { ), child: Padding( padding: EdgeInsets.symmetric( - vertical: effectiveSize <= 20 ? 8 : 12, + vertical: effectiveSize > 30 ? 12 : 8, horizontal: 16, ), child: label, diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index b38d1b0..1b84d32 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -6,6 +6,7 @@ import '../../multi_instance/rees46.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; import '../components/personalization_stories_bar.dart'; +import '../components/personalization_toast.dart'; import 'personalization_story_viewer.dart'; import 'stories_support.dart'; @@ -36,6 +37,7 @@ class PersonalizationStories extends StatefulWidget { this.onPromoCopied, this.onError, this.promoCopiedText = 'Copied', + this.promoToastPosition = PersonalizationToastPosition.top, this.promoCodeCaption = 'Promo code', this.moreInfoText = 'More info', this.usedProductsText = 'Used products', @@ -63,6 +65,9 @@ class PersonalizationStories extends StatefulWidget { final ValueChanged? onError; final String promoCopiedText; + + /// См. [PersonalizationStoryViewer.promoToastPosition]. + final PersonalizationToastPosition promoToastPosition; final String promoCodeCaption; final String moreInfoText; final String usedProductsText; @@ -203,6 +208,7 @@ class _PersonalizationStoriesState extends State { moreInfoText: widget.moreInfoText, promoCodeCaption: widget.promoCodeCaption, promoCopiedText: widget.promoCopiedText, + promoToastPosition: widget.promoToastPosition, usedProductsText: widget.usedProductsText, hideProductsText: widget.hideProductsText, imageProvider: widget.imageProvider, diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index f00b0ce..0a77ddd 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -29,8 +29,8 @@ import 'stories_support.dart'; /// - Слайды с медиа (`image` / `video`) всегда в тёмных токенах кита — белые хром и /// текст, тёмный лист товаров: поддерево переключается на тёмную тему. Бренд темы /// хоста (Brand/Primary и кнопки) сохраняется. -/// - Слайд с товаром следует теме приложения: фон Background/Generic, текст -/// Text/Primary. Сверху шапка (бренд SemiBold 20, название SemiBold 16, межстрочный +/// - Слайд с товаром следует теме приложения: фон Background/Card (белый в светлой, +/// #1A1A1A в тёмной), под ним нет картинки; текст Text/Primary. Сверху шапка (бренд SemiBold 20, название SemiBold 16, межстрочный /// 140%, шаг 8), посередине белая карточка картинки (скругление 12, поля 16, /// квадрат по ширине — на низком экране ужимается), внизу с шагом 16 /// [PersonalizationStoryPrice] и кнопка LG — подпись кнопки слайда, без неё @@ -69,6 +69,7 @@ class PersonalizationStoryViewer extends StatefulWidget { this.moreInfoText = 'More info', this.promoCodeCaption = 'Promo code', this.promoCopiedText = 'Copied', + this.promoToastPosition = PersonalizationToastPosition.top, this.usedProductsText = 'Used products', this.hideProductsText = 'Hide products', this.imageProvider, @@ -111,6 +112,9 @@ class PersonalizationStoryViewer extends StatefulWidget { /// Текст тоста после копирования промокода. final String promoCopiedText; + /// У какого края показать этот тост. + final PersonalizationToastPosition promoToastPosition; + /// Подписи переключателя товаров, когда их не прислал сервер. final String usedProductsText; final String hideProductsText; @@ -574,7 +578,7 @@ class _StoryPageState extends State<_StoryPage> final colors = PersonalizationTheme.of(context).colors; final background = parseStoryColor(slide.backgroundColor) ?? - (media ? const Color(0xFF000000) : colors.backgroundGeneric); + (media ? const Color(0xFF000000) : colors.backgroundCard); final light = colors.textPrimary.computeLuminance() > 0.5; final product = slide.product; @@ -741,6 +745,7 @@ class _StoryPageState extends State<_StoryPage> promoCode: price.promoCode, promoCodeCaption: _config.promoCodeCaption, copiedText: _config.promoCopiedText, + copiedToastPosition: _config.promoToastPosition, onPromoCopied: _promoCopied, iconBuilder: _config.iconBuilder, ), @@ -874,7 +879,11 @@ class _StoryPageState extends State<_StoryPage> behavior: HitTestBehavior.opaque, onTap: () { Clipboard.setData(ClipboardData(text: code)); - PersonalizationToast.show(context, _config.promoCopiedText); + PersonalizationToast.show( + context, + _config.promoCopiedText, + position: _config.promoToastPosition, + ); _promoCopied(code); }, child: block, diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 286502c..dc1294f 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -348,6 +348,18 @@ void main() { expect(find.byType(PersonalizationStoryViewer), findsOneWidget); expect(find.text('Product 2'), findsOneWidget); expect(find.text('More info'), findsOneWidget); + // A product slide sits on Background/Card of the app theme. + expect( + find.descendant( + of: find.byType(PersonalizationStoryViewer), + matching: find.byWidgetPredicate( + (widget) => + widget is ColoredBox && + widget.color == PersonalizationColors.light.backgroundCard, + ), + ), + findsWidgets, + ); expect(api.views, ['2/2_0/block']); await tester.pump(const Duration(milliseconds: 1100)); // the slide diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart index 7450551..5ce51e7 100644 --- a/test/ui/personalization_story_components_test.dart +++ b/test/ui/personalization_story_components_test.dart @@ -103,6 +103,13 @@ void main() { expect(clipboard, 'YAGODA-MALINA'); expect(copied, ['YAGODA-MALINA']); expect(find.text('Code copied'), findsOneWidget); + expect( + tester.getCenter(find.text('Code copied')).dy, + lessThan( + tester.view.physicalSize.height / tester.view.devicePixelRatio / 2, + ), + reason: 'the toast shows at the top by default', + ); expect(tester.widget(find.byType(AnimatedScale)).scale, 1); // The toast leaves by itself. await tester.pump(const Duration(seconds: 3)); @@ -231,6 +238,27 @@ void main() { .padding, const EdgeInsets.symmetric(vertical: 8, horizontal: 16), ); + + // Medium (30) is not above 30: the small padding, as in the design file. + await tester.pumpWidget( + _host( + const PersonalizationStoryTextBlock( + text: 'Medium', + background: green, + ), + ), + ); + expect( + tester + .widget( + find.descendant( + of: find.byType(PersonalizationStoryTextBlock), + matching: find.byType(Padding), + ), + ) + .padding, + const EdgeInsets.symmetric(vertical: 8, horizontal: 16), + ); }); testWidgets('transparent: no frame, Text/Primary', (tester) async { From ddc7db734d75c35878a01d0e27affecbe267bb53 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 30 Sep 2026 22:32:51 +0400 Subject: [PATCH 51/79] fix(ui): a viewed story's ring is solid A viewed story that is not pinned draws one solid Semantic/Neutral Subtle circle, without segments or gaps, whatever its slide count, as the Viewed state in the design file and the Android kit. A pinned story keeps the Semantic/Warning ring, with its segments, after it is viewed. --- .../personalization_story_cover.dart | 14 +++-- ...personalization_story_components_test.dart | 62 +++++++++++++++++++ 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/lib/src/ui/components/personalization_story_cover.dart b/lib/src/ui/components/personalization_story_cover.dart index d849e34..bcf4184 100644 --- a/lib/src/ui/components/personalization_story_cover.dart +++ b/lib/src/ui/components/personalization_story_cover.dart @@ -21,14 +21,16 @@ enum PersonalizationStoryCoverState { unviewed, viewed, skeleton } /// /// Круг 88. Кольцо — обводка 4 внутрь; картинка — круг 76 с отступом 6, то есть между /// ними зазор 2. Цвет кольца: Button/Primary у непросмотренной, Semantic/Warning у -/// закреплённой, Semantic/Neutral Subtle у просмотренной. Закреплённой в правом нижнем +/// закреплённой — и после просмотра, Semantic/Neutral Subtle у просмотренной +/// незакреплённой. Закреплённой в правом нижнем /// углу (x62, y62) — метка Favorites 24: звезда на Semantic/Warning. У заглушки кольцо и /// картинка переливаются градиентом (см. [PersonalizationStoryShimmer]). /// /// Сегменты: при [segments] > 1 кольцо делится на столько дуг с небольшими зазорами — /// по дуге на слайд. Первые [seenSegments] — уже показанные слайды — красятся в /// Button/Primary Disabled (Brand/Primary 65%), остальные в цвет состояния. У -/// просмотренной все дуги цвета Viewed. +/// просмотренной незакреплённой кольцо всегда сплошное, без дуг и зазоров, — так +/// состояние Viewed нарисовано в макете. class PersonalizationStoryCover extends StatelessWidget { const PersonalizationStoryCover({ super.key, @@ -95,16 +97,18 @@ class PersonalizationStoryCover extends StatelessWidget { ); } - final viewed = state == PersonalizationStoryCoverState.viewed; + // Просмотренная незакреплённая — сплошное кольцо Viewed; закреплённая остаётся + // в Warning и после просмотра. + final viewed = state == PersonalizationStoryCoverState.viewed && !pinned; final stateColor = viewed ? colors.neutralSubtle : pinned ? colors.semanticWarning : colors.buttonPrimary; - final count = math.max(1, segments); + final count = viewed ? 1 : math.max(1, segments); final ringColors = [ for (int i = 0; i < count; i++) - !viewed && segments > 1 && i < seenSegments + count > 1 && i < seenSegments ? colors.buttonPrimaryDisabled : stateColor, ]; diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart index 5ce51e7..1602e70 100644 --- a/test/ui/personalization_story_components_test.dart +++ b/test/ui/personalization_story_components_test.dart @@ -277,6 +277,68 @@ void main() { }); }); + testWidgets('a viewed cover rings solid; a pinned one keeps its segments', ( + tester, + ) async { + const light = PersonalizationColors.light; + RenderObject ring() => tester.renderObject( + find + .descendant( + of: find.byType(PersonalizationStoryCover), + matching: find.byType(CustomPaint), + ) + .first, + ); + // Paint keeps its colour as floats: compare the packed value. + PaintPatternPredicate drawn(Symbol call, Color color) => + (method, arguments) => + method == call && + arguments.whereType().single.color.toARGB32() == + color.toARGB32(); + + await tester.pumpWidget( + _host( + const Align( + alignment: Alignment.topLeft, + child: PersonalizationStoryCover( + state: PersonalizationStoryCoverState.viewed, + segments: 5, + seenSegments: 2, + ), + ), + ), + ); + expect(ring(), paints..something(drawn(#drawOval, light.neutralSubtle))); + expect(ring(), isNot(paints..arc())); + + await tester.pumpWidget( + _host( + const Align( + alignment: Alignment.topLeft, + child: PersonalizationStoryCover( + state: PersonalizationStoryCoverState.viewed, + pinned: true, + segments: 5, + seenSegments: 2, + ), + ), + ), + ); + expect( + ring(), + paints + ..something(drawn(#drawArc, light.buttonPrimaryDisabled)) + ..something(drawn(#drawArc, light.buttonPrimaryDisabled)) + ..something(drawn(#drawArc, light.semanticWarning)) + ..something(drawn(#drawArc, light.semanticWarning)) + ..something(drawn(#drawArc, light.semanticWarning)), + ); + expect( + ring(), + isNot(paints..something(drawn(#drawOval, light.neutralSubtle))), + ); + }); + testWidgets('a pinned cover wears the star; a skeleton has none', ( tester, ) async { From e730f86fa0297ef9659b493ec65059fb723e346c Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 02:01:40 +0400 Subject: [PATCH 52/79] feat(stories): seen slides, cache dir and audio session through the bridge - getStoriesSeen / setStorySlideSeen keep the slides a user has seen per shop in the plugin's own store (SharedPreferences, UserDefaults), so a story reopens at its first unseen slide after a restart. - getCacheDirectory hands the viewer the app cache dir for its video cache. - begin/update/endStoriesAudio run the iOS audio session while stories play video: ambient while muted, so the user's music keeps playing, playback once unmuted, the app's own session restored on close. While active the session's volume is watched, and a volume-up reaches Dart through the new PersonalizationStoriesFlutterApi. No-ops on Android, where video_player with mixWithOthers takes no audio focus. - A slide without a duration lasts 10 s; discount_percent and price_with_promocode are read as decimals. --- .../Rees46FlutterSdkPlugin.kt | 21 ++ .../rees46_flutter_sdk/StoriesSeenStore.kt | 40 ++++ .../pigeon/PersonalizationApi.g.kt | 168 +++++++++++++++ ios/Classes/Rees46FlutterSdkPlugin.swift | 31 +++ ios/Classes/StoriesSupport.swift | 96 +++++++++ ios/Classes/pigeon/PersonalizationApi.g.swift | 162 +++++++++++++++ lib/src/personalization_sdk.dart | 9 + lib/src/pigeon/personalization_api.g.dart | 196 ++++++++++++++++++ lib/src/stories/stories_response.dart | 19 +- pigeons/personalization_api.dart | 36 ++++ test/stories/stories_response_test.dart | 43 ++++ 11 files changed, 815 insertions(+), 6 deletions(-) create mode 100644 android/src/main/kotlin/com/rees46/rees46_flutter_sdk/StoriesSeenStore.kt create mode 100644 ios/Classes/StoriesSupport.swift diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt index f65ef8b..3f22544 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/Rees46FlutterSdkPlugin.kt @@ -538,6 +538,27 @@ class Rees46FlutterSdkPlugin : } } + // region stories viewer (UI kit) + + override fun getStoriesSeen(shop: String): Map> = + StoriesSeenStore.read(applicationContext, shop) + + override fun setStorySlideSeen(shop: String, storyId: String, slideId: String) = + StoriesSeenStore.add(applicationContext, shop, storyId, slideId) + + override fun getCacheDirectory(): String = applicationContext.cacheDir.absolutePath + + // The audio session calls are iOS-only. On Android video_player plays with + // `mixWithOthers: true` and so never requests the audio focus: a muted video leaves the + // user's music alone, and there is no session to restore. + override fun beginStoriesAudio() = Unit + + override fun updateStoriesAudio(muted: Boolean) = Unit + + override fun endStoriesAudio() = Unit + + // endregion + override fun getSid(shopId: String?): String = sdk(shopId).getSid() override fun getDid(shopId: String?): String? = sdk(shopId).getDid() diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/StoriesSeenStore.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/StoriesSeenStore.kt new file mode 100644 index 0000000..19a2d7b --- /dev/null +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/StoriesSeenStore.kt @@ -0,0 +1,40 @@ +package com.rees46.rees46_flutter_sdk + +import android.content.Context +import android.content.SharedPreferences + +/** + * The slides of the UI kit's stories (V2) the user has seen, per shop: one preferences file + * per shop, a key per story id holding the set of seen slide ids. It survives app restarts, so a + * story reopens at its first unseen slide and its cover keeps the seen segments. + * + * The plugin's own store, not the native SDK's: the Flutter viewer is drawn in Dart, and the + * native SDK keeps no such state for it. + */ +internal object StoriesSeenStore { + + private const val PREFS_PREFIX = "rees46_flutter_stories_seen_" + + /** Seen slide ids by story id for [shop]; empty when nothing was seen yet. */ + fun read(context: Context, shop: String): Map> = + prefs(context, shop).all.mapNotNull { (storyId, value) -> + (value as? Set<*>)?.filterIsInstance()?.let { storyId to it.sorted() } + }.toMap() + + /** Adds [slideId] to the seen slides of [storyId] for [shop]. */ + fun add(context: Context, shop: String, storyId: String, slideId: String) { + val prefs = prefs(context, shop) + // The returned set must not be modified in place: copy it. + val seen = prefs.getStringSet(storyId, null).orEmpty() + if (slideId in seen) return + prefs.edit().putStringSet(storyId, seen + slideId).apply() + } + + // The shop id becomes part of a file name: anything but letters, digits, `-` and `_` is + // replaced. + private fun prefs(context: Context, shop: String): SharedPreferences = + context.getSharedPreferences( + PREFS_PREFIX + shop.replace(Regex("[^A-Za-z0-9_-]"), "_"), + Context.MODE_PRIVATE, + ) +} diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt index aecfbf7..a22c006 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt @@ -505,6 +505,37 @@ interface PersonalizationHostApi { * Returns false when nothing could open it. */ fun openUrl(url: String, callback: (Result) -> Unit) + /** + * The slide ids seen per story id for [shop] — the plugin's own store + * (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It + * survives app restarts. + */ + fun getStoriesSeen(shop: String): Map> + /** Records [slideId] of story [storyId] as seen for [shop]. */ + fun setStorySlideSeen(shop: String, storyId: String, slideId: String) + /** + * The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The + * stories viewer keeps its video cache under it. + */ + fun getCacheDirectory(): String + /** + * Remembers the app's audio session before the stories viewer plays its first video, + * so [endStoriesAudio] can put it back. iOS only; a no-op on Android, where a muted + * video never takes the audio focus (`mixWithOthers`). + */ + fun beginStoriesAudio() + /** + * While the viewer plays video: muted — the `ambient` category, which never + * interrupts other apps' audio; unmuted — `playback`. Also starts watching the + * hardware volume (see [PersonalizationStoriesFlutterApi.onStoriesVolumeUp]). iOS + * only; a no-op on Android. + */ + fun updateStoriesAudio(muted: Boolean) + /** + * The viewer closed: restores the session saved by [beginStoriesAudio] and stops + * watching the volume. iOS only; a no-op on Android. + */ + fun endStoriesAudio() /** * Routes a push to the shop it belongs to (payload `shop_id`) and tracks it * via the native `REES46.handlePush`. [event] is the index of the Dart @@ -966,6 +997,108 @@ interface PersonalizationHostApi { channel.setMessageHandler(null) } } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val shopArg = args[0] as String + val wrapped: List = try { + listOf(api.getStoriesSeen(shopArg)) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.setStorySlideSeen$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val shopArg = args[0] as String + val storyIdArg = args[1] as String + val slideIdArg = args[2] as String + val wrapped: List = try { + api.setStorySlideSeen(shopArg, storyIdArg, slideIdArg) + listOf(null) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getCacheDirectory$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { _, reply -> + val wrapped: List = try { + listOf(api.getCacheDirectory()) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.beginStoriesAudio$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { _, reply -> + val wrapped: List = try { + api.beginStoriesAudio() + listOf(null) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.updateStoriesAudio$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val mutedArg = args[0] as Boolean + val wrapped: List = try { + api.updateStoriesAudio(mutedArg) + listOf(null) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } + run { + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.endStoriesAudio$separatedMessageChannelSuffix", codec) + if (api != null) { + channel.setMessageHandler { _, reply -> + val wrapped: List = try { + api.endStoriesAudio() + listOf(null) + } catch (exception: Throwable) { + PersonalizationApiPigeonUtils.wrapError(exception) + } + reply.reply(wrapped) + } + } else { + channel.setMessageHandler(null) + } + } run { val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.handlePush$separatedMessageChannelSuffix", codec) if (api != null) { @@ -1333,3 +1466,38 @@ class PersonalizationFlutterApi(private val binaryMessenger: BinaryMessenger, pr } } } +/** + * Native events of the stories viewer. Separate from [PersonalizationFlutterApi]: the + * push dispatcher owns that channel, the UI kit owns this one. + * + * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. + */ +class PersonalizationStoriesFlutterApi(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "") { + companion object { + /** The codec used by PersonalizationStoriesFlutterApi. */ + val codec: MessageCodec by lazy { + PersonalizationApiPigeonCodec() + } + } + /** + * The hardware volume went up while the viewer plays video (iOS: the audio session's + * `outputVolume` grew). Android delivers the volume key to Flutter itself. + */ + fun onStoriesVolumeUp(callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationStoriesFlutterApi.onStoriesVolumeUp$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) + channel.send(null) { + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + callback(Result.success(Unit)) + } + } else { + callback(Result.failure(PersonalizationApiPigeonUtils.createConnectionError(channelName))) + } + } + } +} diff --git a/ios/Classes/Rees46FlutterSdkPlugin.swift b/ios/Classes/Rees46FlutterSdkPlugin.swift index 7edc9cb..2b822c9 100644 --- a/ios/Classes/Rees46FlutterSdkPlugin.swift +++ b/ios/Classes/Rees46FlutterSdkPlugin.swift @@ -11,12 +11,16 @@ public class Rees46FlutterSdkPlugin: NSObject, FlutterPlugin, FlutterApplication private var messenger: FlutterBinaryMessenger? private var api: PersonalizationHostApiImpl? private var flutterApi: PersonalizationFlutterApi? + private var storiesApi: PersonalizationStoriesFlutterApi? public static func register(with registrar: FlutterPluginRegistrar) { let instance = Rees46FlutterSdkPlugin() instance.messenger = registrar.messenger() instance.api = PersonalizationHostApiImpl() instance.flutterApi = PersonalizationFlutterApi(binaryMessenger: registrar.messenger()) + let storiesApi = PersonalizationStoriesFlutterApi(binaryMessenger: registrar.messenger()) + instance.storiesApi = storiesApi + StoriesAudio.shared.onVolumeUp = { storiesApi.onStoriesVolumeUp { _ in } } PersonalizationHostApiSetup.setUp( binaryMessenger: registrar.messenger(), api: instance.api @@ -760,6 +764,33 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { } } + // MARK: - Stories viewer (UI kit) + + func getStoriesSeen(shop: String) throws -> [String: [String]] { + return StoriesSeenStore.read(shop: shop) + } + + func setStorySlideSeen(shop: String, storyId: String, slideId: String) throws { + StoriesSeenStore.add(shop: shop, storyId: storyId, slideId: slideId) + } + + func getCacheDirectory() throws -> String { + let caches = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first + return (caches ?? FileManager.default.temporaryDirectory).path + } + + func beginStoriesAudio() throws { + StoriesAudio.shared.begin() + } + + func updateStoriesAudio(muted: Bool) throws { + StoriesAudio.shared.update(muted: muted) + } + + func endStoriesAudio() throws { + StoriesAudio.shared.end() + } + private static func _profileResponseToDict(_ p: GetProfileResponse) -> [String: Any] { var d: [String: Any] = [:] if let v = p.id { d["id"] = v } diff --git a/ios/Classes/StoriesSupport.swift b/ios/Classes/StoriesSupport.swift new file mode 100644 index 0000000..4789c3b --- /dev/null +++ b/ios/Classes/StoriesSupport.swift @@ -0,0 +1,96 @@ +import AVFoundation +import Foundation + +/// The slides of the UI kit's stories (V2) the user has seen, per shop: one UserDefaults entry +/// per shop, `[storyId: [slideId]]`. It survives app restarts, so a story reopens at its first +/// unseen slide and its cover keeps the seen segments. +/// +/// The plugin's own store, not the native SDK's: the Flutter viewer is drawn in Dart. +enum StoriesSeenStore { + private static let keyPrefix = "rees46_flutter_stories_seen." + + /// Seen slide ids by story id for `shop`; empty when nothing was seen yet. + static func read(shop: String) -> [String: [String]] { + let stored = UserDefaults.standard.dictionary(forKey: keyPrefix + shop) ?? [:] + var result: [String: [String]] = [:] + for (storyId, value) in stored { + if let slides = value as? [String] { result[storyId] = slides } + } + return result + } + + /// Adds `slideId` to the seen slides of `storyId` for `shop`. + static func add(shop: String, storyId: String, slideId: String) { + var stored = read(shop: shop) + var slides = stored[storyId] ?? [] + if slides.contains(slideId) { return } + slides.append(slideId) + stored[storyId] = slides + UserDefaults.standard.set(stored, forKey: keyPrefix + shop) + } +} + +/// The audio session while the stories viewer plays video. +/// +/// - `begin` saves the app's session before the first video, `end` puts it back when the +/// viewer closes. +/// - Muted, the session is `ambient`: video never interrupts other apps' audio (the user's +/// music keeps playing). Unmuted, it is `playback`: the story's sound takes over. +/// - While active, the session's `outputVolume` is watched: the hardware volume going up is +/// reported through `onVolumeUp`, and the viewer unmutes. +final class StoriesAudio { + static let shared = StoriesAudio() + + /// The hardware volume went up while the viewer plays video. Called on the main queue. + var onVolumeUp: (() -> Void)? + + private var saved: (category: AVAudioSession.Category, mode: AVAudioSession.Mode, + options: AVAudioSession.CategoryOptions)? + private var volumeObservation: NSKeyValueObservation? + /// The viewer played sound and so took the audio from other apps. + private var tookAudio = false + + func begin() { + guard saved == nil else { return } + let session = AVAudioSession.sharedInstance() + saved = (session.category, session.mode, session.categoryOptions) + } + + func update(muted: Bool) { + begin() + let session = AVAudioSession.sharedInstance() + if muted { + try? session.setCategory(.ambient, mode: .default, options: []) + } else { + try? session.setCategory(.playback, mode: .default, options: []) + tookAudio = true + } + // The volume is observable only on an active session; `ambient` mixes with other audio. + try? session.setActive(true) + observeVolume() + } + + func end() { + volumeObservation?.invalidate() + volumeObservation = nil + guard let saved = saved else { return } + self.saved = nil + let session = AVAudioSession.sharedInstance() + // Deactivated before the category goes back, so a non-mixable category the app had does + // not take over the audio here. After sound played, the app whose audio the story + // interrupted is told it may resume. Fails harmlessly while something else still plays. + try? session.setActive(false, options: tookAudio ? .notifyOthersOnDeactivation : []) + try? session.setCategory(saved.category, mode: saved.mode, options: saved.options) + tookAudio = false + } + + private func observeVolume() { + guard volumeObservation == nil else { return } + volumeObservation = AVAudioSession.sharedInstance().observe( + \.outputVolume, options: [.old, .new] + ) { [weak self] _, change in + guard let old = change.oldValue, let new = change.newValue, new > old else { return } + DispatchQueue.main.async { self?.onVolumeUp?() } + } + } +} diff --git a/ios/Classes/pigeon/PersonalizationApi.g.swift b/ios/Classes/pigeon/PersonalizationApi.g.swift index 30aaad4..eb39c5a 100644 --- a/ios/Classes/pigeon/PersonalizationApi.g.swift +++ b/ios/Classes/pigeon/PersonalizationApi.g.swift @@ -538,6 +538,27 @@ protocol PersonalizationHostApi { /// Opens [url] with the system handler (browser or the app that claims the link). /// Returns false when nothing could open it. func openUrl(url: String, completion: @escaping (Result) -> Void) + /// The slide ids seen per story id for [shop] — the plugin's own store + /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It + /// survives app restarts. + func getStoriesSeen(shop: String) throws -> [String: [String]] + /// Records [slideId] of story [storyId] as seen for [shop]. + func setStorySlideSeen(shop: String, storyId: String, slideId: String) throws + /// The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The + /// stories viewer keeps its video cache under it. + func getCacheDirectory() throws -> String + /// Remembers the app's audio session before the stories viewer plays its first video, + /// so [endStoriesAudio] can put it back. iOS only; a no-op on Android, where a muted + /// video never takes the audio focus (`mixWithOthers`). + func beginStoriesAudio() throws + /// While the viewer plays video: muted — the `ambient` category, which never + /// interrupts other apps' audio; unmuted — `playback`. Also starts watching the + /// hardware volume (see [PersonalizationStoriesFlutterApi.onStoriesVolumeUp]). iOS + /// only; a no-op on Android. + func updateStoriesAudio(muted: Bool) throws + /// The viewer closed: restores the session saved by [beginStoriesAudio] and stops + /// watching the volume. iOS only; a no-op on Android. + func endStoriesAudio() throws /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side @@ -983,6 +1004,107 @@ class PersonalizationHostApiSetup { } else { openUrlChannel.setMessageHandler(nil) } + /// The slide ids seen per story id for [shop] — the plugin's own store + /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It + /// survives app restarts. + let getStoriesSeenChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + getStoriesSeenChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let shopArg = args[0] as! String + do { + let result = try api.getStoriesSeen(shop: shopArg) + reply(wrapResult(result)) + } catch { + reply(wrapError(error)) + } + } + } else { + getStoriesSeenChannel.setMessageHandler(nil) + } + /// Records [slideId] of story [storyId] as seen for [shop]. + let setStorySlideSeenChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.setStorySlideSeen\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + setStorySlideSeenChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let shopArg = args[0] as! String + let storyIdArg = args[1] as! String + let slideIdArg = args[2] as! String + do { + try api.setStorySlideSeen(shop: shopArg, storyId: storyIdArg, slideId: slideIdArg) + reply(wrapResult(nil)) + } catch { + reply(wrapError(error)) + } + } + } else { + setStorySlideSeenChannel.setMessageHandler(nil) + } + /// The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The + /// stories viewer keeps its video cache under it. + let getCacheDirectoryChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getCacheDirectory\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + getCacheDirectoryChannel.setMessageHandler { _, reply in + do { + let result = try api.getCacheDirectory() + reply(wrapResult(result)) + } catch { + reply(wrapError(error)) + } + } + } else { + getCacheDirectoryChannel.setMessageHandler(nil) + } + /// Remembers the app's audio session before the stories viewer plays its first video, + /// so [endStoriesAudio] can put it back. iOS only; a no-op on Android, where a muted + /// video never takes the audio focus (`mixWithOthers`). + let beginStoriesAudioChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.beginStoriesAudio\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + beginStoriesAudioChannel.setMessageHandler { _, reply in + do { + try api.beginStoriesAudio() + reply(wrapResult(nil)) + } catch { + reply(wrapError(error)) + } + } + } else { + beginStoriesAudioChannel.setMessageHandler(nil) + } + /// While the viewer plays video: muted — the `ambient` category, which never + /// interrupts other apps' audio; unmuted — `playback`. Also starts watching the + /// hardware volume (see [PersonalizationStoriesFlutterApi.onStoriesVolumeUp]). iOS + /// only; a no-op on Android. + let updateStoriesAudioChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.updateStoriesAudio\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + updateStoriesAudioChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let mutedArg = args[0] as! Bool + do { + try api.updateStoriesAudio(muted: mutedArg) + reply(wrapResult(nil)) + } catch { + reply(wrapError(error)) + } + } + } else { + updateStoriesAudioChannel.setMessageHandler(nil) + } + /// The viewer closed: restores the session saved by [beginStoriesAudio] and stops + /// watching the volume. iOS only; a no-op on Android. + let endStoriesAudioChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.endStoriesAudio\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + endStoriesAudioChannel.setMessageHandler { _, reply in + do { + try api.endStoriesAudio() + reply(wrapResult(nil)) + } catch { + reply(wrapError(error)) + } + } + } else { + endStoriesAudioChannel.setMessageHandler(nil) + } /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side @@ -1337,3 +1459,43 @@ class PersonalizationFlutterApi: PersonalizationFlutterApiProtocol { } } } +/// Native events of the stories viewer. Separate from [PersonalizationFlutterApi]: the +/// push dispatcher owns that channel, the UI kit owns this one. +/// +/// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. +protocol PersonalizationStoriesFlutterApiProtocol { + /// The hardware volume went up while the viewer plays video (iOS: the audio session's + /// `outputVolume` grew). Android delivers the volume key to Flutter itself. + func onStoriesVolumeUp(completion: @escaping (Result) -> Void) +} +class PersonalizationStoriesFlutterApi: PersonalizationStoriesFlutterApiProtocol { + private let binaryMessenger: FlutterBinaryMessenger + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { + self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + } + var codec: PersonalizationApiPigeonCodec { + return PersonalizationApiPigeonCodec.shared + } + /// The hardware volume went up while the viewer plays video (iOS: the audio session's + /// `outputVolume` grew). Android delivers the volume key to Flutter itself. + func onStoriesVolumeUp(completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationStoriesFlutterApi.onStoriesVolumeUp\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) + channel.sendMessage(nil) { response in + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + completion(.success(())) + } + } + } +} diff --git a/lib/src/personalization_sdk.dart b/lib/src/personalization_sdk.dart index 79c70d0..76a4043 100644 --- a/lib/src/personalization_sdk.dart +++ b/lib/src/personalization_sdk.dart @@ -361,4 +361,13 @@ extension PersonalizationStoriesBridge on PersonalizationSdk { /// Opens [url] with the system handler; `false` when nothing could open it. Future openUrl(String url) => _api.openUrl(url); + + /// The stories slides seen on this device for [shop] (slide ids by story id), from the + /// plugin's own persistent store. + Future>> getStoriesSeen(String shop) => + _api.getStoriesSeen(shop); + + /// Records slide [slideId] of story [storyId] as seen for [shop]. + Future setStorySlideSeen(String shop, String storyId, String slideId) => + _api.setStorySlideSeen(shop, storyId, slideId); } diff --git a/lib/src/pigeon/personalization_api.g.dart b/lib/src/pigeon/personalization_api.g.dart index 5603d41..3fa46a6 100644 --- a/lib/src/pigeon/personalization_api.g.dart +++ b/lib/src/pigeon/personalization_api.g.dart @@ -1098,6 +1098,169 @@ class PersonalizationHostApi { } } + /// The slide ids seen per story id for [shop] — the plugin's own store + /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It + /// survives app restarts. + Future>> getStoriesSeen(String shop) async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([shop]); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else if (pigeonVar_replyList[0] == null) { + throw PlatformException( + code: 'null-error', + message: 'Host platform returned null value for non-null return value.', + ); + } else { + return (pigeonVar_replyList[0] as Map?)!.cast>(); + } + } + + /// Records [slideId] of story [storyId] as seen for [shop]. + Future setStorySlideSeen(String shop, String storyId, String slideId) async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.setStorySlideSeen$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([shop, storyId, slideId]); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else { + return; + } + } + + /// The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The + /// stories viewer keeps its video cache under it. + Future getCacheDirectory() async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getCacheDirectory$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else if (pigeonVar_replyList[0] == null) { + throw PlatformException( + code: 'null-error', + message: 'Host platform returned null value for non-null return value.', + ); + } else { + return (pigeonVar_replyList[0] as String?)!; + } + } + + /// Remembers the app's audio session before the stories viewer plays its first video, + /// so [endStoriesAudio] can put it back. iOS only; a no-op on Android, where a muted + /// video never takes the audio focus (`mixWithOthers`). + Future beginStoriesAudio() async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.beginStoriesAudio$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else { + return; + } + } + + /// While the viewer plays video: muted — the `ambient` category, which never + /// interrupts other apps' audio; unmuted — `playback`. Also starts watching the + /// hardware volume (see [PersonalizationStoriesFlutterApi.onStoriesVolumeUp]). iOS + /// only; a no-op on Android. + Future updateStoriesAudio(bool muted) async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.updateStoriesAudio$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([muted]); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else { + return; + } + } + + /// The viewer closed: restores the session saved by [beginStoriesAudio] and stops + /// watching the volume. iOS only; a no-op on Android. + Future endStoriesAudio() async { + final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.endStoriesAudio$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); + final List? pigeonVar_replyList = + await pigeonVar_sendFuture as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { + throw PlatformException( + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], + ); + } else { + return; + } + } + /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side @@ -1518,3 +1681,36 @@ abstract class PersonalizationFlutterApi { } } } + +/// Native events of the stories viewer. Separate from [PersonalizationFlutterApi]: the +/// push dispatcher owns that channel, the UI kit owns this one. +abstract class PersonalizationStoriesFlutterApi { + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + /// The hardware volume went up while the viewer plays video (iOS: the audio session's + /// `outputVolume` grew). Android delivers the volume key to Flutter itself. + void onStoriesVolumeUp(); + + static void setUp(PersonalizationStoriesFlutterApi? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + { + final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationStoriesFlutterApi.onStoriesVolumeUp$messageChannelSuffix', pigeonChannelCodec, + binaryMessenger: binaryMessenger); + if (api == null) { + pigeonVar_channel.setMessageHandler(null); + } else { + pigeonVar_channel.setMessageHandler((Object? message) async { + try { + api.onStoriesVolumeUp(); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } + }); + } + } + } +} diff --git a/lib/src/stories/stories_response.dart b/lib/src/stories/stories_response.dart index 9db6c56..1ab2348 100644 --- a/lib/src/stories/stories_response.dart +++ b/lib/src/stories/stories_response.dart @@ -97,8 +97,9 @@ class StorySlide { final Duration duration; final List elements; - /// Seconds a slide lasts when the server does not say. - static const int defaultDurationSeconds = 5; + /// Seconds a slide lasts when the server does not say (or says 0) — the same on every + /// platform. + static const int defaultDurationSeconds = 10; const StorySlide({ required this.id, @@ -328,13 +329,17 @@ class StoryProduct { final double oldPrice; final String oldPriceFormatted; - /// Discount in percent (`discount_percent`), 0 when there is none. - final int discountPercent; + /// Discount in percent (`discount_percent`), 0 when there is none. Kept fractional: + /// the admin may send `12.5`. + final double discountPercent; /// Promo code for this product, empty when there is none. final String promocode; - /// Price with the promo code applied. + /// Price with the promo code applied (`price_with_promocode`), 0 when not sent. + final double priceWithPromocode; + + /// Price with the promo code applied, formatted. final String priceWithPromocodeFormatted; final String currency; final String url; @@ -353,6 +358,7 @@ class StoryProduct { this.oldPriceFormatted = '', this.discountPercent = 0, this.promocode = '', + this.priceWithPromocode = 0, this.priceWithPromocodeFormatted = '', this.currency = '', this.url = '', @@ -372,8 +378,9 @@ class StoryProduct { priceFormatted: text('price_formatted'), oldPrice: toDoubleOrNull(json['oldprice']) ?? 0, oldPriceFormatted: text('oldprice_formatted'), - discountPercent: toIntOrNull(json['discount_percent']) ?? 0, + discountPercent: toDoubleOrNull(json['discount_percent']) ?? 0, promocode: text('promocode'), + priceWithPromocode: toDoubleOrNull(json['price_with_promocode']) ?? 0, priceWithPromocodeFormatted: text('price_with_promocode_formatted'), currency: text('currency'), url: text('url'), diff --git a/pigeons/personalization_api.dart b/pigeons/personalization_api.dart index 9555ccc..77804d8 100644 --- a/pigeons/personalization_api.dart +++ b/pigeons/personalization_api.dart @@ -262,6 +262,33 @@ abstract class PersonalizationHostApi { @async bool openUrl(String url); + /// The slide ids seen per story id for [shop] — the plugin's own store + /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It + /// survives app restarts. + Map> getStoriesSeen(String shop); + + /// Records [slideId] of story [storyId] as seen for [shop]. + void setStorySlideSeen(String shop, String storyId, String slideId); + + /// The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The + /// stories viewer keeps its video cache under it. + String getCacheDirectory(); + + /// Remembers the app's audio session before the stories viewer plays its first video, + /// so [endStoriesAudio] can put it back. iOS only; a no-op on Android, where a muted + /// video never takes the audio focus (`mixWithOthers`). + void beginStoriesAudio(); + + /// While the viewer plays video: muted — the `ambient` category, which never + /// interrupts other apps' audio; unmuted — `playback`. Also starts watching the + /// hardware volume (see [PersonalizationStoriesFlutterApi.onStoriesVolumeUp]). iOS + /// only; a no-op on Android. + void updateStoriesAudio(bool muted); + + /// The viewer closed: restores the session saved by [beginStoriesAudio] and stops + /// watching the volume. iOS only; a no-op on Android. + void endStoriesAudio(); + /// Routes a push to the shop it belongs to (payload `shop_id`) and tracks it /// via the native `REES46.handlePush`. [event] is the index of the Dart /// `PushEvent` enum: 0 = received, 1 = delivered, 2 = clicked. The native side @@ -368,3 +395,12 @@ abstract class PersonalizationFlutterApi { void onPushClicked(String? shopId, Map payload); } + +/// Native events of the stories viewer. Separate from [PersonalizationFlutterApi]: the +/// push dispatcher owns that channel, the UI kit owns this one. +@FlutterApi() +abstract class PersonalizationStoriesFlutterApi { + /// The hardware volume went up while the viewer plays video (iOS: the audio session's + /// `outputVolume` grew). Android delivers the volume key to Flutter itself. + void onStoriesVolumeUp(); +} diff --git a/test/stories/stories_response_test.dart b/test/stories/stories_response_test.dart index 74ac500..065f3ad 100644 --- a/test/stories/stories_response_test.dart +++ b/test/stories/stories_response_test.dart @@ -141,12 +141,29 @@ final Map _block = { class _FakeHostApi extends pigeon.PersonalizationHostApi { final List<(String, String?)> requests = <(String, String?)>[]; + final Map>> seen = + >>{}; @override Future getStories(String code, String? shopId) async { requests.add((code, shopId)); return jsonEncode(_block); } + + @override + Future>> getStoriesSeen(String shop) async => + seen[shop] ?? >{}; + + @override + Future setStorySlideSeen( + String shop, + String storyId, + String slideId, + ) async { + (seen[shop] ??= >{}) + .putIfAbsent(storyId, () => []) + .add(slideId); + } } void main() { @@ -269,4 +286,30 @@ void main() { expect(block.stories, hasLength(2)); expect(() => sdk.getStories(''), throwsArgumentError); }); + + test('seen slides go through the bridge, per shop', () async { + final api = _FakeHostApi(); + final sdk = PersonalizationSdk(api: api, shopId: 'shop-a'); + + await sdk.setStorySlideSeen('shop-a', '40', '36'); + await sdk.setStorySlideSeen('shop-a', '40', '37'); + + expect(await sdk.getStoriesSeen('shop-a'), >{ + '40': ['36', '37'], + }); + expect(await sdk.getStoriesSeen('shop-b'), isEmpty); + }); + + test('numbers are read as decimals; the default duration is 10 s', () { + final product = StoryProduct.fromJson(const { + 'id': 1, + 'price': '99.9', + 'discount_percent': '12.5', + 'price_with_promocode': 89.5, + }); + expect(product.price, 99.9); + expect(product.discountPercent, 12.5); + expect(product.priceWithPromocode, 89.5); + expect(StorySlide.defaultDurationSeconds, 10); + }); } From 023cffa8cf7e8afe6fff5bc153c80653316cdf9d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:19:39 +0400 Subject: [PATCH 53/79] feat(ui): stories playback state machine StoriesPlayback holds the viewer's logic without UI: the current story and slide, the start slide of a story (first unseen, else the server's start_position, from the start once viewed), seen slides marked when a settled page enters them, pause reasons (hold, drag, sheet, background, covered, host, loading, error), the products sheet that blocks navigation and resets on every slide change, retry with a new entry number, and a slide clock fed with real time deltas that a video's own length and position can drive. --- lib/src/ui/widgets/stories_playback.dart | 325 +++++++++++++++++++++++ test/ui/stories_playback_test.dart | 232 ++++++++++++++++ 2 files changed, 557 insertions(+) create mode 100644 lib/src/ui/widgets/stories_playback.dart create mode 100644 test/ui/stories_playback_test.dart diff --git a/lib/src/ui/widgets/stories_playback.dart b/lib/src/ui/widgets/stories_playback.dart new file mode 100644 index 0000000..8825abc --- /dev/null +++ b/lib/src/ui/widgets/stories_playback.dart @@ -0,0 +1,325 @@ +import '../../stories/stories_response.dart'; + +/// Почему стоит текущий слайд. Часы слайда идут, только когда причин нет. +enum StoriesPauseReason { + /// Палец держат на слайде (удержание от 200 мс). + hold, + + /// Тянут: свайп вниз, листание сторис пальцем или программное перелистывание. + drag, + + /// Раскрыта шторка товаров. + sheet, + + /// Приложение свёрнуто или потеряло фокус, погас экран. + background, + + /// Просмотр закрыт другим экраном. + covered, + + /// Пауза от хоста (`PersonalizationStoriesController.pause`). + host, + + /// Медиа слайда ещё грузится. + loading, + + /// Медиа не загрузилось — на слайде кнопка «Повторить». + error, +} + +/// Что сделать просмотру после шага. +enum StoriesStep { + /// Ничего не поменялось (например, шаг заблокирован шторкой). + none, + + /// Новый заход на слайд текущей сторис — другой или тот же заново. + slide, + + /// Перелистнуть страницу на сторис [StoriesPlayback.turnTarget]; заход на неё + /// случится, когда страница осядет ([StoriesPlayback.settle]). + turn, + + /// Закрыть просмотр. + close, +} + +/// Логика просмотра сторис без UI: какая сторис и какой слайд текущие, с какого слайда +/// открывать сторис, почему слайд стоит, открыта ли шторка, сколько прошло времени. +/// +/// Правила (общие для всех платформ): +/// - слайд просмотрен в момент, когда он стал текущим на осевшей странице — не при +/// подглядывании соседней сторис наполовину свайпа ([settle]); +/// - сторис просмотрена, когда так считает сервер (`viewed`) или просмотрены все её +/// слайды ([isViewed]); +/// - сторис открывается: с первого непросмотренного слайда, если часть просмотрена; с +/// `start_position` сервера, если ничего; с начала, если просмотрена вся +/// ([startSlideOf]); +/// - назад на первом слайде первой сторис перезапускает слайд, вперёд на последнем +/// слайде последней — закрывает просмотр; +/// - пока раскрыта шторка товаров, слайды и сторис не листаются; любая смена слайда +/// шторку закрывает; +/// - время слайда копится только из реально прошедших промежутков и только пока ничто +/// его не держит — от масштаба анимаций системы оно не зависит. +/// +/// Сторис без слайдов отбрасываются при создании. +class StoriesPlayback { + StoriesPlayback({ + required List stories, + int initialStory = 0, + Map> seen = const >{}, + }) : stories = List.unmodifiable( + stories.where((story) => story.slides.isNotEmpty), + ), + _seen = >{ + for (final entry in seen.entries) entry.key: {...entry.value}, + } { + // Начальный индекс дан по исходному списку: сторис без слайдов перед ним выпали. + var kept = 0; + for (var i = 0; i < stories.length && i < initialStory; i++) { + if (stories[i].slides.isNotEmpty) kept++; + } + _story = this.stories.isEmpty ? 0 : kept.clamp(0, this.stories.length - 1); + } + + /// Сторис со слайдами в порядке ленты. + final List stories; + + final Map> _seen; + final Set _reasons = {}; + late int _story; + int _slide = 0; + int _generation = 0; + bool _entered = false; + bool _sheet = false; + int? _turnTarget; + Duration _elapsed = Duration.zero; + Duration _duration = Duration.zero; + bool _byVideo = false; + + /// Самый длинный промежуток, который часы примут за раз: если кадры не шли (фон, + /// зависание), слайд не проскакивает. + static const Duration maxTick = Duration(seconds: 1); + + bool get isEmpty => stories.isEmpty; + int get storyIndex => _story; + int get slideIndex => _slide; + Story get story => stories[_story]; + StorySlide get slide => story.slides[_slide]; + + /// Номер захода на слайд: растёт при каждом заходе и при «Повторить». Загрузки + /// прошлых заходов по нему отбрасываются. + int get generation => _generation; + + /// Был ли заход хоть на один слайд (первая страница осела). + bool get entered => _entered; + bool get sheetOpen => _sheet; + + /// Часы идут: заход был, и ничто слайд не держит. + bool get running => _entered && _reasons.isEmpty; + Set get reasons => + Set.unmodifiable(_reasons); + bool pausedBy(StoriesPauseReason reason) => _reasons.contains(reason); + + /// Куда листать после [StoriesStep.turn]; `null` — не листаем. + int? get turnTarget => _turnTarget; + + /// Просмотренные слайды сторис [storyId]. + Set seenOf(String storyId) => + Set.unmodifiable(_seen[storyId] ?? const {}); + + /// Сколько прошло на текущем слайде. + Duration get elapsed => _elapsed; + + /// Длительность текущего слайда: из админки, у видео — реальная длина ролика. + Duration get duration => _duration; + + /// Слайд длится столько, сколько ролик: конец — по концу видео, а не по часам. + bool get followsVideo => _byVideo; + + /// Доля прошедшего времени слайда, 0…1. + double get progress => _duration <= Duration.zero + ? 0 + : (_elapsed.inMicroseconds / _duration.inMicroseconds).clamp(0.0, 1.0); + + /// Сторис просмотрена: так говорит сервер или просмотрены все её слайды. + static bool isViewed(Story story, Set seen) => + story.viewed || + (story.slides.isNotEmpty && + story.slides.every((slide) => seen.contains(slide.id))); + + /// С какого слайда открыть [story]: просмотрена — с начала; просмотрена частично — + /// с первого непросмотренного по порядку; не начата — с `start_position` сервера. + static int startSlideOf(Story story, Set seen) { + final slides = story.slides; + if (slides.isEmpty || isViewed(story, seen)) return 0; + if (slides.any((slide) => seen.contains(slide.id))) { + final unseen = slides.indexWhere((slide) => !seen.contains(slide.id)); + return unseen < 0 ? 0 : unseen; + } + return story.startPosition.clamp(0, slides.length - 1); + } + + /// Стартовый слайд сторис [index] по текущему состоянию просмотренного. + int startSlideFor(int index) { + final story = stories[index]; + return startSlideOf(story, _seen[story.id] ?? const {}); + } + + /// Страница осела на сторис [index] (листанием, программно или при открытии). + /// `true` — начался заход на её стартовый слайд; та же сторис — `false`, только + /// снимается пауза листания. + bool settle(int index) { + _reasons.remove(StoriesPauseReason.drag); + _turnTarget = null; + if (stories.isEmpty) return false; + final target = index.clamp(0, stories.length - 1); + if (_entered && target == _story) return false; + _story = target; + _slide = startSlideFor(target); + _enter(); + return true; + } + + /// Вперёд: следующий слайд, следующая сторис или закрыть. + StoriesStep next() { + if (!_entered || _sheet || _turnTarget != null) return StoriesStep.none; + if (_slide < story.slides.length - 1) { + _slide++; + _enter(); + return StoriesStep.slide; + } + if (_story < stories.length - 1) { + _turnTo(_story + 1); + return StoriesStep.turn; + } + return StoriesStep.close; + } + + /// Назад: предыдущий слайд, предыдущая сторис или перезапуск первого слайда. + StoriesStep previous() { + if (!_entered || _sheet || _turnTarget != null) return StoriesStep.none; + if (_slide > 0) { + _slide--; + _enter(); + return StoriesStep.slide; + } + if (_story > 0) { + _turnTo(_story - 1); + return StoriesStep.turn; + } + _enter(); + return StoriesStep.slide; + } + + /// Перелистнуть на сторис [index] программно (по id из хоста). Та же — `none`. + StoriesStep turnTo(int index) { + if (stories.isEmpty) return StoriesStep.none; + final target = index.clamp(0, stories.length - 1); + if (_entered && target == _story) return StoriesStep.none; + _sheet = false; + _reasons.remove(StoriesPauseReason.sheet); + _turnTo(target); + return StoriesStep.turn; + } + + void _turnTo(int index) { + _turnTarget = index; + _reasons.add(StoriesPauseReason.drag); + } + + /// Поставить на паузу по [reason]. `true` — состояние «идёт» поменялось. + bool pause(StoriesPauseReason reason) { + final was = running; + _reasons.add(reason); + return was != running; + } + + /// Снять паузу по [reason]. `true` — состояние «идёт» поменялось. + bool resume(StoriesPauseReason reason) { + final was = running; + _reasons.remove(reason); + return was != running; + } + + /// Раскрыть шторку товаров: слайд на паузе, листание заблокировано. + bool openSheet() { + if (!_entered || _sheet) return false; + _sheet = true; + _reasons.add(StoriesPauseReason.sheet); + return true; + } + + /// Свернуть шторку товаров. + bool closeSheet() { + if (!_sheet) return false; + _sheet = false; + _reasons.remove(StoriesPauseReason.sheet); + return true; + } + + /// Медиа захода [generation] готово: часы могут идти. + void mediaReady(int generation) { + if (generation != _generation) return; + _reasons + ..remove(StoriesPauseReason.loading) + ..remove(StoriesPauseReason.error); + } + + /// Медиа захода [generation] не загрузилось (или не успело за отведённое время). + void mediaFailed(int generation) { + if (generation != _generation) return; + _reasons + ..remove(StoriesPauseReason.loading) + ..add(StoriesPauseReason.error); + } + + /// «Повторить»: тот же слайд заново грузит медиа. Новый номер захода отбрасывает + /// прошлые загрузки; просмотренным слайд уже отмечен. + int retry() { + _generation++; + _elapsed = Duration.zero; + _duration = slide.duration; + _byVideo = false; + _reasons + ..remove(StoriesPauseReason.error) + ..add(StoriesPauseReason.loading); + return _generation; + } + + /// Реальная длина видео текущего слайда; неизвестная (0) оставляет время админки. + void useVideoDuration(Duration duration) { + if (duration <= Duration.zero) return; + _duration = duration; + _byVideo = true; + } + + /// Позиция видео: время слайда идёт за воспроизведением. + void syncVideoPosition(Duration position) { + if (!_byVideo) return; + _elapsed = position > _duration ? _duration : position; + } + + /// Прошло [delta] реального времени. `true` — слайд кончился по часам (у видео + /// с известной длиной конец даёт само видео). + bool tick(Duration delta) { + if (!running || delta <= Duration.zero) return false; + _elapsed += delta > maxTick ? maxTick : delta; + if (_elapsed < _duration) return false; + _elapsed = _duration; + return !_byVideo; + } + + void _enter() { + _entered = true; + _generation++; + _sheet = false; + _elapsed = Duration.zero; + _duration = slide.duration; + _byVideo = false; + _reasons + ..remove(StoriesPauseReason.sheet) + ..remove(StoriesPauseReason.error) + ..add(StoriesPauseReason.loading); + (_seen[story.id] ??= {}).add(slide.id); + } +} diff --git a/test/ui/stories_playback_test.dart b/test/ui/stories_playback_test.dart new file mode 100644 index 0000000..e0bb36b --- /dev/null +++ b/test/ui/stories_playback_test.dart @@ -0,0 +1,232 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/stories/stories_response.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_playback.dart'; + +/// A story with [count] slides `0`, `1`, … lasting 5 s each. +Story _story(String id, int count, {bool viewed = false, int start = 0}) => + Story( + id: id, + name: id, + avatar: '', + viewed: viewed, + startPosition: start, + slides: [ + for (var i = 0; i < count; i++) + StorySlide( + id: '$id$i', + type: StorySlideType.image, + duration: const Duration(seconds: 5), + ), + ], + ); + +/// Opens [playback] the way the viewer does: the first page settles, media is ready. +StoriesPlayback _open(StoriesPlayback playback) { + playback.settle(playback.storyIndex); + playback.mediaReady(playback.generation); + return playback; +} + +void main() { + group('start slide', () { + test('nothing seen: the server start_position, clamped', () { + expect(StoriesPlayback.startSlideOf(_story('a', 3, start: 2), {}), 2); + expect(StoriesPlayback.startSlideOf(_story('a', 3, start: 9), {}), 2); + expect(StoriesPlayback.startSlideOf(_story('a', 3, start: -1), {}), 0); + }); + + test('partly seen: the first unseen slide in order', () { + final story = _story('a', 4, start: 3); + expect(StoriesPlayback.startSlideOf(story, {'a0', 'a2'}), 1); + expect(StoriesPlayback.startSlideOf(story, {'a1'}), 0); + }); + + test('viewed by the server or fully seen: the first slide', () { + expect( + StoriesPlayback.startSlideOf(_story('a', 3, viewed: true), {'a0'}), + 0, + ); + final story = _story('a', 2, start: 1); + expect(StoriesPlayback.startSlideOf(story, {'a0', 'a1'}), 0); + expect(StoriesPlayback.isViewed(story, {'a0', 'a1'}), isTrue); + expect(StoriesPlayback.isViewed(story, {'a0'}), isFalse); + }); + }); + + group('navigation', () { + test('slides, then the next story on settle, then close', () { + final playback = _open( + StoriesPlayback(stories: [_story('a', 2), _story('b', 1)]), + ); + expect(playback.slide.id, 'a0'); + + expect(playback.next(), StoriesStep.slide); + expect(playback.slide.id, 'a1'); + + expect(playback.next(), StoriesStep.turn); + expect(playback.turnTarget, 1); + expect(playback.pausedBy(StoriesPauseReason.drag), isTrue); + expect(playback.next(), StoriesStep.none, reason: 'turning'); + expect( + playback.seenOf('b'), + isEmpty, + reason: 'not entered before settle', + ); + + expect(playback.settle(1), isTrue); + expect(playback.slide.id, 'b0'); + expect(playback.seenOf('b'), {'b0'}); + playback.mediaReady(playback.generation); + + expect(playback.next(), StoriesStep.close); + }); + + test('back on the first slide of the first story restarts it', () { + final playback = _open(StoriesPlayback(stories: [_story('a', 2)])); + playback.mediaReady(playback.generation); + playback.tick(const Duration(seconds: 2)); + final generation = playback.generation; + + expect(playback.previous(), StoriesStep.slide); + expect(playback.slide.id, 'a0'); + expect(playback.generation, greaterThan(generation)); + expect(playback.elapsed, Duration.zero); + }); + + test('back into the previous story opens its start slide', () { + final playback = _open( + StoriesPlayback( + stories: [_story('a', 3), _story('b', 1)], + initialStory: 1, + seen: { + 'a': {'a0'}, + }, + ), + ); + expect(playback.slide.id, 'b0'); + expect(playback.previous(), StoriesStep.turn); + expect(playback.turnTarget, 0); + playback.settle(0); + expect(playback.slide.id, 'a1', reason: 'the first unseen'); + }); + + test('a peeked page that springs back is not entered', () { + final playback = _open( + StoriesPlayback(stories: [_story('a', 1), _story('b', 1)]), + ); + playback.pause(StoriesPauseReason.drag); + expect(playback.settle(0), isFalse); + expect(playback.running, isTrue); + expect(playback.seenOf('b'), isEmpty); + }); + + test('stories without slides are dropped, the index follows', () { + final playback = StoriesPlayback( + stories: [_story('a', 1), _story('empty', 0), _story('b', 1)], + initialStory: 2, + ); + expect(playback.stories.map((story) => story.id), ['a', 'b']); + expect(playback.storyIndex, 1); + expect(StoriesPlayback(stories: [_story('x', 0)]).isEmpty, isTrue); + }); + }); + + group('pause reasons and the clock', () { + test('the clock runs only with no reason, in real deltas', () { + final playback = StoriesPlayback(stories: [_story('a', 2)]); + playback.settle(0); + expect(playback.pausedBy(StoriesPauseReason.loading), isTrue); + expect(playback.tick(const Duration(seconds: 9)), isFalse); + expect(playback.elapsed, Duration.zero, reason: 'loading'); + + playback.mediaReady(playback.generation); + playback.pause(StoriesPauseReason.hold); + playback.pause(StoriesPauseReason.background); + expect(playback.tick(const Duration(seconds: 1)), isFalse); + playback.resume(StoriesPauseReason.hold); + expect(playback.running, isFalse, reason: 'still in the background'); + playback.resume(StoriesPauseReason.background); + expect(playback.running, isTrue); + + // A frame gap (e.g. right after returning) counts for at most a second. + playback.tick(const Duration(minutes: 5)); + expect(playback.elapsed, StoriesPlayback.maxTick); + expect(playback.progress, closeTo(0.2, 1e-9)); + for (var i = 0; i < 3; i++) { + expect(playback.tick(const Duration(seconds: 1)), isFalse); + } + expect(playback.tick(const Duration(seconds: 1)), isTrue); + }); + + test('a video slide lasts the video and follows its position', () { + final playback = _open(StoriesPlayback(stories: [_story('a', 1)])); + playback.useVideoDuration(const Duration(seconds: 30)); + expect(playback.followsVideo, isTrue); + playback.syncVideoPosition(const Duration(seconds: 15)); + expect(playback.progress, closeTo(0.5, 1e-9)); + playback.syncVideoPosition(const Duration(seconds: 30)); + expect( + playback.tick(const Duration(seconds: 1)), + isFalse, + reason: 'the video itself ends the slide', + ); + playback.useVideoDuration(Duration.zero); + expect(playback.duration, const Duration(seconds: 30)); + }); + + test('a failed load pauses until retry; old loads are ignored', () { + final playback = StoriesPlayback(stories: [_story('a', 1)]); + playback.settle(0); + final first = playback.generation; + playback.mediaFailed(first); + expect(playback.pausedBy(StoriesPauseReason.error), isTrue); + + final second = playback.retry(); + expect(second, greaterThan(first)); + expect(playback.pausedBy(StoriesPauseReason.error), isFalse); + expect(playback.pausedBy(StoriesPauseReason.loading), isTrue); + playback.mediaReady(first); + expect(playback.running, isFalse, reason: 'a stale load'); + playback.mediaReady(second); + expect(playback.running, isTrue); + expect(playback.seenOf('a'), {'a0'}); + }); + }); + + group('products sheet', () { + test('pauses, blocks navigation, resets on a slide change', () { + final playback = _open( + StoriesPlayback(stories: [_story('a', 2), _story('b', 1)]), + ); + expect(playback.openSheet(), isTrue); + expect(playback.running, isFalse); + expect(playback.next(), StoriesStep.none); + expect(playback.previous(), StoriesStep.none); + expect(playback.slide.id, 'a0'); + + expect(playback.closeSheet(), isTrue); + expect(playback.running, isTrue); + playback.openSheet(); + // A programmatic jump to another story closes it. + expect(playback.turnTo(1), StoriesStep.turn); + expect(playback.sheetOpen, isFalse); + playback.settle(1); + expect(playback.sheetOpen, isFalse); + }); + + test('entering a slide closes an open sheet', () { + final playback = _open(StoriesPlayback(stories: [_story('a', 2)])); + playback.openSheet(); + playback.closeSheet(); + playback.next(); + playback.mediaReady(playback.generation); + playback.openSheet(); + playback.settle(0); + expect(playback.sheetOpen, isTrue, reason: 'same story: no new entry'); + playback.closeSheet(); + playback.previous(); + expect(playback.sheetOpen, isFalse); + expect(playback.reasons, {StoriesPauseReason.loading}); + }); + }); +} From 50721ac89b5b8b8270083aac3d5c1614540d11b2 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:24:14 +0400 Subject: [PATCH 54/79] feat(ui): video cache for stories StoriesMediaCache keeps story videos in an LRU cache of 50 MB under personalization_stories in the app cache dir, one per process for every viewer. A file is downloaded once: a second request while it downloads waits for the same download, and only a complete file is renamed into place. HLS is left to the player. Plain dart:io, no new dependency. --- lib/src/ui/widgets/stories_media_cache.dart | 140 ++++++++++++++++++++ test/ui/stories_media_cache_test.dart | 65 +++++++++ 2 files changed, 205 insertions(+) create mode 100644 lib/src/ui/widgets/stories_media_cache.dart create mode 100644 test/ui/stories_media_cache_test.dart diff --git a/lib/src/ui/widgets/stories_media_cache.dart b/lib/src/ui/widgets/stories_media_cache.dart new file mode 100644 index 0000000..b991913 --- /dev/null +++ b/lib/src/ui/widgets/stories_media_cache.dart @@ -0,0 +1,140 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; + +import 'package:flutter/foundation.dart'; + +import '../../pigeon/personalization_api.g.dart' as pigeon; + +/// Дисковый кэш видео сторис: LRU на 50 МБ в папке `personalization_stories` кэша +/// приложения, один на процесс — общий для всех просмотров. +/// +/// Каждый файл качается один раз: повторный запрос, пока файл ещё качается, ждёт ту же +/// загрузку. Файл сначала пишется во временный `.part` и только целиком переименовывается, +/// поэтому оборванная загрузка в кэш не попадает. После загрузки самые давно открытые +/// файлы удаляются, пока кэш не уложится в лимит. Без зависимостей: `dart:io`. +class StoriesMediaCache { + StoriesMediaCache({ + this.maxBytes = 50 * 1024 * 1024, + Future Function()? directory, + }) : _directory = directory ?? _platformDirectory; + + /// Кэш процесса. Тесты подменяют его. + static StoriesMediaCache instance = StoriesMediaCache(); + + final int maxBytes; + final Future Function() _directory; + final Map> _downloads = >{}; + + /// Когда файл открывали в этом процессе. Время изменения файла — отметка для + /// следующих запусков, но система пишет его с точностью до секунды. + final Map _opened = {}; + Future? _root; + + static const String folder = 'personalization_stories'; + + static Future _platformDirectory() async { + String base; + try { + base = await pigeon.PersonalizationHostApi().getCacheDirectory(); + } catch (_) { + base = Directory.systemTemp.path; + } + return Directory('$base/$folder').create(recursive: true); + } + + /// Видео можно положить в кэш файлом: HLS (`.m3u8`) — набор кусков, его плеер + /// грузит сам. + static bool cacheable(String url) { + final path = Uri.tryParse(url)?.path.toLowerCase() ?? ''; + return url.isNotEmpty && !path.endsWith('.m3u8'); + } + + /// Файл [url] из кэша или загруженный сейчас; `null` — не вышло (тогда плеер берёт + /// адрес из сети). + Future fetch(String url) { + if (!cacheable(url)) return Future.value(); + // Блок, а не стрелка: `remove` вернул бы саму загрузку, и whenComplete ждал бы её + // же — вечно. + return _downloads[url] ??= _fetch(url).whenComplete(() { + _downloads.remove(url); + }); + } + + /// Загрузить [url] заранее — для следующего слайда. + void preload(String url) => unawaited(fetch(url)); + + Future _fetch(String url) async { + try { + final root = await (_root ??= _directory()); + final file = File('${root.path}/${_name(url)}'); + if (await file.exists()) { + // Отметка для LRU: открытый файл — свежий. + final now = DateTime.now(); + _opened[file.path] = now; + await file.setLastModified(now); + return file; + } + final part = File('${file.path}.part'); + final client = HttpClient(); + try { + final request = await client.getUrl(Uri.parse(url)); + final response = await request.close(); + if (response.statusCode != HttpStatus.ok || + response.contentLength > maxBytes) { + await response.drain(); + return null; + } + await response.pipe(part.openWrite()); + } finally { + client.close(); + } + await part.rename(file.path); + _opened[file.path] = DateTime.now(); + await _trim(root, keep: file.path); + return file; + } catch (error) { + debugPrint('PersonalizationStories: cannot cache $url — $error'); + return null; + } + } + + /// Удаляет самые давно открытые файлы, пока кэш больше лимита; [keep] не трогается. + Future _trim(Directory root, {required String keep}) async { + final files = <(File, FileStat)>[]; + await for (final entity in root.list()) { + if (entity is File && !entity.path.endsWith('.part')) { + files.add((entity, await entity.stat())); + } + } + var total = files.fold(0, (sum, item) => sum + item.$2.size); + DateTime opened((File, FileStat) item) => + _opened[item.$1.path] ?? item.$2.modified; + files.sort((a, b) => opened(a).compareTo(opened(b))); + for (final (file, stat) in files) { + if (total <= maxBytes) break; + if (file.path == keep) continue; + try { + await file.delete(); + _opened.remove(file.path); + total -= stat.size; + } catch (_) {} + } + } + + /// Имя файла: хэш адреса (FNV-1a, 64 бита) и расширение из пути — по нему AVPlayer + /// узнаёт формат локального файла. + static String _name(String url) { + var hash = 0xcbf29ce484222325; + for (final byte in utf8.encode(url)) { + hash ^= byte; + hash = (hash * 0x100000001b3) & 0xFFFFFFFFFFFFFFFF; + } + final path = Uri.tryParse(url)?.path ?? ''; + final dot = path.lastIndexOf('.'); + final extension = dot >= 0 && path.length - dot <= 5 + ? path.substring(dot).toLowerCase() + : '.mp4'; + return '${hash.toUnsigned(64).toRadixString(16)}$extension'; + } +} diff --git a/test/ui/stories_media_cache_test.dart b/test/ui/stories_media_cache_test.dart new file mode 100644 index 0000000..b1a6564 --- /dev/null +++ b/test/ui/stories_media_cache_test.dart @@ -0,0 +1,65 @@ +import 'dart:io'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_media_cache.dart'; + +void main() { + late HttpServer server; + late Directory root; + final requests = []; + + setUp(() async { + requests.clear(); + root = await Directory.systemTemp.createTemp('stories_cache_test'); + server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0); + server.listen((request) { + requests.add(request.uri.path); + final size = int.parse(request.uri.queryParameters['size'] ?? '10'); + request.response + ..add(List.filled(size, 7)) + ..close(); + }); + }); + + tearDown(() async { + await server.close(force: true); + await root.delete(recursive: true); + }); + + String url(String name, {int size = 10}) => + 'http://127.0.0.1:${server.port}/$name.mp4?size=$size'; + + test('each file downloads once, also when asked twice at once', () async { + final cache = StoriesMediaCache(directory: () async => root); + final results = await Future.wait([ + cache.fetch(url('a')), + cache.fetch(url('a')), + ]); + expect(results[0]!.path, results[1]!.path); + expect(results[0]!.path, endsWith('.mp4')); + expect(await results[0]!.length(), 10); + + await cache.fetch(url('a')); + expect(requests, ['/a.mp4'], reason: 'the second fetch reads the file'); + }); + + test('over the limit, the least recently opened files go', () async { + final cache = StoriesMediaCache(maxBytes: 250, directory: () async => root); + final a = await cache.fetch(url('a', size: 100)); + await Future.delayed(const Duration(milliseconds: 20)); + final b = await cache.fetch(url('b', size: 100)); + await Future.delayed(const Duration(milliseconds: 20)); + await cache.fetch(url('a', size: 100)); // a is fresh again + await Future.delayed(const Duration(milliseconds: 20)); + await cache.fetch(url('c', size: 100)); + + expect(await a!.exists(), isTrue); + expect(await b!.exists(), isFalse); + }); + + test('HLS is left to the player', () async { + final cache = StoriesMediaCache(directory: () async => root); + expect(await cache.fetch('https://cdn.example/clip.m3u8'), isNull); + expect(StoriesMediaCache.cacheable('https://cdn.example/clip.mp4'), isTrue); + }); +} From fd1bdaeeead90b08288516f64a9e969ce6ab715b Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:25:12 +0400 Subject: [PATCH 55/79] feat(ui): stories seen store and sound state StoriesSeenStore reads a shop's seen slides from the plugin once per process and writes every new one through, so all bars and viewers of a shop share one state that survives restarts; without the platform store it stays in memory. StoriesSound keeps the mute choice for the whole process (muted on the first open), unmutes on the hardware volume-up key (the key event on Android, the iOS session's volume through the bridge) and runs the iOS audio session around video. --- lib/src/ui/widgets/stories_seen_store.dart | 69 ++++++++++++++++ lib/src/ui/widgets/stories_sound.dart | 89 +++++++++++++++++++++ test/ui/stories_runtime_test.dart | 91 ++++++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 lib/src/ui/widgets/stories_seen_store.dart create mode 100644 lib/src/ui/widgets/stories_sound.dart create mode 100644 test/ui/stories_runtime_test.dart diff --git a/lib/src/ui/widgets/stories_seen_store.dart b/lib/src/ui/widgets/stories_seen_store.dart new file mode 100644 index 0000000..dab7131 --- /dev/null +++ b/lib/src/ui/widgets/stories_seen_store.dart @@ -0,0 +1,69 @@ +import 'package:flutter/foundation.dart'; + +import '../../multi_instance/rees46.dart'; +import '../../personalization_sdk.dart'; + +/// Просмотренные слайды сторис по магазину: id слайдов по id сторис. +/// +/// Хранит их плагин на устройстве (SharedPreferences / UserDefaults) — между запусками +/// приложения. Здесь — копия на процесс: магазин читается с устройства один раз, дальше +/// все просмотры и ленты одного магазина видят одно состояние, а каждая отметка сразу +/// уходит и в хранилище. Хранилище недоступно (тесты, ошибка канала) — состояние живёт +/// только в памяти. +class StoriesSeenStore { + /// Хранилище процесса. Тесты подменяют его. + static StoriesSeenStore instance = StoriesSeenStore(); + + final Map>> _byShop = + >>{}; + final Map> _loads = >{}; + + /// Ключ магазина: его shopId; у хэндла без него — единственный живой магазин. + static String shopOf(PersonalizationSdk sdk) { + final own = sdk.shopId; + if (own != null && own.isNotEmpty) return own; + final live = REES46.liveShopIds; + return live.length == 1 ? live.single : ''; + } + + /// Просмотренное магазина [sdk] — после первого чтения с устройства. + Future>> load(PersonalizationSdk sdk) async { + final shop = shopOf(sdk); + await (_loads[shop] ??= _read(sdk, shop)); + return seen(sdk); + } + + Future _read(PersonalizationSdk sdk, String shop) async { + Map> stored = const >{}; + try { + stored = await sdk.getStoriesSeen(shop); + } catch (error) { + debugPrint('PersonalizationStories: seen slides unavailable — $error'); + } + final current = _byShop.putIfAbsent(shop, () => >{}); + for (final entry in stored.entries) { + (current[entry.key] ??= {}).addAll(entry.value); + } + } + + /// Что известно сейчас, без чтения с устройства. + Map> seen(PersonalizationSdk sdk) => + >{ + for (final entry + in (_byShop[shopOf(sdk)] ?? const >{}).entries) + entry.key: Set.unmodifiable(entry.value), + }; + + /// Слайд [slideId] сторис [storyId] просмотрен. + void mark(PersonalizationSdk sdk, String storyId, String slideId) { + final shop = shopOf(sdk); + final slides = (_byShop.putIfAbsent( + shop, + () => >{}, + )[storyId] ??= {}); + if (!slides.add(slideId)) return; + sdk.setStorySlideSeen(shop, storyId, slideId).catchError((Object error) { + debugPrint('PersonalizationStories: cannot store a seen slide — $error'); + }); + } +} diff --git a/lib/src/ui/widgets/stories_sound.dart b/lib/src/ui/widgets/stories_sound.dart new file mode 100644 index 0000000..d8367bb --- /dev/null +++ b/lib/src/ui/widgets/stories_sound.dart @@ -0,0 +1,89 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; + +import '../../pigeon/personalization_api.g.dart' as pigeon; + +/// Звук сторис на весь процесс. +/// +/// - При первом открытии звук выключен; выбор пользователя помнится до конца процесса и +/// переходит на следующие открытия ([muted]). +/// - Кнопка громкости «вверх» включает звук: на Android клавиша сама доходит до +/// Flutter ([HardwareKeyboard]), на iOS плагин следит за громкостью аудиосессии и +/// сообщает о росте через `PersonalizationStoriesFlutterApi`. +/// - iOS: пока идёт видео, сессия `ambient` без звука (музыка пользователя не +/// прерывается) и `playback` со звуком; при закрытии просмотра возвращается сессия +/// приложения. Android: видео играет с `mixWithOthers` и фокус не забирает. +class StoriesSound implements pigeon.PersonalizationStoriesFlutterApi { + StoriesSound._(); + + static final StoriesSound instance = StoriesSound._(); + + /// Хост-API плагина. Тесты подменяют его. + @visibleForTesting + static pigeon.PersonalizationHostApi api = pigeon.PersonalizationHostApi(); + + /// Звук выключен. Общий для всех просмотров процесса. + final ValueNotifier muted = ValueNotifier(true); + + int _viewers = 0; + bool _session = false; + + /// Просмотр открылся: слушать кнопку громкости. + void attach() { + if (_viewers++ > 0) return; + HardwareKeyboard.instance.addHandler(_onKey); + pigeon.PersonalizationStoriesFlutterApi.setUp(this); + muted.addListener(_apply); + } + + /// Просмотр закрылся. Последний — вернуть сессию приложения. + void detach() { + if (_viewers == 0 || --_viewers > 0) return; + HardwareKeyboard.instance.removeHandler(_onKey); + pigeon.PersonalizationStoriesFlutterApi.setUp(null); + muted.removeListener(_apply); + if (_session) { + _session = false; + _call(api.endStoriesAudio); + } + } + + /// Перед созданием первого плеера: запомнить сессию приложения (iOS). + Future beforeVideo() async { + if (_session) return; + _session = true; + await _call(api.beginStoriesAudio); + } + + /// После готовности плеера: сессия по [muted] (iOS). Плеер при создании сам трогает + /// категорию, поэтому — после каждого. + Future afterVideo() => _session + ? _call(() => api.updateStoriesAudio(muted.value)) + : Future.value(); + + void toggle() => muted.value = !muted.value; + + @override + void onStoriesVolumeUp() => muted.value = false; + + bool _onKey(KeyEvent event) { + if (event is KeyDownEvent && + event.logicalKey == LogicalKeyboardKey.audioVolumeUp) { + muted.value = false; + } + // Клавиша идёт дальше: громкость системы меняется как обычно. + return false; + } + + void _apply() { + if (_session) _call(() => api.updateStoriesAudio(muted.value)); + } + + static Future _call(Future Function() body) async { + try { + await body(); + } catch (error) { + debugPrint('PersonalizationStories: audio session — $error'); + } + } +} diff --git a/test/ui/stories_runtime_test.dart b/test/ui/stories_runtime_test.dart new file mode 100644 index 0000000..6de8c99 --- /dev/null +++ b/test/ui/stories_runtime_test.dart @@ -0,0 +1,91 @@ +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/rees46_sdk.dart'; +import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; +import 'package:rees46_sdk/src/ui/widgets/stories_seen_store.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_sound.dart'; + +class _FakeHostApi extends pigeon.PersonalizationHostApi { + final Map> stored = >{ + '40': ['36'], + }; + final List writes = []; + final List audio = []; + int reads = 0; + + @override + Future>> getStoriesSeen(String shop) async { + reads++; + return shop == 'shop-a' ? stored : >{}; + } + + @override + Future setStorySlideSeen( + String shop, + String storyId, + String slideId, + ) async => writes.add('$shop/$storyId/$slideId'); + + @override + Future beginStoriesAudio() async => audio.add('begin'); + + @override + Future updateStoriesAudio(bool muted) async => + audio.add(muted ? 'muted' : 'sound'); + + @override + Future endStoriesAudio() async => audio.add('end'); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + test('seen slides load once per shop and every mark is stored', () async { + final api = _FakeHostApi(); + final store = StoriesSeenStore(); + final sdk = PersonalizationSdk(api: api, shopId: 'shop-a'); + + expect(await store.load(sdk), >{ + '40': {'36'}, + }); + store.mark(sdk, '40', '37'); + store.mark(sdk, '40', '37'); + expect(await store.load(sdk), >{ + '40': {'36', '37'}, + }); + expect(api.reads, 1); + expect(api.writes, ['shop-a/40/37']); + }); + + test('without the platform store, seen slides live in memory', () async { + final store = StoriesSeenStore(); + // The real host API: no platform in tests, the channel fails. + final sdk = PersonalizationSdk(shopId: 'shop-x'); + expect(await store.load(sdk), isEmpty); + store.mark(sdk, '1', '2'); + expect(store.seen(sdk), >{ + '1': {'2'}, + }); + }); + + test('sound: muted first, volume up unmutes, the session follows', () async { + final api = _FakeHostApi(); + StoriesSound.api = api; + final sound = StoriesSound.instance; + addTearDown(() => sound.muted.value = true); + expect(sound.muted.value, isTrue); + + sound.attach(); + await sound.beforeVideo(); + await sound.afterVideo(); + await simulateKeyDownEvent(LogicalKeyboardKey.audioVolumeUp); + expect(sound.muted.value, isFalse); + await Future.delayed(Duration.zero); + + sound.toggle(); + sound.detach(); + await Future.delayed(Duration.zero); + expect(api.audio, ['begin', 'muted', 'sound', 'muted', 'end']); + expect(sound.muted.value, isTrue, reason: 'the choice outlives a viewer'); + }); +} From 75ee846b5eb743ab4fe6fcba4e10159b12b41911 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:35:20 +0400 Subject: [PATCH 56/79] feat(ui): stories v2 viewer and widget on the shared rules Viewer - Runs on StoriesPlayback: a story is entered, tracked and marked seen only when its page settles, never on a half-swipe peek; it opens at the first unseen slide, else at start_position, from the start once viewed. - Tap thirds (back / nothing / next, mirrored in RTL), hold from 200 ms, restart on the very first slide, close after the very last. - Pauses on hold, drags, the products sheet, the app in the background, a screen covering it and the host; the slide clock adds real frame deltas only while running, so it ignores the animation scale and never skips slides on return. Vertical drags move a notifier, not the pages, and the player is paused only on transitions. - The sheet is driven by the viewer: a tap outside or system back closes it, it blocks navigation and resets on every slide change. - Media is fitted whole on the slide's background_color (black without it); slides without media sit on Background/Card. The scrim is 50% on bare media only. A media slide is one with a background, blank text blocks are skipped, end/right align to the end. - The clock starts once media is ready; failure or 10 s without it shows Retry, a video also retries itself after 15 s. Videos last their real length, pause on buffering, play from the disk cache with mixWithOthers, and the next slide is preloaded. - Product slides draw the card, every slide button, used products and the sound toggle, without text blocks. Prices follow the promo and fractional discount rules; the promo caption comes from the admin. - Buttons, products and the carousel close the viewer first, then call onLinkClick / onProductClick. Dynamic slide ids are not tracked. Widget - PersonalizationStoriesController (open, openStory, pause, resume, reload) and PersonalizationStories.show for a block without the bar. - Seen slides come from the per-shop store: the ring lights segments by index, and a viewed pinned story keeps a plain Semantic/Warning ring. - A missing code, an unresolved shop, a failed or 15 s slow load hide the block and reach onError. - Texts renamed to promoCaption, productButtonText, showProductsText, plus retryText, closeLabel, soundOnLabel, soundOffLabel; cover labels take up to two lines. --- example/lib/ui_kit_pane.dart | 8 +- .../personalization_stories_bar.dart | 4 +- .../personalization_story_cover.dart | 74 +- .../personalization_story_preview.dart | 11 +- .../personalization_story_price.dart | 6 +- .../personalization_story_sound_button.dart | 13 +- .../personalization_story_text_block.dart | 14 +- .../personalization_story_used_products.dart | 21 +- .../ui/widgets/personalization_stories.dart | 400 ++++-- .../widgets/personalization_story_viewer.dart | 1224 +++++++---------- lib/src/ui/widgets/stories_slide_view.dart | 506 +++++++ lib/src/ui/widgets/stories_support.dart | 159 ++- test/ui/personalization_stories_test.dart | 494 ++++--- ...personalization_story_components_test.dart | 94 +- test/ui/stories_mapping_test.dart | 176 +++ 15 files changed, 2062 insertions(+), 1142 deletions(-) create mode 100644 lib/src/ui/widgets/stories_slide_view.dart create mode 100644 test/ui/stories_mapping_test.dart diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 8bd37d5..27f5194 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -744,20 +744,20 @@ List<_Exhibit> _storyExhibits(String shopId) => [ PersonalizationStoryCover( image: _image('sneakers'), segments: 5, - seenSegments: 2, + seenSegments: const {0, 1}, ), PersonalizationStoryCover( image: _image('sneakers'), pinned: true, segments: 5, - seenSegments: 2, + seenSegments: const {0, 1}, iconBuilder: _icon, ), PersonalizationStoryCover( image: _image('sneakers'), state: PersonalizationStoryCoverState.viewed, segments: 5, - seenSegments: 5, + seenSegments: const {0, 1, 2, 3, 4}, ), ], ); @@ -780,7 +780,7 @@ List<_Exhibit> _storyExhibits(String shopId) => [ label: 'Default', image: _image('headphones'), segments: 4, - seenSegments: 1, + seenSegments: const {0}, ), PersonalizationStoryItem( id: '3', diff --git a/lib/src/ui/components/personalization_stories_bar.dart b/lib/src/ui/components/personalization_stories_bar.dart index 46c210f..d2273bc 100644 --- a/lib/src/ui/components/personalization_stories_bar.dart +++ b/lib/src/ui/components/personalization_stories_bar.dart @@ -13,7 +13,7 @@ class PersonalizationStoryItem { this.pinned = false, this.viewed = false, this.segments = 0, - this.seenSegments = 0, + this.seenSegments = const {}, }); final String id; @@ -28,7 +28,7 @@ class PersonalizationStoryItem { final int segments; /// См. [PersonalizationStoryCover.seenSegments]. - final int seenSegments; + final Set seenSegments; } /// Лента сторис: превью в горизонтальной прокрутке. diff --git a/lib/src/ui/components/personalization_story_cover.dart b/lib/src/ui/components/personalization_story_cover.dart index bcf4184..3f211ff 100644 --- a/lib/src/ui/components/personalization_story_cover.dart +++ b/lib/src/ui/components/personalization_story_cover.dart @@ -2,6 +2,7 @@ import 'dart:math' as math; import 'package:flutter/widgets.dart'; +import '../personalization_colors.dart'; import '../personalization_theme.dart'; import 'personalization_favorites_badge.dart'; import 'personalization_story_shimmer.dart'; @@ -21,16 +22,17 @@ enum PersonalizationStoryCoverState { unviewed, viewed, skeleton } /// /// Круг 88. Кольцо — обводка 4 внутрь; картинка — круг 76 с отступом 6, то есть между /// ними зазор 2. Цвет кольца: Button/Primary у непросмотренной, Semantic/Warning у -/// закреплённой — и после просмотра, Semantic/Neutral Subtle у просмотренной -/// незакреплённой. Закреплённой в правом нижнем -/// углу (x62, y62) — метка Favorites 24: звезда на Semantic/Warning. У заглушки кольцо и -/// картинка переливаются градиентом (см. [PersonalizationStoryShimmer]). +/// закреплённой — всегда, и после просмотра, Semantic/Neutral Subtle у просмотренной +/// незакреплённой. Закреплённой в правом нижнем углу (x62, y62) — метка Favorites 24: +/// звезда на Semantic/Warning, тоже всегда. У заглушки кольцо и картинка переливаются +/// градиентом (см. [PersonalizationStoryShimmer]). /// /// Сегменты: при [segments] > 1 кольцо делится на столько дуг с небольшими зазорами — -/// по дуге на слайд. Первые [seenSegments] — уже показанные слайды — красятся в -/// Button/Primary Disabled (Brand/Primary 65%), остальные в цвет состояния. У -/// просмотренной незакреплённой кольцо всегда сплошное, без дуг и зазоров, — так -/// состояние Viewed нарисовано в макете. +/// по дуге на слайд. Дуга i горит — Button/Primary Disabled (Brand/Primary 65%), — если +/// слайд i просмотрен (его номер есть в [seenSegments]), остальные в цвете состояния. +/// Просмотренная сторис рисуется сплошным кольцом без дуг и зазоров: незакреплённая — +/// Neutral Subtle, как состояние Viewed в макете, закреплённая — Warning. Правило +/// цветов — [ringColors]. class PersonalizationStoryCover extends StatelessWidget { const PersonalizationStoryCover({ super.key, @@ -38,7 +40,7 @@ class PersonalizationStoryCover extends StatelessWidget { this.state = PersonalizationStoryCoverState.unviewed, this.pinned = false, this.segments = 0, - this.seenSegments = 0, + this.seenSegments = const {}, this.iconBuilder, }); @@ -46,14 +48,14 @@ class PersonalizationStoryCover extends StatelessWidget { final ImageProvider? image; final PersonalizationStoryCoverState state; - /// Закреплена магазином: кольцо Semantic/Warning (пока не просмотрена) и звезда. + /// Закреплена магазином: кольцо Semantic/Warning и звезда — и после просмотра. final bool pinned; /// На сколько дуг поделить кольцо; 0 и 1 — сплошное. final int segments; - /// Сколько первых дуг уже показано. - final int seenSegments; + /// Номера просмотренных слайдов — горящие дуги. + final Set seenSegments; /// Как нарисовать звезду метки закреплённой: пакет не рисует SVG сам. final Widget Function( @@ -66,6 +68,30 @@ class PersonalizationStoryCover extends StatelessWidget { static const double size = 88; static const double _ring = 4; + + /// Цвета дуг кольца по порядку; одна — кольцо сплошное. + /// + /// - просмотренная незакреплённая — одно Neutral Subtle; + /// - просмотренная закреплённая — одно Warning, без горящих дуг; + /// - иначе цвет состояния (Warning у закреплённой, Button/Primary у остальных), а при + /// [segments] > 1 дуга i — Button/Primary Disabled, если слайд i в [seen]. + static List ringColors( + PersonalizationColors colors, { + required PersonalizationStoryCoverState state, + bool pinned = false, + int segments = 0, + Set seen = const {}, + }) { + final viewed = state == PersonalizationStoryCoverState.viewed; + if (viewed && !pinned) return [colors.neutralSubtle]; + final stateColor = pinned ? colors.semanticWarning : colors.buttonPrimary; + if (viewed || segments <= 1) return [stateColor]; + return [ + for (int i = 0; i < segments; i++) + seen.contains(i) ? colors.buttonPrimaryDisabled : stateColor, + ]; + } + static const double _imageInset = 6; static const double _badgeOffset = 62; @@ -97,21 +123,13 @@ class PersonalizationStoryCover extends StatelessWidget { ); } - // Просмотренная незакреплённая — сплошное кольцо Viewed; закреплённая остаётся - // в Warning и после просмотра. - final viewed = state == PersonalizationStoryCoverState.viewed && !pinned; - final stateColor = viewed - ? colors.neutralSubtle - : pinned - ? colors.semanticWarning - : colors.buttonPrimary; - final count = viewed ? 1 : math.max(1, segments); - final ringColors = [ - for (int i = 0; i < count; i++) - count > 1 && i < seenSegments - ? colors.buttonPrimaryDisabled - : stateColor, - ]; + final ring = ringColors( + colors, + state: state, + pinned: pinned, + segments: segments, + seen: seenSegments, + ); return SizedBox.square( dimension: size, @@ -120,7 +138,7 @@ class PersonalizationStoryCover extends StatelessWidget { children: [ Positioned.fill( child: CustomPaint( - painter: _RingPainter(colors: ringColors, segments: count), + painter: _RingPainter(colors: ring, segments: ring.length), ), ), Positioned.fill( diff --git a/lib/src/ui/components/personalization_story_preview.dart b/lib/src/ui/components/personalization_story_preview.dart index 506b028..a41a479 100644 --- a/lib/src/ui/components/personalization_story_preview.dart +++ b/lib/src/ui/components/personalization_story_preview.dart @@ -10,8 +10,9 @@ import 'personalization_story_shimmer.dart'; /// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), компонент Story/Preview. /// /// Колонка шириной 88 с шагом 8: [PersonalizationStoryCover] и подпись Regular 12/16 -/// (ступень XS) цветом Text/Primary, по центру, в одну строку с многоточием. У заглушки -/// вместо подписи — переливающаяся плашка 64×8 со скруглением 5 на месте строки. +/// (ступень XS) цветом Text/Primary, по центру, шириной с обложку — до двух строк, хвост +/// с многоточием. У заглушки вместо подписи — переливающаяся плашка 64×8 со скруглением +/// 5 на месте строки. class PersonalizationStoryPreview extends StatelessWidget { const PersonalizationStoryPreview({ super.key, @@ -20,7 +21,7 @@ class PersonalizationStoryPreview extends StatelessWidget { this.state = PersonalizationStoryCoverState.unviewed, this.pinned = false, this.segments = 0, - this.seenSegments = 0, + this.seenSegments = const {}, this.onTap, this.iconBuilder, }); @@ -34,7 +35,7 @@ class PersonalizationStoryPreview extends StatelessWidget { final int segments; /// См. [PersonalizationStoryCover.seenSegments]. - final int seenSegments; + final Set seenSegments; /// Нажатие на превью — открыть сторис. У заглушки не вызывается. final VoidCallback? onTap; @@ -89,7 +90,7 @@ class PersonalizationStoryPreview extends StatelessWidget { else Text( label, - maxLines: 1, + maxLines: 2, overflow: TextOverflow.ellipsis, textAlign: TextAlign.center, style: style.copyWith( diff --git a/lib/src/ui/components/personalization_story_price.dart b/lib/src/ui/components/personalization_story_price.dart index 28be474..6c0e741 100644 --- a/lib/src/ui/components/personalization_story_price.dart +++ b/lib/src/ui/components/personalization_story_price.dart @@ -49,7 +49,7 @@ class PersonalizationStoryPrice extends StatefulWidget { this.oldPrice, this.discount, this.promoCode, - this.promoCodeCaption = 'Promo code', + this.promoCaption = 'Promo code', this.copiedText = 'Copied', this.copiedToastPosition = PersonalizationToastPosition.top, this.onPromoCopied, @@ -71,7 +71,7 @@ class PersonalizationStoryPrice extends StatefulWidget { final String? promoCode; /// Подпись над кодом. - final String promoCodeCaption; + final String promoCaption; /// Текст тоста после копирования. final String copiedText; @@ -327,7 +327,7 @@ class _PersonalizationStoryPriceState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - widget.promoCodeCaption, + widget.promoCaption, maxLines: 1, overflow: TextOverflow.ellipsis, textAlign: TextAlign.center, diff --git a/lib/src/ui/components/personalization_story_sound_button.dart b/lib/src/ui/components/personalization_story_sound_button.dart index 4340b14..c8af45e 100644 --- a/lib/src/ui/components/personalization_story_sound_button.dart +++ b/lib/src/ui/components/personalization_story_sound_button.dart @@ -12,8 +12,8 @@ class PersonalizationStorySoundButton extends StatelessWidget { super.key, required this.muted, this.onPressed, - this.mutedLabel = 'Unmute', - this.unmutedLabel = 'Mute', + this.soundOnLabel = 'Sound on', + this.soundOffLabel = 'Sound off', this.iconBuilder, }); @@ -21,9 +21,10 @@ class PersonalizationStorySoundButton extends StatelessWidget { final bool muted; final VoidCallback? onPressed; - /// Подписи для скринридера — действие, которое сделает нажатие. - final String mutedLabel; - final String unmutedLabel; + /// Подписи для скринридера — действие, которое сделает нажатие: без звука — + /// [soundOnLabel], со звуком — [soundOffLabel]. + final String soundOnLabel; + final String soundOffLabel; final Widget Function( BuildContext context, @@ -40,7 +41,7 @@ class PersonalizationStorySoundButton extends StatelessWidget { final colors = PersonalizationTheme.of(context).colors; return Semantics( button: true, - label: muted ? mutedLabel : unmutedLabel, + label: muted ? soundOnLabel : soundOffLabel, child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: onPressed, diff --git a/lib/src/ui/components/personalization_story_text_block.dart b/lib/src/ui/components/personalization_story_text_block.dart index 2ba268b..521cbb4 100644 --- a/lib/src/ui/components/personalization_story_text_block.dart +++ b/lib/src/ui/components/personalization_story_text_block.dart @@ -24,8 +24,9 @@ enum PersonalizationStoryTextSize { /// сервера со своей прозрачностью. Прозрачный — без полей и фона: текст прямо на картинке слайда. /// /// Кегль, интерлиньяж, цвет, выключка, жирность и курсив приходят с элементом; для текста -/// хоста есть заготовки [size]. Цвет по умолчанию — Text/Light Primary на сплошном фоне -/// и Text/Primary на прозрачном. +/// хоста есть заготовки [size]. Кегль задан, а интерлиньяж нет — берётся заготовка для +/// этого кегля ([presetLineHeight]), а не собственный шрифта. Цвет по умолчанию — +/// Text/Light Primary на сплошном фоне и Text/Primary на прозрачном. class PersonalizationStoryTextBlock extends StatelessWidget { const PersonalizationStoryTextBlock({ super.key, @@ -67,6 +68,10 @@ class PersonalizationStoryTextBlock extends StatelessWidget { /// Блок со сплошным фоном: у фона есть непрозрачность. bool get solid => background != null && background!.a > 0; + /// Интерлиньяж заготовки для кегля [fontSize], в долях кегля: больше 30 — Large + /// (48/48), иначе Medium и Small (36/30, 24/20). + static double presetLineHeight(double fontSize) => fontSize > 30 ? 1 : 1.2; + @override Widget build(BuildContext context) { final theme = PersonalizationTheme.of(context); @@ -85,7 +90,10 @@ class PersonalizationStoryTextBlock extends StatelessWidget { style: TextStyle( fontSize: effectiveSize, height: - lineHeight ?? (fontSize == null ? presetHeight / presetSize : null), + lineHeight ?? + (fontSize == null + ? presetHeight / presetSize + : presetLineHeight(effectiveSize)), fontWeight: weight, fontStyle: italic ? FontStyle.italic : FontStyle.normal, letterSpacing: 0, diff --git a/lib/src/ui/components/personalization_story_used_products.dart b/lib/src/ui/components/personalization_story_used_products.dart index a521cc9..4a861e3 100644 --- a/lib/src/ui/components/personalization_story_used_products.dart +++ b/lib/src/ui/components/personalization_story_used_products.dart @@ -17,8 +17,10 @@ import 'personalization_products_list.dart'; /// строка с подписью [hideText] и иконкой angle-down. В начале строки — необязательный /// [leading]: во вьюере это кнопка звука видео. /// -/// Раскрытие ведёт сам виджет; [onExpandedChanged] сообщает о нём — вьюер на это время -/// ставит слайд на паузу. +/// Раскрытие ведёт сам виджет, начиная с [initiallyExpanded], либо хост — через +/// [expanded]; [onExpandedChanged] сообщает о нажатии на переключатель. Вьюер ведёт +/// раскрытие сам: шторка ставит слайд на паузу, закрывается тапом мимо неё и сбрасывается +/// при смене слайда. class PersonalizationStoryUsedProducts extends StatefulWidget { const PersonalizationStoryUsedProducts({ super.key, @@ -26,6 +28,7 @@ class PersonalizationStoryUsedProducts extends StatefulWidget { this.showText = 'Used products', this.hideText = 'Hide products', this.initiallyExpanded = false, + this.expanded, this.onExpandedChanged, this.onProductTap, this.leading, @@ -40,6 +43,11 @@ class PersonalizationStoryUsedProducts extends StatefulWidget { /// Подпись развёрнутого переключателя. final String hideText; final bool initiallyExpanded; + + /// Раскрытие от хоста; `null` — виджет ведёт его сам. + final bool? expanded; + + /// Переключатель нажали: новое раскрытие. final ValueChanged? onExpandedChanged; /// Нажатие на карточку — открыть товар. @@ -63,11 +71,14 @@ class PersonalizationStoryUsedProducts extends StatefulWidget { class _PersonalizationStoryUsedProductsState extends State { - late bool _expanded = widget.initiallyExpanded; + late bool _own = widget.initiallyExpanded; + + bool get _expanded => widget.expanded ?? _own; void _toggle() { - setState(() => _expanded = !_expanded); - widget.onExpandedChanged?.call(_expanded); + final next = !_expanded; + if (widget.expanded == null) setState(() => _own = next); + widget.onExpandedChanged?.call(next); } @override diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 1b84d32..25989a2 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -1,5 +1,6 @@ -import 'dart:math' as math; +import 'dart:async'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import '../../multi_instance/rees46.dart'; @@ -8,40 +9,79 @@ import '../../stories/stories_response.dart'; import '../components/personalization_stories_bar.dart'; import '../components/personalization_toast.dart'; import 'personalization_story_viewer.dart'; +import 'stories_playback.dart'; +import 'stories_seen_store.dart'; import 'stories_support.dart'; +/// Программное управление блоком сторис: открыть сторис, пауза, продолжение, перезагрузка. +/// +/// Передаётся в [PersonalizationStories.controller] или в [PersonalizationStories.show]. +/// [pause] и [resume] действуют на открытый просмотр; при закрытии просмотра пауза +/// снимается. +class PersonalizationStoriesController { + _PersonalizationStoriesState? _bar; + final ValueNotifier _paused = ValueNotifier(false); + + /// Открыть сторис номер [index] ленты — со стартового слайда по общим правилам. Future + /// завершается, когда просмотр закроют. Блок ещё не загружен — ничего. + Future open(int index) => _bar?._open(index) ?? Future.value(); + + /// Открыть сторис с id [storyId]; нет такой — ничего. + Future openStory(String storyId) { + final bar = _bar; + if (bar == null) return Future.value(); + final index = bar._stories.indexWhere((story) => story.id == storyId); + return index < 0 ? Future.value() : bar._open(index); + } + + /// Остановить открытый просмотр. + void pause() => _paused.value = true; + + /// Продолжить после [pause]. + void resume() => _paused.value = false; + + /// Заново загрузить блок. + Future reload() => _bar?._load() ?? Future.value(); +} + /// Блок сторис с данными SDK: лента превью, по нажатию — полноэкранный просмотр. /// /// Паттерн «Блок сторис на странице» из Figma (страница Stories, 1:32), источник — /// `stories/{code}`. Визуальный слой — [PersonalizationStoriesBar] и -/// [PersonalizationStoryViewer]. Прежние сторис SDK не затрагивает. +/// [PersonalizationStoryViewer]. Без ленты сторис показывает [show]. /// /// Инстанс SDK: [sdk] явно, иначе [shopId] выбирает магазин при нескольких -/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). Если -/// магазин не зарегистрирован, виджет остаётся пустым и пишет об этом в лог. +/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). +/// +/// Пока блок грузится, в ленте заглушки. Пустой блок — виджет исчезает. Ошибка загрузки, +/// пустой [code], магазин не найден или неоднозначен, загрузка дольше 15 с — виджет +/// исчезает и зовёт [onError]; вечных заглушек нет. Сторис без слайдов выпадают. /// -/// Пока блок грузится, в ленте заглушки; пустой блок или ошибка — виджет исчезает (ошибка -/// уходит в [onError]). Кольцо обложки поделено по слайдам; показанные слайды и -/// просмотренные сторис виджет помнит, пока жив: сторис считается просмотренной, когда -/// показаны все её слайды, а следующее открытие продолжает с первого непоказанного. -/// Сервер со своей стороны помнит просмотры по трекингу — при новой загрузке они придут в -/// `viewed` и `start_position`. +/// Просмотренные слайды хранятся на устройстве по магазину и переживают перезапуск: +/// сторис просмотрена, когда так говорит сервер или просмотрены все её слайды; дуги +/// кольца горят по просмотренным слайдам; сторис открывается с первого +/// непросмотренного. Тексты и колбэки уходят в просмотр как есть. class PersonalizationStories extends StatefulWidget { const PersonalizationStories({ super.key, required this.code, this.sdk, this.shopId, + this.controller, this.onLinkClick, this.onProductClick, this.onPromoCopied, this.onError, this.promoCopiedText = 'Copied', this.promoToastPosition = PersonalizationToastPosition.top, - this.promoCodeCaption = 'Promo code', - this.moreInfoText = 'More info', - this.usedProductsText = 'Used products', + this.promoCaption = 'Promo code', + this.productButtonText = 'More info', + this.showProductsText = 'Used products', this.hideProductsText = 'Hide products', + this.retryText = 'Retry', + this.closeLabel = 'Close', + this.soundOnLabel = 'Sound on', + this.soundOffLabel = 'Sound off', this.padding = const EdgeInsets.all(16), this.imageProvider, this.iconBuilder, @@ -56,6 +96,9 @@ class PersonalizationStories extends StatefulWidget { /// Магазин при нескольких зарегистрированных; без него — единственный. final String? shopId; + /// Программное управление; см. [PersonalizationStoriesController]. + final PersonalizationStoriesController? controller; + /// См. [PersonalizationStoryViewer.onLinkClick]. final ValueChanged? onLinkClick; @@ -64,14 +107,17 @@ class PersonalizationStories extends StatefulWidget { final ValueChanged? onPromoCopied; final ValueChanged? onError; + /// Тексты просмотра — см. одноимённые у [PersonalizationStoryViewer]. final String promoCopiedText; - - /// См. [PersonalizationStoryViewer.promoToastPosition]. final PersonalizationToastPosition promoToastPosition; - final String promoCodeCaption; - final String moreInfoText; - final String usedProductsText; + final String promoCaption; + final String productButtonText; + final String showProductsText; final String hideProductsText; + final String retryText; + final String closeLabel; + final String soundOnLabel; + final String soundOffLabel; /// Поля ленты. final EdgeInsetsGeometry padding; @@ -87,143 +133,239 @@ class PersonalizationStories extends StatefulWidget { )? iconBuilder; + /// Сколько ждать блок, прежде чем сдаться и позвать [onError]. + static const Duration loadTimeout = Duration(seconds: 15); + + /// Показать сторис блока [code] без ленты: загрузить блок и открыть просмотр — со + /// сторис [startStoryId] (нет такой — с первой). Тексты, колбэки и [controller] — как + /// у виджета. Ошибка (пустой код, магазин не найден, загрузка не удалась или дольше + /// 15 с) уходит в [onError], просмотр не открывается. Future завершается, когда + /// просмотр закроют. + static Future show( + BuildContext context, { + required String code, + PersonalizationSdk? sdk, + String? shopId, + String? startStoryId, + PersonalizationStoriesController? controller, + ValueChanged? onLinkClick, + ValueChanged? onProductClick, + ValueChanged? onPromoCopied, + ValueChanged? onError, + String promoCopiedText = 'Copied', + PersonalizationToastPosition promoToastPosition = + PersonalizationToastPosition.top, + String promoCaption = 'Promo code', + String productButtonText = 'More info', + String showProductsText = 'Used products', + String hideProductsText = 'Hide products', + String retryText = 'Retry', + String closeLabel = 'Close', + String soundOnLabel = 'Sound on', + String soundOffLabel = 'Sound off', + PersonalizationStoryImageProvider? imageProvider, + Widget Function( + BuildContext context, + String asset, + double size, + Color color, + )? + iconBuilder, + }) async { + // Носитель текстов и колбэков для просмотра; в дерево не вставляется. + final config = PersonalizationStories( + code: code, + onLinkClick: onLinkClick, + onProductClick: onProductClick, + onPromoCopied: onPromoCopied, + promoCopiedText: promoCopiedText, + promoToastPosition: promoToastPosition, + promoCaption: promoCaption, + productButtonText: productButtonText, + showProductsText: showProductsText, + hideProductsText: hideProductsText, + retryText: retryText, + closeLabel: closeLabel, + soundOnLabel: soundOnLabel, + soundOffLabel: soundOffLabel, + imageProvider: imageProvider, + iconBuilder: iconBuilder, + ); + final PersonalizationSdk resolved; + final List stories; + try { + resolved = _resolve(sdk, shopId); + stories = await _fetch(resolved, code); + } catch (error) { + debugPrint('PersonalizationStories.show: $code — $error'); + onError?.call(error); + return; + } + if (stories.isEmpty || !context.mounted) return; + final index = stories.indexWhere((story) => story.id == startStoryId); + try { + await _present( + context, + config: config, + sdk: resolved, + stories: stories, + index: index < 0 ? 0 : index, + paused: controller?._paused, + ); + } finally { + controller?._paused.value = false; + } + } + @override State createState() => _PersonalizationStoriesState(); } +/// Открыть просмотр [stories] со сторис [index] поверх корневого навигатора; тексты и +/// колбэки — из [config]. Завершается, когда просмотр закроют. +Future _present( + BuildContext context, { + required PersonalizationStories config, + required PersonalizationSdk? sdk, + required List stories, + required int index, + ValueListenable? paused, + void Function(Story story, int slideIndex)? onSlideShown, +}) { + final viewer = PersonalizationStoryViewer( + stories: stories, + initialStory: index, + seen: sdk == null + ? const >{} + : StoriesSeenStore.instance.seen(sdk), + code: config.code, + sdk: sdk, + paused: paused, + onSlideShown: onSlideShown, + onLinkClick: config.onLinkClick, + onProductClick: config.onProductClick, + onPromoCopied: config.onPromoCopied, + productButtonText: config.productButtonText, + promoCaption: config.promoCaption, + promoCopiedText: config.promoCopiedText, + promoToastPosition: config.promoToastPosition, + showProductsText: config.showProductsText, + hideProductsText: config.hideProductsText, + retryText: config.retryText, + closeLabel: config.closeLabel, + soundOnLabel: config.soundOnLabel, + soundOffLabel: config.soundOffLabel, + imageProvider: config.imageProvider, + iconBuilder: config.iconBuilder, + ); + final navigator = Navigator.of(context, rootNavigator: true); + // Тема едет с просмотром: хост мог задать её поддереву, а не приложению. + return navigator.push( + PersonalizationStoryViewer.route( + InheritedTheme.capture(from: context, to: navigator.context).wrap(viewer), + ), + ); +} + +/// SDK по [sdk] или [shopId]; не вышло — ошибка резолва. +PersonalizationSdk _resolve(PersonalizationSdk? sdk, String? shopId) => + sdk ?? REES46.getInstance(shopId); + +/// Блок [code] со сторис, у которых есть слайды, и просмотренное магазина — не дольше +/// [PersonalizationStories.loadTimeout]. +Future> _fetch(PersonalizationSdk sdk, String code) async { + if (code.isEmpty) { + throw ArgumentError.value(code, 'code', 'must be non-empty'); + } + // Просмотренное читается вместе с блоком; ошибка блока приходит как есть. + final results = await Future.wait(>[ + sdk.getStories(code), + StoriesSeenStore.instance.load(sdk), + ]).timeout(PersonalizationStories.loadTimeout); + final block = results.first as StoriesBlock; + return block.stories.where((story) => story.slides.isNotEmpty).toList(); +} + class _PersonalizationStoriesState extends State { PersonalizationSdk? _sdk; List _stories = const []; bool _loading = true; int _seq = 0; - - /// Сколько первых слайдов показано, по id сторис. - final Map _seen = {}; - - /// Сторис, досмотренные в этом виджете. - final Set _viewed = {}; + bool _presenting = false; @override void initState() { super.initState(); - _resolve(); + widget.controller?._bar = this; + _load(); } @override void didUpdateWidget(PersonalizationStories oldWidget) { super.didUpdateWidget(oldWidget); + if (oldWidget.controller != widget.controller) { + if (oldWidget.controller?._bar == this) oldWidget.controller?._bar = null; + widget.controller?._bar = this; + } if (oldWidget.sdk != widget.sdk || oldWidget.shopId != widget.shopId || oldWidget.code != widget.code) { - _resolve(); + _load(); } } - void _resolve() { - PersonalizationSdk? sdk = widget.sdk; - if (sdk == null) { - try { - sdk = REES46.getInstance(widget.shopId); - } catch (error) { - debugPrint( - 'PersonalizationStories: cannot resolve an SDK for ' - 'shopId=${widget.shopId} — $error', - ); - // После кадра: резолв идёт и из initState, а хост в ответ может, например, - // показать снекбар — посреди сборки это запрещено. - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) widget.onError?.call(error); - }); - } - } - _sdk = sdk; - _load(); + @override + void dispose() { + if (widget.controller?._bar == this) widget.controller?._bar = null; + super.dispose(); } Future _load() async { final seq = ++_seq; - final sdk = _sdk; - _seen.clear(); - _viewed.clear(); - if (sdk == null || widget.code.isEmpty) { - setState(() { - _loading = false; - _stories = const []; - }); - return; - } setState(() => _loading = true); try { - final block = await sdk.getStories(widget.code); + final sdk = _sdk = _resolve(widget.sdk, widget.shopId); + final stories = await _fetch(sdk, widget.code); if (!mounted || seq != _seq) return; setState(() { _loading = false; - _stories = block.stories - .where((story) => story.slides.isNotEmpty) - .toList(); + _stories = stories; }); } catch (error) { if (!mounted || seq != _seq) return; + debugPrint('PersonalizationStories: ${widget.code} — $error'); setState(() { _loading = false; _stories = const []; }); - widget.onError?.call(error); + // После кадра: ошибка бывает и до первой сборки, а хост в ответ может, например, + // показать снекбар — посреди сборки это запрещено. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) widget.onError?.call(error); + }); } } - int _seenOf(Story story) => _seen[story.id] ?? story.startPosition; - - bool _isViewed(Story story) => story.viewed || _viewed.contains(story.id); - - /// С какого слайда открыть: первый непоказанный, у досмотренной — с начала. - int _startOf(Story story) { - final seen = _seenOf(story); - return seen >= story.slides.length ? 0 : math.max(0, seen); - } - - void _shown(Story story, int slideIndex) { - if (!mounted) return; - setState(() { - final seen = math.max(_seenOf(story), slideIndex + 1); - _seen[story.id] = seen; - if (seen >= story.slides.length) _viewed.add(story.id); - }); - } - - void _open(int index) { - final stories = _stories; - final viewer = PersonalizationStoryViewer( - stories: stories, - initialStory: index, - startSlides: { - for (final story in stories) story.id: _startOf(story), - }, - code: widget.code, - sdk: _sdk, - onSlideShown: _shown, - onLinkClick: widget.onLinkClick, - onProductClick: widget.onProductClick, - onPromoCopied: widget.onPromoCopied, - moreInfoText: widget.moreInfoText, - promoCodeCaption: widget.promoCodeCaption, - promoCopiedText: widget.promoCopiedText, - promoToastPosition: widget.promoToastPosition, - usedProductsText: widget.usedProductsText, - hideProductsText: widget.hideProductsText, - imageProvider: widget.imageProvider, - iconBuilder: widget.iconBuilder, - ); - final navigator = Navigator.of(context, rootNavigator: true); - // Тема ленты едет с просмотром: хост мог задать её поддереву, а не приложению. - navigator.push( - PersonalizationStoryViewer.route( - InheritedTheme.capture( - from: context, - to: navigator.context, - ).wrap(viewer), - ), - ); + Future _open(int index) async { + final sdk = _sdk; + if (_presenting || index < 0 || index >= _stories.length) return; + _presenting = true; + try { + await _present( + context, + config: widget, + sdk: sdk, + stories: _stories, + index: index, + paused: widget.controller?._paused, + onSlideShown: (_, _) { + if (mounted) setState(() {}); + }, + ); + } finally { + _presenting = false; + widget.controller?._paused.value = false; + } } @override @@ -232,26 +374,32 @@ class _PersonalizationStoriesState extends State { return PersonalizationStoriesBar(loading: true, padding: widget.padding); } final stories = _stories; - if (stories.isEmpty) return const SizedBox.shrink(); + final sdk = _sdk; + if (stories.isEmpty || sdk == null) return const SizedBox.shrink(); + final seen = StoriesSeenStore.instance.seen(sdk); return PersonalizationStoriesBar( padding: widget.padding, items: [ for (final story in stories) - PersonalizationStoryItem( - id: story.id, - label: story.name, - image: storyImage(story.avatar, widget.imageProvider), - pinned: story.pinned, - viewed: _isViewed(story), - segments: story.slides.length, - seenSegments: _seenOf(story), - ), + _item(story, seen[story.id] ?? const {}), ], - onItemTap: (item) { - final index = stories.indexWhere((story) => story.id == item.id); - if (index >= 0) _open(index); - }, + onItemTap: (item) => + _open(stories.indexWhere((story) => story.id == item.id)), iconBuilder: widget.iconBuilder, ); } + + PersonalizationStoryItem _item(Story story, Set seen) => + PersonalizationStoryItem( + id: story.id, + label: story.name, + image: storyImage(story.avatar, widget.imageProvider), + pinned: story.pinned, + viewed: StoriesPlayback.isViewed(story, seen), + segments: story.slides.length, + seenSegments: { + for (var i = 0; i < story.slides.length; i++) + if (seen.contains(story.slides[i].id)) i, + }, + ); } diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 0a77ddd..eba9f30 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -1,56 +1,54 @@ +import 'dart:async'; import 'dart:math' as math; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/scheduler.dart'; +import 'package:flutter/widgets.dart'; import 'package:video_player/video_player.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; -import '../components/personalization_button.dart'; -import '../components/personalization_product.dart'; -import '../components/personalization_story_navigation.dart'; -import '../components/personalization_story_price.dart'; -import '../components/personalization_story_sound_button.dart'; -import '../components/personalization_story_used_products.dart'; import '../components/personalization_toast.dart'; -import '../personalization_colors.dart'; -import '../personalization_theme.dart'; +import 'stories_media_cache.dart'; +import 'stories_playback.dart'; +import 'stories_seen_store.dart'; +import 'stories_slide_view.dart'; +import 'stories_sound.dart'; import 'stories_support.dart'; /// Полноэкранный просмотр сторис: слайды по таймеру, листание, товары, ссылки. /// /// Источник: Figma Mobile SDK UI Kit, страница Stories (1:32), фреймы Card/Story -/// (Product, Promo, Discount, Action, Slide, Text) 402×874. +/// (Product, Promo, Discount, Action, Slide, Text) 402×874. Как рисуется слайд — см. +/// [StorySlideView]; логика без UI — [StoriesPlayback]. /// -/// Раскладка: поля 16, шаг 16. Фон — картинка или видео слайда (cover), под ними цвет -/// `background_color`; сверху и снизу затемнение: чёрный 30% (50% на слайдах с медиа) -/// до прозрачного к 21% и от 86% высоты. +/// Поведение (общие правила всех платформ): +/// - касание левой трети — назад, правой — вперёд, середина ничего не делает; в RTL края +/// меняются местами. Удержание от 200 мс — пауза, отпускание её снимает и никуда не +/// листает. Назад на первом слайде первой сторис перезапускает слайд, вперёд на +/// последнем слайде последней — закрывает просмотр; +/// - свайп вбок листает сторис; заход на сторис (просмотр слайда, трекинг `view`) — только +/// когда страница осела, подглядывание соседней не считается. Свайп вниз дальше 120 или +/// быстрее 800 в секунду закрывает, иначе слайд пружинит назад; пока тянут — пауза; +/// - раскрытая шторка товаров ставит паузу и блокирует листание; тап мимо неё и системное +/// «назад» её закрывают; смена слайда её сбрасывает; +/// - пауза и когда приложение свёрнуто или потеряло фокус, и когда просмотр закрыт другим +/// экраном, и по [paused] от хоста; время слайда в паузе не идёт; +/// - часы слайда стартуют, когда медиа готово; не загрузилось или не успело за 10 с — пауза +/// и кнопка [retryText]; видео ещё и само повторяет загрузку через 15 с; +/// - видео длится по своей реальной длине, прогресс идёт за воспроизведением и стоит на +/// подгрузке; видео кэшируется на диске ([StoriesMediaCache]), следующий слайд +/// подгружается заранее. Звук выключен при первом открытии, выбор помнится до конца +/// процесса, кнопка громкости «вверх» включает звук ([StoriesSound]). /// -/// - Слайды с медиа (`image` / `video`) всегда в тёмных токенах кита — белые хром и -/// текст, тёмный лист товаров: поддерево переключается на тёмную тему. Бренд темы -/// хоста (Brand/Primary и кнопки) сохраняется. -/// - Слайд с товаром следует теме приложения: фон Background/Card (белый в светлой, -/// #1A1A1A в тёмной), под ним нет картинки; текст Text/Primary. Сверху шапка (бренд SemiBold 20, название SemiBold 16, межстрочный -/// 140%, шаг 8), посередине белая карточка картинки (скругление 12, поля 16, -/// квадрат по ширине — на низком экране ужимается), внизу с шагом 16 -/// [PersonalizationStoryPrice] и кнопка LG — подпись кнопки слайда, без неё -/// [moreInfoText]. Вид цены: промокод — promoCode, скидка — discount, иначе price. -/// - На слайде с медиа текстовые блоки стоят на `y_offset` процентов высоты слайда во -/// всю ширину без полей, кнопки — внизу кнопками LG, товары — -/// [PersonalizationStoryUsedProducts]. У видео слева внизу кнопка звука; звук по -/// умолчанию выключен, как в прежних сторис Android, и переключается на весь просмотр. +/// Трекинг через [sdk] с кодом [code]: `view` — на каждый слайд, ставший текущим на +/// осевшей странице; `click` — кнопка, товар, карусель, копирование промокода. Id, которые +/// не целые положительные числа (`39_0`), не трекаются. Просмотренные слайды с [sdk] +/// запоминаются на устройстве по магазину ([StoriesSeenStore]); хосту о показе слайда +/// сообщает [onSlideShown]. /// -/// Поведение: слайд идёт `duration` секунд (отсчёт начинается, когда загрузилась -/// картинка или видео); касание левой трети — предыдущий слайд, остального — следующий; -/// удержание — пауза прогресса и видео; раскрытые товары — тоже пауза; свайп вниз -/// закрывает; свайп вбок — соседняя сторис; после последнего слайда последней сторис -/// просмотр закрывается. Каждая сторис начинается со слайда из [startSlides], иначе с -/// `start_position`. -/// -/// Трекинг через [sdk]: `view` на каждый показанный слайд, `click` на кнопку, товар и -/// промокод. О показе слайда узнаёт и хост — [onSlideShown] (лента по нему отмечает -/// просмотренное). Ссылки: [onLinkClick], если задан, иначе системный обработчик через -/// SDK (`link_android` / `link_ios`, иначе `link`; у товара — диплинк, иначе `url`). +/// Кнопки, товары и карусель сначала закрывают просмотр, потом зовут [onLinkClick] / +/// [onProductClick]; не заданы — ссылку открывает система через SDK. /// /// Открывается маршрутом [route] или встраивается как обычный виджет с [onClose]. class PersonalizationStoryViewer extends StatefulWidget { @@ -58,56 +56,69 @@ class PersonalizationStoryViewer extends StatefulWidget { super.key, required this.stories, this.initialStory = 0, - this.startSlides = const {}, + this.seen = const >{}, this.code, this.sdk, + this.paused, this.onSlideShown, this.onClose, this.onLinkClick, this.onProductClick, this.onPromoCopied, - this.moreInfoText = 'More info', - this.promoCodeCaption = 'Promo code', + this.productButtonText = 'More info', + this.promoCaption = 'Promo code', this.promoCopiedText = 'Copied', this.promoToastPosition = PersonalizationToastPosition.top, - this.usedProductsText = 'Used products', + this.showProductsText = 'Used products', this.hideProductsText = 'Hide products', + this.retryText = 'Retry', + this.closeLabel = 'Close', + this.soundOnLabel = 'Sound on', + this.soundOffLabel = 'Sound off', this.imageProvider, this.iconBuilder, }); + /// Сторис блока; сторис без слайдов пропускаются. final List stories; - /// С какой сторис начать. + /// С какой сторис начать — индекс в [stories]. final int initialStory; - /// С какого слайда начать сторис, по её id; нет в списке — `start_position`. - final Map startSlides; + /// Уже просмотренные слайды: id слайдов по id сторис. По ним выбирается стартовый слайд + /// сторис (первый непросмотренный). С [sdk] к ним добавляется сохранённое на устройстве. + final Map> seen; /// Код блока для трекинга. final String? code; - /// Инстанс для трекинга и системных ссылок; `null` — без них. + /// Инстанс для трекинга, хранения просмотренного и системных ссылок; `null` — без них. final PersonalizationSdk? sdk; - /// Показан слайд [slideIndex] сторис [story]. + /// Пауза от хоста: пока `true`, слайд стоит. + final ValueListenable? paused; + + /// Слайд [slideIndex] сторис [story] стал текущим. final void Function(Story story, int slideIndex)? onSlideShown; /// Закрыть просмотр; не задан — `Navigator.maybePop`. final VoidCallback? onClose; - /// Ссылка кнопки или товара; не задан — ссылку открывает система. + /// Ссылка кнопки; не задан — ссылку открывает система. final ValueChanged? onLinkClick; - /// Нажатие на товар в карусели слайда; не задан — открывается ссылка товара. + /// Нажатие на товар (карточка товарного слайда или карусель); не задан — открывается + /// ссылка товара. final ValueChanged? onProductClick; /// Промокод скопирован. final ValueChanged? onPromoCopied; - /// Подпись кнопки слайда с товаром, когда у слайда своей кнопки нет. - final String moreInfoText; - final String promoCodeCaption; + /// Подпись кнопки товарного слайда, когда у слайда своих кнопок нет. + final String productButtonText; + + /// Подпись над промокодом, когда в админке у товара нет своей. + final String promoCaption; /// Текст тоста после копирования промокода. final String promoCopiedText; @@ -116,9 +127,17 @@ class PersonalizationStoryViewer extends StatefulWidget { final PersonalizationToastPosition promoToastPosition; /// Подписи переключателя товаров, когда их не прислал сервер. - final String usedProductsText; + final String showProductsText; final String hideProductsText; + /// Подпись кнопки повтора загрузки медиа. + final String retryText; + + /// Подписи для скринридера: крестик и кнопка звука (включить / выключить). + final String closeLabel; + final String soundOnLabel; + final String soundOffLabel; + /// Картинка по адресу; не задан — [NetworkImage]. final PersonalizationStoryImageProvider? imageProvider; @@ -154,739 +173,556 @@ class PersonalizationStoryViewer extends StatefulWidget { _PersonalizationStoryViewerState(); } -class _PersonalizationStoryViewerState - extends State { - late final int _initial = widget.stories.isEmpty - ? 0 - : widget.initialStory.clamp(0, widget.stories.length - 1); - late final PageController _pages = PageController(initialPage: _initial); - late int _current = _initial; - bool _muted = true; - double _drag = 0; - bool _closing = false; - - static const Duration _turn = Duration(milliseconds: 300); - - /// Свайп вниз дальше этого — закрыть. - static const double _closeDistance = 120; - - @override - void dispose() { - _pages.dispose(); - super.dispose(); - } - - void _close() { - if (_closing) return; - _closing = true; - final onClose = widget.onClose; - if (onClose != null) { - onClose(); - } else { - Navigator.maybePop(context); - } - } - - void _nextStory() { - if (_current < widget.stories.length - 1) { - _pages.nextPage(duration: _turn, curve: Curves.easeInOut); - } else { - _close(); - } - } - - /// К предыдущей сторис; `false` — это первая. - bool _previousStory() { - if (_current == 0) return false; - _pages.previousPage(duration: _turn, curve: Curves.easeInOut); - return true; - } - - int _startOf(Story story) { - final start = widget.startSlides[story.id] ?? story.startPosition; - return story.slides.isEmpty ? 0 : start.clamp(0, story.slides.length - 1); - } - - @override - Widget build(BuildContext context) { - final stories = widget.stories; - // В корневом маршруте нет Material: без этого Text взял бы аварийный стиль - // приложения — с жёлтым подчёркиванием. - return DefaultTextStyle( - style: const TextStyle(), - child: GestureDetector( - onVerticalDragUpdate: (details) => - setState(() => _drag = math.max(0, _drag + details.delta.dy)), - onVerticalDragEnd: (details) { - if (_drag > _closeDistance || (details.primaryVelocity ?? 0) > 800) { - _close(); - } else { - setState(() => _drag = 0); - } - }, - onVerticalDragCancel: () => setState(() => _drag = 0), - child: Transform.translate( - offset: Offset(0, _drag), - child: Transform.scale( - scale: 1 - math.min(_drag / 2000, 0.1), - child: stories.isEmpty - ? const ColoredBox(color: Color(0xFF000000)) - : PageView.builder( - controller: _pages, - itemCount: stories.length, - onPageChanged: (index) => setState(() => _current = index), - itemBuilder: (context, index) { - final story = stories[index]; - return _StoryPage( - key: ValueKey('story-${story.id}-$index'), - story: story, - startSlide: _startOf(story), - active: index == _current, - held: _drag > 0, - muted: _muted, - config: widget, - onToggleMute: () => setState(() => _muted = !_muted), - onFinished: _nextStory, - onBeforeFirst: _previousStory, - onClose: _close, - ); - }, - ), - ), - ), - ), - ); - } -} - -/// Одна сторис: текущий слайд, его таймер, медиа и касания. -class _StoryPage extends StatefulWidget { - const _StoryPage({ - super.key, - required this.story, - required this.startSlide, - required this.active, - required this.held, - required this.muted, - required this.config, - required this.onToggleMute, - required this.onFinished, - required this.onBeforeFirst, - required this.onClose, - }); - - final Story story; - final int startSlide; - - /// Сторис на экране; остальные страницы стоят. - final bool active; - - /// Просмотр придержан снаружи — тянут вниз. - final bool held; - final bool muted; - final PersonalizationStoryViewer config; - final VoidCallback onToggleMute; - - /// Последний слайд досмотрен или пролистан. - final VoidCallback onFinished; +class _PersonalizationStoryViewerState extends State + with SingleTickerProviderStateMixin, WidgetsBindingObserver { + late final StoriesPlayback _playback = StoriesPlayback( + stories: widget.stories, + initialStory: widget.initialStory, + seen: _initialSeen(), + ); + late final PageController _pages = PageController( + initialPage: _playback.storyIndex, + ); + late final Ticker _ticker = createTicker(_onTick); + Duration _lastTick = Duration.zero; - /// Листают назад с первого слайда; `false` — предыдущей сторис нет. - final bool Function() onBeforeFirst; - final VoidCallback onClose; + /// Доля прошедшего времени слайда — для прогресса; перестраивает только шапку. + final ValueNotifier _progress = ValueNotifier(0); - @override - State<_StoryPage> createState() => _StoryPageState(); -} + /// Насколько просмотр стянут вниз; перестраивает только сдвиг, не страницы. + final ValueNotifier _drag = ValueNotifier(0); -class _StoryPageState extends State<_StoryPage> - with SingleTickerProviderStateMixin { - late final AnimationController _progress = AnimationController(vsync: this) - ..addStatusListener(_onStatus); - late int _slide = widget.startSlide; VideoPlayerController? _video; bool _videoReady = false; + bool _videoPlaying = false; + Timer? _timeout; + Timer? _autoRetry; + bool _closing = false; - /// Медиа слайда загружено — можно считать время. - bool _ready = false; - - /// Удерживают палец. - bool _hold = false; - - /// Раскрыты товары слайда. - bool _productsOpen = false; - - /// Номер захода на слайд: ответы загрузок от прошлых заходов отбрасываются. - int _generation = 0; - - PersonalizationStoryViewer get _config => widget.config; - - StorySlide? get _current => - widget.story.slides.isEmpty ? null : widget.story.slides[_slide]; - - bool get _running => - widget.active && !widget.held && !_hold && !_productsOpen && _ready; + static const Duration _turn = Duration(milliseconds: 300); + static const Duration _readyTimeout = Duration(seconds: 10); + static const Duration _videoRetry = Duration(seconds: 15); + static const double _closeDistance = 120; + static const double _closeVelocity = 800; + + Map> _initialSeen() { + final sdk = widget.sdk; + final stored = sdk == null + ? const >{} + : StoriesSeenStore.instance.seen(sdk); + return >{ + for (final entry in stored.entries) entry.key: entry.value, + for (final entry in widget.seen.entries) + entry.key: {...?stored[entry.key], ...entry.value}, + }; + } @override void initState() { super.initState(); - // Загрузка картинки читает контекст (MediaQuery, ассеты) — после первой сборки. + WidgetsBinding.instance.addObserver(this); + StoriesSound.instance.attach(); + StoriesSound.instance.muted.addListener(_onMuted); + widget.paused?.addListener(_onHostPause); + _onHostPause(); + _onLifecycle(WidgetsBinding.instance.lifecycleState); + // Первая страница осела сразу: заход после кадра — загрузка картинки читает контекст. WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted && widget.active) _enter(); + if (mounted && !_playback.isEmpty) _settled(_playback.storyIndex); }); } @override - void didUpdateWidget(_StoryPage oldWidget) { + void didUpdateWidget(PersonalizationStoryViewer oldWidget) { super.didUpdateWidget(oldWidget); - if (oldWidget.muted != widget.muted) { - _video?.setVolume(widget.muted ? 0 : 1); - } - if (widget.active && !oldWidget.active) { - _enter(); - } else { - _sync(); + if (oldWidget.paused != widget.paused) { + oldWidget.paused?.removeListener(_onHostPause); + widget.paused?.addListener(_onHostPause); + _onHostPause(); } } + @override + void didChangeDependencies() { + super.didChangeDependencies(); + // Просмотр закрыт непрозрачным экраном — навигатор глушит тикеры его поддерева. + _setPaused( + StoriesPauseReason.covered, + !TickerMode.valuesOf(context).enabled, + ); + } + + @override + void didChangeAppLifecycleState(AppLifecycleState state) => + _onLifecycle(state); + + void _onLifecycle(AppLifecycleState? state) => _setPaused( + StoriesPauseReason.background, + state != null && state != AppLifecycleState.resumed, + ); + + void _onHostPause() => + _setPaused(StoriesPauseReason.host, widget.paused?.value ?? false); + @override void dispose() { + WidgetsBinding.instance.removeObserver(this); + widget.paused?.removeListener(_onHostPause); + StoriesSound.instance.muted.removeListener(_onMuted); + _timeout?.cancel(); + _autoRetry?.cancel(); + _ticker.dispose(); + _disposeVideo(); + StoriesSound.instance.detach(); + _pages.dispose(); _progress.dispose(); - _video?.dispose(); + _drag.dispose(); super.dispose(); } - /// Заход на текущий слайд: прогресс с нуля, загрузка медиа, трекинг показа. - void _enter() { - final slide = _current; - if (slide == null) { - // Сторис без слайдов пропускается — после кадра: заход бывает посреди сборки. - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) widget.onFinished(); - }); - return; - } - final generation = ++_generation; - _progress - ..stop() - ..value = 0 - ..duration = slide.duration; - _ready = false; - _productsOpen = false; - _disposeVideo(); - if (mounted) setState(() {}); - _prepare(slide, generation); - _shown(slide, generation); + /// Поставить или снять паузу [reason]; часы и видео меняются только на переходе. + void _setPaused(StoriesPauseReason reason, bool paused) { + final changed = paused ? _playback.pause(reason) : _playback.resume(reason); + if (changed) _sync(); } - void _disposeVideo() { + /// Часы и видео идут, только пока слайд не стоит. Вызывается на переходах, не на кадре. + void _sync() { + final running = _playback.running; + if (running && !_ticker.isActive) { + _lastTick = Duration.zero; + _ticker.start(); + } else if (!running && _ticker.isActive) { + _ticker.stop(); + } final video = _video; - _video = null; - _videoReady = false; - video?.dispose(); + if (video == null || !_videoReady || running == _videoPlaying) return; + _videoPlaying = running; + running ? video.play() : video.pause(); } - Future _prepare(StorySlide slide, int generation) async { - switch (slide.type) { - case StorySlideType.product: - break; - case StorySlideType.image: - final image = storyImage(slide.background, _config.imageProvider); - if (image != null) { - await precacheImage(image, context, onError: (_, _) {}); - } - case StorySlideType.video: - final uri = Uri.tryParse(slide.background); - if (uri != null && slide.background.isNotEmpty) { - final video = VideoPlayerController.networkUrl(uri); - _video = video; - try { - await video.initialize(); - if (generation != _generation) return; - await video.setLooping(true); - await video.setVolume(widget.muted ? 0 : 1); - _videoReady = true; - } catch (error) { - // Видео не открылось — остаётся постер, слайд идёт по таймеру. - debugPrint( - 'PersonalizationStoryViewer: video ${slide.id} — $error', - ); - } - } + void _onTick(Duration elapsed) { + final delta = elapsed - _lastTick; + _lastTick = elapsed; + final video = _video?.value; + // У видео время идёт, только пока оно играет, а не подгружается. + if (_playback.followsVideo && + (video == null || !video.isPlaying || video.isBuffering)) { + return; } - if (!mounted || generation != _generation) return; - setState(() => _ready = true); - _sync(); + final ended = _playback.tick(delta); + _progress.value = _playback.progress; + if (ended) _step(_playback.next()); } - /// Прогресс и видео идут, только когда ничто их не держит. - void _sync() { - if (_running) { - if (!_progress.isAnimating && _progress.value < 1) _progress.forward(); - _video?.play(); + // --- Навигация ---------------------------------------------------------------------- + + /// Страница осела на [index]: заход на сторис или просто конец листания. + void _settled(int index) { + if (_playback.settle(index)) { + _entered(); } else { - _progress.stop(); - _video?.pause(); + _sync(); } + setState(() {}); } - void _onStatus(AnimationStatus status) { - if (status == AnimationStatus.completed) _next(); - } - - void _next() { - if (_slide < widget.story.slides.length - 1) { - _slide++; - _enter(); - } else { - _progress.stop(); - widget.onFinished(); + /// Исполнить шаг машины. + void _step(StoriesStep step) { + switch (step) { + case StoriesStep.none: + return; + case StoriesStep.slide: + _entered(); + case StoriesStep.turn: + _sync(); + final target = _playback.turnTarget!; + if (_pages.hasClients) { + _pages.animateToPage( + target, + duration: _turn, + curve: Curves.easeInOut, + ); + } else { + _settled(target); + } + case StoriesStep.close: + _close(); } + if (mounted) setState(() {}); } - void _previous() { - if (_slide > 0) { - _slide--; - _enter(); - } else if (!widget.onBeforeFirst()) { - _enter(); + void _close() { + if (_closing) return; + _closing = true; + _ticker.stop(); + _video?.pause(); + final onClose = widget.onClose; + if (onClose != null) { + onClose(); + } else { + Navigator.maybePop(context); } } - void _setHold(bool hold) { - _hold = hold; - _sync(); + /// Закрыть просмотр, потом [action] — переход по ссылке или к товару. + void _closeThen(VoidCallback action) { + _close(); + action(); } - // --- Трекинг и действия ---------------------------------------------------------------- - - void _shown(StorySlide slide, int generation) { - // Хосту — после кадра: заход на слайд бывает посреди сборки (смена сторис), а хост - // в ответ перестраивает свой экран под маршрутом. - final index = _slide; + /// Новый заход на слайд: прогресс с нуля, медиа, просмотренное, трекинг, хост. + void _entered() { + final story = _playback.story; + final slide = _playback.slide; + final index = _playback.slideIndex; + final generation = _playback.generation; + _progress.value = 0; + _load(generation); + final sdk = widget.sdk; + if (sdk != null) { + StoriesSeenStore.instance.mark(sdk, story.id, slide.id); + if (storyTrackableId(story.id) && storyTrackableId(slide.id)) { + sdk.tracking + .storyView(storyId: story.id, slideId: slide.id, code: widget.code) + .catchError((Object error) { + debugPrint('PersonalizationStoryViewer: storyView — $error'); + }); + } + } + // Хосту — после кадра: заход бывает посреди сборки, а хост в ответ перестраивает + // свой экран под маршрутом. WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted && generation == _generation) { - _config.onSlideShown?.call(widget.story, index); + if (mounted && generation == _playback.generation) { + widget.onSlideShown?.call(story, index); } }); - final sdk = _config.sdk; - if (sdk == null || widget.story.id.isEmpty || slide.id.isEmpty) return; - sdk.tracking - .storyView( - storyId: widget.story.id, - slideId: slide.id, - code: _config.code, - ) - .catchError((Object error) { - debugPrint('PersonalizationStoryViewer: storyView — $error'); - }); } void _clicked() { - final slide = _current; - final sdk = _config.sdk; - if (slide == null || - sdk == null || - widget.story.id.isEmpty || - slide.id.isEmpty) { + final sdk = widget.sdk; + final story = _playback.story; + final slide = _playback.slide; + if (sdk == null || + !storyTrackableId(story.id) || + !storyTrackableId(slide.id)) { return; } sdk.tracking - .storyClick( - storyId: widget.story.id, - slideId: slide.id, - code: _config.code, - ) + .storyClick(storyId: story.id, slideId: slide.id, code: widget.code) .catchError((Object error) { debugPrint('PersonalizationStoryViewer: storyClick — $error'); }); } - void _open(String url) { - if (url.isEmpty) return; - final onLink = _config.onLinkClick; - if (onLink != null) { - onLink(url); - return; + // --- Медиа -------------------------------------------------------------------------- + + /// Загрузка медиа захода [generation]. Готово — часы пошли; ошибка или 10 с без + /// готовности — пауза и «Повторить». Ответы прошлых заходов отбрасываются. + void _load(int generation) { + _timeout?.cancel(); + _autoRetry?.cancel(); + _disposeVideo(); + _sync(); + final slide = _playback.slide; + switch (storyMediaOf(slide)) { + case StoryMedia.none: + _ready(generation); + case StoryMedia.image: + _timeout = Timer(_readyTimeout, () => _failed(generation)); + _loadImage(slide.background, generation); + case StoryMedia.video: + _timeout = Timer(_readyTimeout, () => _failed(generation)); + _loadVideo(slide.background, generation); } - _config.sdk?.openUrl(url).catchError((Object error) { - debugPrint('PersonalizationStoryViewer: cannot open $url — $error'); - return false; - }); } - void _productTapped(StoryProduct product) { - _clicked(); - final onProduct = _config.onProductClick; - if (onProduct != null) { - onProduct(product); - } else { - _open(storyProductLink(product)); - } + void _loadImage(String url, int generation) { + final image = storyImage(url, widget.imageProvider); + if (image == null) return _ready(generation); + var failed = false; + precacheImage( + image, + context, + onError: (_, _) => failed = true, + ).then((_) => failed ? _failed(generation) : _ready(generation)); } - void _promoCopied(String code) { - _clicked(); - _config.onPromoCopied?.call(code); + Future _loadVideo(String url, int generation) async { + try { + await StoriesSound.instance.beforeVideo(); + final file = await StoriesMediaCache.instance.fetch(url); + if (!_current(generation)) return; + final options = VideoPlayerOptions(mixWithOthers: true); + final video = file != null + ? VideoPlayerController.file(file, videoPlayerOptions: options) + : VideoPlayerController.networkUrl( + Uri.parse(url), + videoPlayerOptions: options, + ); + _video = video; + await video.initialize(); + if (!_current(generation) || _video != video) return; + await video.setLooping(false); + await video.setVolume(StoriesSound.instance.muted.value ? 0 : 1); + await StoriesSound.instance.afterVideo(); + if (!_current(generation) || _video != video) return; + video.addListener(_onVideo); + _playback.useVideoDuration(video.value.duration); + _videoReady = true; + _videoPlaying = false; + _ready(generation); + } catch (error) { + debugPrint('PersonalizationStoryViewer: video $url — $error'); + _failed(generation); + } } - // --- Сборка ------------------------------------------------------------------------------ + bool _current(int generation) => + mounted && generation == _playback.generation; - @override - Widget build(BuildContext context) { - final slide = _current; - if (slide == null) return const ColoredBox(color: Color(0xFF000000)); - final media = slide.type != StorySlideType.product; - final base = Theme.of(context); - return Theme( - data: media ? _mediaTheme(base) : base, - child: Builder(builder: (context) => _body(context, slide, media)), - ); + void _ready(int generation) { + if (!_current(generation) || _playback.pausedBy(StoriesPauseReason.error)) { + return; + } + _timeout?.cancel(); + _playback.mediaReady(generation); + _sync(); + _preloadNext(); + setState(() {}); } - /// Тема слайдов с медиа: тёмные токены кита. Тема хоста уже тёмная — берётся она, - /// иначе тёмный набор кита с брендом, радиусами и шрифтом хоста. - ThemeData _mediaTheme(ThemeData base) { - final host = base.extension(); - final PersonalizationTheme dark; - if (host != null && base.brightness == Brightness.dark) { - dark = host; - } else { - final source = host ?? PersonalizationTheme.light; - final brand = source.colors; - dark = PersonalizationTheme.dark.copyWith( - radius: source.radius, - fontFamily: source.fontFamily, - colors: PersonalizationColors.dark.copyWith( - brandPrimary: brand.brandPrimary, - buttonPrimary: brand.buttonPrimary, - buttonPrimaryDisabled: brand.buttonPrimaryDisabled, - lineBrand: brand.lineBrand, - textBrand: brand.textBrand, - ), - ); + void _failed(int generation) { + if (!_current(generation)) return; + _timeout?.cancel(); + _playback.mediaFailed(generation); + _sync(); + if (storyMediaOf(_playback.slide) == StoryMedia.video) { + // Видео повторяет загрузку и само. + _autoRetry = Timer(_videoRetry, _retry); } - return base.copyWith( - extensions: [ - for (final extension in base.extensions.values) - if (extension is! PersonalizationTheme) extension, - dark, - ], - ); + setState(() {}); } - Widget _body(BuildContext context, StorySlide slide, bool media) { - final colors = PersonalizationTheme.of(context).colors; - final background = - parseStoryColor(slide.backgroundColor) ?? - (media ? const Color(0xFF000000) : colors.backgroundCard); - final light = colors.textPrimary.computeLuminance() > 0.5; - final product = slide.product; - - return AnnotatedRegion( - value: light ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark, - child: LayoutBuilder( - builder: (context, constraints) => GestureDetector( - behavior: HitTestBehavior.opaque, - onTapUp: (details) => - details.localPosition.dx < constraints.maxWidth / 3 - ? _previous() - : _next(), - onLongPressStart: (_) => _setHold(true), - onLongPressEnd: (_) => _setHold(false), - child: ColoredBox( - color: background, - child: Stack( - fit: StackFit.expand, - children: [ - if (media) _background(slide), - _scrim(media), - SafeArea( - child: media || product == null - ? _mediaContent(context, slide) - : _productContent(context, slide, product), - ), - ], - ), - ), - ), - ), - ); + void _retry() { + final slide = _playback.slide; + final image = storyMediaOf(slide) == StoryMedia.image + ? storyImage(slide.background, widget.imageProvider) + : null; + image?.evict(); + final generation = _playback.retry(); + _progress.value = 0; + _load(generation); + setState(() {}); } - Widget _background(StorySlide slide) { + void _onVideo() { final video = _video; - if (slide.type == StorySlideType.video && video != null && _videoReady) { - final size = video.value.size; - return ClipRect( - child: FittedBox( - fit: BoxFit.cover, - child: SizedBox( - width: size.width, - height: size.height, - child: VideoPlayer(video), - ), - ), - ); - } - final url = slide.type == StorySlideType.video - ? slide.preview - : slide.background; - final image = storyImage(url, _config.imageProvider); - if (image == null) return const SizedBox.shrink(); - return Image(image: image, fit: BoxFit.cover, gaplessPlayback: true); - } - - Widget _scrim(bool media) { - final shade = const Color(0xFF000000).withValues(alpha: media ? 0.5 : 0.3); - const clear = Color(0x00000000); - return IgnorePointer( - child: DecoratedBox( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [shade, clear, clear, shade], - stops: const [0, 0.21, 0.86, 1], - ), - ), - ), - ); + if (video == null) return; + final value = video.value; + if (value.hasError) return _failed(_playback.generation); + _playback.syncVideoPosition(value.position); + _progress.value = _playback.progress; + final ended = + value.isCompleted || + (value.duration > Duration.zero && value.position >= value.duration); + if (ended && _playback.running) _step(_playback.next()); } - Widget _navigation() => AnimatedBuilder( - animation: _progress, - builder: (context, _) => PersonalizationStoryNavigation( - count: widget.story.slides.length, - current: _slide, - progress: _progress.value, - onClose: widget.onClose, - iconBuilder: _config.iconBuilder, - ), - ); + void _disposeVideo() { + final video = _video; + _video = null; + _videoReady = false; + _videoPlaying = false; + if (video == null) return; + video.removeListener(_onVideo); + video.dispose(); + } - Widget _productContent( - BuildContext context, - StorySlide slide, - StoryProduct product, - ) { - final theme = PersonalizationTheme.of(context); - final colors = theme.colors; - final price = storyPriceOf(product); - StoryButtonElement? button; - for (final element in slide.elements) { - if (element is StoryButtonElement) { - button = element; + void _onMuted() { + _video?.setVolume(StoriesSound.instance.muted.value ? 0 : 1); + if (mounted) setState(() {}); + } + + /// Следующий слайд — тот же сторис или стартовый следующей — грузится заранее. + void _preloadNext() { + final stories = _playback.stories; + final story = _playback.storyIndex; + final StorySlide next; + if (_playback.slideIndex < _playback.story.slides.length - 1) { + next = _playback.story.slides[_playback.slideIndex + 1]; + } else if (story < stories.length - 1) { + next = stories[story + 1].slides[_playback.startSlideFor(story + 1)]; + } else { + return; + } + switch (storyMediaOf(next)) { + case StoryMedia.none: break; - } + case StoryMedia.image: + final image = storyImage(next.background, widget.imageProvider); + if (image != null) precacheImage(image, context, onError: (_, _) {}); + case StoryMedia.video: + StoriesMediaCache.instance.preload(next.background); + final poster = storyImage(next.preview, widget.imageProvider); + if (poster != null) precacheImage(poster, context, onError: (_, _) {}); } - final buttonLink = button == null ? '' : storyButtonLink(button); - final image = storyImage(product.image, _config.imageProvider); - - TextStyle header(double size) => TextStyle( - fontSize: size, - height: 1.4, - fontWeight: FontWeight.w600, - letterSpacing: 0, - fontFamily: theme.fontFamily.familyFor(FontWeight.w600), - package: theme.fontFamily.package, - color: colors.textPrimary, - ); + } - return Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - _navigation(), - const SizedBox(height: 16), - if (product.brand.isNotEmpty) ...[ - Text( - product.brand, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: header(20), - ), - const SizedBox(height: 8), - ], - Text( - product.name, - maxLines: 4, - overflow: TextOverflow.ellipsis, - style: header(16), - ), - // Карточка — квадрат во всю ширину; на низком экране ужимается по высоте. - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 16), - child: Center( - child: AspectRatio( - aspectRatio: 1, - child: DecoratedBox( - decoration: BoxDecoration( - color: const Color(0xFFFFFFFF), - borderRadius: BorderRadius.circular(12), - ), - child: Padding( - padding: const EdgeInsets.all(16), - child: image == null - ? null - : Image(image: image, fit: BoxFit.contain), - ), - ), - ), - ), - ), - ), - PersonalizationStoryPrice( - type: price.type, - price: price.price, - oldPrice: price.oldPrice, - discount: price.discount, - promoCode: price.promoCode, - promoCodeCaption: _config.promoCodeCaption, - copiedText: _config.promoCopiedText, - copiedToastPosition: _config.promoToastPosition, - onPromoCopied: _promoCopied, - iconBuilder: _config.iconBuilder, - ), - const SizedBox(height: 16), - PersonalizationButton( - label: button != null && button.title.trim().isNotEmpty - ? button.title - : _config.moreInfoText, - iconBuilder: _config.iconBuilder, - onPressed: () { - _clicked(); - _open( - buttonLink.isNotEmpty ? buttonLink : storyProductLink(product), - ); - }, - ), - ], - ), - ); + // --- Действия ----------------------------------------------------------------------- + + /// Касание: левая треть — назад, правая — вперёд, середина — ничего; в RTL зеркально. + void _tap(double dx, double width) { + final rtl = Directionality.of(context) == TextDirection.rtl; + if (dx < width / 3) { + _step(rtl ? _playback.next() : _playback.previous()); + } else if (dx > width * 2 / 3) { + _step(rtl ? _playback.previous() : _playback.next()); + } } - Widget _mediaContent(BuildContext context, StorySlide slide) { - final texts = slide.elements.whereType().toList(); - final buttons = slide.elements - .whereType() - .where((button) => button.title.trim().isNotEmpty) - .toList(); - StoryProductsElement? products; - for (final element in slide.elements) { - if (element is StoryProductsElement && element.products.isNotEmpty) { - products = element; - break; - } + void _sheet(bool open) { + final changed = open ? _playback.openSheet() : _playback.closeSheet(); + if (!changed) return; + _sync(); + setState(() {}); + } + + void _button(StoryButtonElement button) { + _clicked(); + final product = storyProductElement(_playback.slide)?.item; + final own = storyButtonLink(button); + if (own.isEmpty && product != null) return _closeThen(() => _goTo(product)); + _closeThen(() => _openLink(own)); + } + + void _product(StoryProduct product) { + _clicked(); + _closeThen(() => _goTo(product)); + } + + void _promo(String code) { + _clicked(); + widget.onPromoCopied?.call(code); + } + + void _goTo(StoryProduct product) { + final onProduct = widget.onProductClick; + if (onProduct != null) return onProduct(product); + _openUrl(storyProductLink(product)); + } + + void _openLink(String url) { + if (url.isEmpty) return; + final onLink = widget.onLinkClick; + if (onLink != null) return onLink(url); + _openUrl(url); + } + + void _openUrl(String url) { + if (url.isEmpty) return; + widget.sdk?.openUrl(url).catchError((Object error) { + debugPrint('PersonalizationStoryViewer: cannot open $url — $error'); + return false; + }); + } + + // --- Сборка ------------------------------------------------------------------------- + + bool _onScroll(ScrollNotification notification) { + if (notification.depth != 0) return false; + if (notification is ScrollStartNotification && + notification.dragDetails != null) { + _setPaused(StoriesPauseReason.drag, true); + } else if (notification is ScrollEndNotification && _pages.hasClients) { + _settled(_pages.page?.round() ?? _playback.storyIndex); } - final sound = slide.type == StorySlideType.video - ? PersonalizationStorySoundButton( - muted: widget.muted, - onPressed: widget.onToggleMute, - iconBuilder: _config.iconBuilder, - ) - : null; + return false; + } + + void _dragEnd(double velocity) { + if (_drag.value > _closeDistance || velocity > _closeVelocity) { + _close(); + return; + } + _drag.value = 0; + _setPaused(StoriesPauseReason.drag, false); + } - return LayoutBuilder( - builder: (context, constraints) => Stack( - fit: StackFit.expand, - children: [ - for (final text in texts) - Positioned( - left: 16, - right: 16, - top: constraints.maxHeight * text.yOffset.clamp(0, 100) / 100, - child: _textBlock(context, text), + @override + Widget build(BuildContext context) { + if (_playback.isEmpty) return const ColoredBox(color: Color(0xFF000000)); + final sheet = _playback.sheetOpen; + return PopScope( + // Системное «назад» сперва сворачивает шторку товаров. + canPop: !sheet, + onPopInvokedWithResult: (didPop, _) { + if (!didPop) _sheet(false); + }, + // В корневом маршруте нет Material: без этого Text взял бы аварийный стиль + // приложения — с жёлтым подчёркиванием. + child: DefaultTextStyle( + style: const TextStyle(), + child: GestureDetector( + onVerticalDragStart: sheet + ? null + : (_) => _setPaused(StoriesPauseReason.drag, true), + onVerticalDragUpdate: sheet + ? null + : (details) => + _drag.value = math.max(0, _drag.value + details.delta.dy), + onVerticalDragEnd: sheet + ? null + : (details) => _dragEnd(details.primaryVelocity ?? 0), + onVerticalDragCancel: sheet ? null : () => _dragEnd(0), + child: ValueListenableBuilder( + valueListenable: _drag, + builder: (context, drag, child) => Transform.translate( + offset: Offset(0, drag), + child: Transform.scale( + scale: 1 - math.min(drag / 2000, 0.1), + child: child, + ), ), - Positioned(left: 16, top: 16, right: 16, child: _navigation()), - Positioned( - left: 0, - right: 0, - bottom: 0, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - for (final button in buttons) - Padding( - padding: const EdgeInsets.fromLTRB(16, 0, 16, 16), - child: PersonalizationButton( - label: button.title, - iconBuilder: _config.iconBuilder, - onPressed: () { - _clicked(); - _open(storyButtonLink(button)); - }, - ), - ), - if (products != null) - _usedProducts(products, sound) - else if (sound != null) - SizedBox( - height: 64, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Align( - alignment: AlignmentDirectional.centerStart, - child: sound, - ), - ), - ), - ], + child: NotificationListener( + onNotification: _onScroll, + child: PageView.builder( + controller: _pages, + physics: sheet ? const NeverScrollableScrollPhysics() : null, + itemCount: _playback.stories.length, + itemBuilder: _page, + ), ), ), - ], + ), ), ); } - Widget _usedProducts(StoryProductsElement element, Widget? sound) { - final byId = { - for (final product in element.products) product.id: product, - }; - return PersonalizationStoryUsedProducts( - key: ValueKey('products-$_slide'), - products: [ - for (final product in element.products) - storyCardProduct(product, _config.imageProvider), - ], - showText: element.showLabel.isNotEmpty - ? element.showLabel - : _config.usedProductsText, - hideText: element.hideLabel.isNotEmpty - ? element.hideLabel - : _config.hideProductsText, - onExpandedChanged: (open) { - _productsOpen = open; - _sync(); - }, - onProductTap: (card) { - final product = byId[card.id]; - if (product != null) _productTapped(product); - }, - leading: sound, - iconBuilder: _config.iconBuilder, - ); - } - - Widget _textBlock(BuildContext context, StoryTextBlockElement element) { - final block = storyTextBlock(element); - final code = element.promocode; - if (code == null) return block; - // Блок с промокодом копирует его, как в прежних сторис. - return GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - Clipboard.setData(ClipboardData(text: code)); - PersonalizationToast.show( - context, - _config.promoCopiedText, - position: _config.promoToastPosition, - ); - _promoCopied(code); - }, - child: block, + Widget _page(BuildContext context, int index) { + final story = _playback.stories[index]; + final live = _playback.entered && index == _playback.storyIndex; + return StorySlideView( + key: ValueKey('story-${story.id}-$index'), + story: story, + slideIndex: live ? _playback.slideIndex : _playback.startSlideFor(index), + config: widget, + live: live, + generation: live ? _playback.generation : 0, + progress: live ? _progress : null, + video: live && _videoReady ? _video : null, + muted: StoriesSound.instance.muted.value, + sheetOpen: live && _playback.sheetOpen, + failed: live && _playback.pausedBy(StoriesPauseReason.error), + onTap: _tap, + onHold: (held) => _setPaused(StoriesPauseReason.hold, held), + onClose: _close, + onToggleMute: StoriesSound.instance.toggle, + onSheet: _sheet, + onButton: _button, + onProduct: _product, + onPromoCopied: _promo, + onRetry: _retry, ); } } diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart new file mode 100644 index 0000000..d51118d --- /dev/null +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -0,0 +1,506 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:video_player/video_player.dart'; + +import '../../stories/stories_response.dart'; +import '../components/personalization_button.dart'; +import '../components/personalization_product.dart'; +import '../components/personalization_story_navigation.dart'; +import '../components/personalization_story_price.dart'; +import '../components/personalization_story_sound_button.dart'; +import '../components/personalization_story_used_products.dart'; +import '../components/personalization_toast.dart'; +import '../personalization_colors.dart'; +import '../personalization_theme.dart'; +import 'personalization_story_viewer.dart'; +import 'stories_support.dart'; + +/// Один слайд просмотра сторис: фон, затемнение, содержимое, касания. +/// +/// - Фото и видео вписываются целиком (contain), поля — `background_color` слайда, без +/// него чёрные; такой слайд всегда в тёмных токенах кита. Слайд без медиа — на +/// Background/Card темы приложения, цвет админки не берётся. +/// - Затемнение сверху и снизу на каждом слайде: 50% у голого медиа, иначе 30% +/// ([storyScrimOpacity]), до прозрачного к 21% и от 86% высоты. +/// - Товарный слайд — карточка товара кита, все кнопки слайда (Primary LG друг под +/// другом), «Используемые товары» и звук у видео; текстовые блоки на нём не рисуются. +/// - Медиа-слайд — непустые текстовые блоки на `y_offset`% высоты, кнопки внизу, +/// «Используемые товары», звук у видео. +/// - Медиа не загрузилось — по центру кнопка кита [PersonalizationStoryViewer.retryText]. +/// +/// Живой ([live]) — только текущий слайд осевшей страницы: у него часы, видео, касания и +/// шторка. Соседние страницы показывают свой стартовый слайд неподвижно. +class StorySlideView extends StatelessWidget { + const StorySlideView({ + super.key, + required this.story, + required this.slideIndex, + required this.config, + this.live = false, + this.generation = 0, + this.progress, + this.video, + this.muted = true, + this.sheetOpen = false, + this.failed = false, + this.onTap, + this.onHold, + this.onClose, + this.onToggleMute, + this.onSheet, + this.onButton, + this.onProduct, + this.onPromoCopied, + this.onRetry, + }); + + final Story story; + final int slideIndex; + + /// Тексты, картинки и иконки — из просмотра. + final PersonalizationStoryViewer config; + final bool live; + + /// Номер захода: картинка фона пересоздаётся на каждый — без кадра прошлого слайда. + final int generation; + final ValueListenable? progress; + + /// Готовое видео живого слайда; `null` — постер. + final VideoPlayerController? video; + final bool muted; + final bool sheetOpen; + final bool failed; + + /// Касание по горизонтали [dx] при ширине [width]. + final void Function(double dx, double width)? onTap; + final ValueChanged? onHold; + final VoidCallback? onClose; + final VoidCallback? onToggleMute; + final ValueChanged? onSheet; + final ValueChanged? onButton; + final ValueChanged? onProduct; + final ValueChanged? onPromoCopied; + final VoidCallback? onRetry; + + /// Удержание дольше этого — пауза, а не касание. + static const Duration holdDelay = Duration(milliseconds: 200); + + StorySlide get slide => story.slides[slideIndex]; + + @override + Widget build(BuildContext context) { + final slide = this.slide; + final media = storyMediaOf(slide) != StoryMedia.none; + final base = Theme.of(context); + return Theme( + data: media ? _mediaTheme(base) : base, + child: Builder(builder: (context) => _body(context, slide, media)), + ); + } + + /// Тема слайдов с медиа: тёмные токены кита. Тема хоста уже тёмная — берётся она, + /// иначе тёмный набор кита с брендом, радиусами и шрифтом хоста. + static ThemeData _mediaTheme(ThemeData base) { + final host = base.extension(); + final PersonalizationTheme dark; + if (host != null && base.brightness == Brightness.dark) { + dark = host; + } else { + final source = host ?? PersonalizationTheme.light; + final brand = source.colors; + dark = PersonalizationTheme.dark.copyWith( + radius: source.radius, + fontFamily: source.fontFamily, + colors: PersonalizationColors.dark.copyWith( + brandPrimary: brand.brandPrimary, + buttonPrimary: brand.buttonPrimary, + buttonPrimaryDisabled: brand.buttonPrimaryDisabled, + lineBrand: brand.lineBrand, + textBrand: brand.textBrand, + ), + ); + } + return base.copyWith( + extensions: [ + for (final extension in base.extensions.values) + if (extension is! PersonalizationTheme) extension, + dark, + ], + ); + } + + Widget _body(BuildContext context, StorySlide slide, bool media) { + final colors = PersonalizationTheme.of(context).colors; + final light = colors.textPrimary.computeLuminance() > 0.5; + final product = storyProductElement(slide); + final content = SafeArea( + child: product != null + ? _productContent(context, slide, product) + : _mediaContent(context, slide), + ); + return AnnotatedRegion( + value: light ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark, + child: LayoutBuilder( + builder: (context, constraints) => _gestures( + width: constraints.maxWidth, + child: ColoredBox( + color: media ? storyLetterbox(slide) : colors.backgroundCard, + child: Stack( + fit: StackFit.expand, + children: [ + if (media) _background(slide), + _scrim(slide), + content, + if (failed) Center(child: _retryButton()), + ], + ), + ), + ), + ), + ); + } + + /// Касания по третям и удержание от 200 мс; у неживой страницы — никаких. + Widget _gestures({required double width, required Widget child}) { + if (!live) return child; + return RawGestureDetector( + behavior: HitTestBehavior.opaque, + gestures: { + TapGestureRecognizer: + GestureRecognizerFactoryWithHandlers( + TapGestureRecognizer.new, + (recognizer) => + recognizer.onTapUp = (details) => + onTap?.call(details.localPosition.dx, width), + ), + LongPressGestureRecognizer: + GestureRecognizerFactoryWithHandlers( + () => LongPressGestureRecognizer(duration: holdDelay), + (recognizer) { + recognizer + ..onLongPressStart = ((_) => onHold?.call(true)) + ..onLongPressEnd = ((_) => onHold?.call(false)) + ..onLongPressCancel = (() => onHold?.call(false)); + }, + ), + }, + child: child, + ); + } + + Widget _background(StorySlide slide) { + final video = this.video; + if (video != null && video.value.isInitialized) { + final size = video.value.size; + return FittedBox( + fit: BoxFit.contain, + child: SizedBox( + width: size.width, + height: size.height, + child: VideoPlayer(video), + ), + ); + } + final url = storyMediaOf(slide) == StoryMedia.video + ? slide.preview + : slide.background; + final image = storyImage(url, config.imageProvider); + if (image == null) return const SizedBox.shrink(); + // Своя картинка на каждый заход: без gaplessPlayback под текстом нового слайда не + // остаётся фото прошлого. + return Image( + key: ValueKey('${slide.id}-$generation'), + image: image, + fit: BoxFit.contain, + errorBuilder: (context, error, stackTrace) => const SizedBox.shrink(), + ); + } + + Widget _scrim(StorySlide slide) { + final shade = const Color( + 0xFF000000, + ).withValues(alpha: storyScrimOpacity(slide)); + const clear = Color(0x00000000); + return IgnorePointer( + child: DecoratedBox( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [shade, clear, clear, shade], + stops: const [0, 0.21, 0.86, 1], + ), + ), + ), + ); + } + + Widget _retryButton() => PersonalizationButton( + label: config.retryText, + size: PersonalizationButtonSize.md, + iconBuilder: config.iconBuilder, + onPressed: onRetry, + ); + + Widget _navigation() { + Widget header(double value) => PersonalizationStoryNavigation( + count: story.slides.length, + current: slideIndex, + progress: value, + onClose: onClose, + closeLabel: config.closeLabel, + iconBuilder: config.iconBuilder, + ); + final progress = this.progress; + if (progress == null) return header(0); + return ValueListenableBuilder( + valueListenable: progress, + builder: (context, value, _) => header(value), + ); + } + + /// Кнопка звука — только у видео. + Widget? _sound(StorySlide slide) { + if (storyMediaOf(slide) != StoryMedia.video) return null; + return PersonalizationStorySoundButton( + muted: muted, + onPressed: onToggleMute, + soundOnLabel: config.soundOnLabel, + soundOffLabel: config.soundOffLabel, + iconBuilder: config.iconBuilder, + ); + } + + // --- Содержимое --------------------------------------------------------------------- + + Widget _primaryButtons(List buttons) => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + for (final button in buttons) + Padding( + padding: const EdgeInsets.only(top: 16), + child: PersonalizationButton( + label: button.title, + iconBuilder: config.iconBuilder, + onPressed: live ? () => onButton?.call(button) : null, + ), + ), + ], + ); + + /// Нижняя строка: «Используемые товары» со звуком в начале или только звук. Под + /// раскрытой шторкой — подложка: тап мимо шторки её закрывает и никуда не листает. + List _bottomRow(StorySlide slide) { + final products = storyProducts(slide); + final sound = _sound(slide); + if (products == null && sound == null) return const []; + final Widget row; + if (products == null) { + row = SizedBox( + height: 64, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Align( + alignment: AlignmentDirectional.centerStart, + child: sound, + ), + ), + ); + } else { + final byId = { + for (final product in products.products) product.id: product, + }; + row = PersonalizationStoryUsedProducts( + products: [ + for (final product in products.products) + storyCardProduct(product, config.imageProvider), + ], + showText: products.showLabel.isNotEmpty + ? products.showLabel + : config.showProductsText, + hideText: products.hideLabel.isNotEmpty + ? products.hideLabel + : config.hideProductsText, + expanded: sheetOpen, + onExpandedChanged: live ? onSheet : null, + onProductTap: (card) { + final product = byId[card.id]; + if (live && product != null) onProduct?.call(product); + }, + leading: sound, + iconBuilder: config.iconBuilder, + ); + } + return [ + if (sheetOpen) + Positioned.fill( + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => onSheet?.call(false), + onLongPress: () {}, + onVerticalDragStart: (_) {}, + onHorizontalDragStart: (_) {}, + ), + ), + Positioned(left: 0, right: 0, bottom: 0, child: row), + ]; + } + + bool _hasRow(StorySlide slide) => + storyProducts(slide) != null || _sound(slide) != null; + + Widget _mediaContent(BuildContext context, StorySlide slide) { + final texts = storyTextBlocks(slide); + final buttons = storyButtons(slide); + return LayoutBuilder( + builder: (context, constraints) => Stack( + fit: StackFit.expand, + children: [ + for (final text in texts) + Positioned( + left: 16, + right: 16, + top: constraints.maxHeight * text.yOffset.clamp(0, 100) / 100, + child: _textBlock(context, text), + ), + Positioned(left: 16, top: 16, right: 16, child: _navigation()), + Positioned( + left: 16, + right: 16, + bottom: _hasRow(slide) ? 64 : 16, + child: _primaryButtons(buttons), + ), + ..._bottomRow(slide), + ], + ), + ); + } + + Widget _textBlock(BuildContext context, StoryTextBlockElement element) { + final block = storyTextBlock(element); + final code = element.promocode; + if (code == null || !live) return block; + // Блок с промокодом копирует его: тост сверху и `click` в трекинг. + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + Clipboard.setData(ClipboardData(text: code)); + PersonalizationToast.show( + context, + config.promoCopiedText, + position: config.promoToastPosition, + ); + onPromoCopied?.call(code); + }, + child: block, + ); + } + + /// Товарный слайд: шапка (бренд SemiBold 20, название SemiBold 16, межстрочный 140%, + /// шаг 8), белая карточка картинки (скругление 12, поля 16, квадрат по ширине — на + /// низком экране ужимается), цена, кнопки слайда; без своих кнопок — одна + /// [PersonalizationStoryViewer.productButtonText], ведёт к товару. + Widget _productContent( + BuildContext context, + StorySlide slide, + StoryProductElement element, + ) { + final product = element.item!; + final theme = PersonalizationTheme.of(context); + final colors = theme.colors; + final price = storyPriceOf(product); + final image = storyImage(product.image, config.imageProvider); + final buttons = storyButtons(slide); + + TextStyle header(double size) => TextStyle( + fontSize: size, + height: 1.4, + fontWeight: FontWeight.w600, + letterSpacing: 0, + fontFamily: theme.fontFamily.familyFor(FontWeight.w600), + package: theme.fontFamily.package, + color: colors.textPrimary, + ); + + final column = Padding( + padding: EdgeInsets.fromLTRB(16, 16, 16, _hasRow(slide) ? 64 : 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _navigation(), + const SizedBox(height: 16), + if (product.brand.isNotEmpty) ...[ + Text( + product.brand, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: header(20), + ), + const SizedBox(height: 8), + ], + Text( + product.name, + maxLines: 4, + overflow: TextOverflow.ellipsis, + style: header(16), + ), + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 16), + child: Center( + child: AspectRatio( + aspectRatio: 1, + child: GestureDetector( + onTap: live ? () => onProduct?.call(product) : null, + child: DecoratedBox( + decoration: BoxDecoration( + color: const Color(0xFFFFFFFF), + borderRadius: BorderRadius.circular(12), + ), + child: Padding( + padding: const EdgeInsets.all(16), + child: image == null + ? null + : Image(image: image, fit: BoxFit.contain), + ), + ), + ), + ), + ), + ), + ), + PersonalizationStoryPrice( + type: price.type, + price: price.price, + oldPrice: price.oldPrice, + discount: price.discount, + promoCode: price.promoCode, + promoCaption: storyPromoCaption(element, config.promoCaption), + copiedText: config.promoCopiedText, + copiedToastPosition: config.promoToastPosition, + onPromoCopied: live ? onPromoCopied : null, + iconBuilder: config.iconBuilder, + ), + if (buttons.isNotEmpty) + _primaryButtons(buttons) + else + Padding( + padding: const EdgeInsets.only(top: 16), + child: PersonalizationButton( + label: config.productButtonText, + iconBuilder: config.iconBuilder, + onPressed: live ? () => onProduct?.call(product) : null, + ), + ), + ], + ), + ); + return Stack( + fit: StackFit.expand, + children: [column, ..._bottomRow(slide)], + ); + } +} diff --git a/lib/src/ui/widgets/stories_support.dart b/lib/src/ui/widgets/stories_support.dart index 9dba867..c849302 100644 --- a/lib/src/ui/widgets/stories_support.dart +++ b/lib/src/ui/widgets/stories_support.dart @@ -32,11 +32,103 @@ Color? parseStoryColor(String value, {double opacity = 1}) { return color.withValues(alpha: color.a * opacity.clamp(0, 1)); } +/// Что слайд показывает фоном. +enum StoryMedia { + /// Ничего: фон Background/Card темы приложения. + none, + + /// Фото. + image, + + /// Видео; постер — `preview`. + video, +} + +/// Медиа слайда решает непустой `background`, а не тип слайда: товарный слайд с фото — +/// тоже медиа-слайд, а `image` без адреса — нет. +StoryMedia storyMediaOf(StorySlide slide) { + if (slide.background.trim().isEmpty) return StoryMedia.none; + return slide.type == StorySlideType.video + ? StoryMedia.video + : StoryMedia.image; +} + +/// Цвет полей вокруг вписанного медиа: `background_color` слайда, без него чёрный. Это +/// единственное место, где цвет админки идёт в дело: слайд без медиа всегда на +/// Background/Card. +Color storyLetterbox(StorySlide slide) => + parseStoryColor(slide.backgroundColor) ?? const Color(0xFF000000); + +/// Текстовые блоки, которые рисуются: пустые и из одних пробелов пропускаются. +List storyTextBlocks(StorySlide slide) => + [ + for (final element in slide.elements) + if (element is StoryTextBlockElement && element.text.trim().isNotEmpty) + element, + ]; + +/// Кнопки слайда с подписью — по порядку. +List storyButtons(StorySlide slide) => [ + for (final element in slide.elements) + if (element is StoryButtonElement && element.title.trim().isNotEmpty) + element, +]; + +/// Элемент товара товарного слайда (с самим товаром); нет — `null`. +StoryProductElement? storyProductElement(StorySlide slide) { + for (final element in slide.elements) { + if (element is StoryProductElement && element.item != null) return element; + } + return null; +} + +/// Элемент «Используемые товары» с непустым списком; нет — `null`. +StoryProductsElement? storyProducts(StorySlide slide) { + for (final element in slide.elements) { + if (element is StoryProductsElement && element.products.isNotEmpty) { + return element; + } + } + return null; +} + +/// Плотность затемнения сверху и снизу. Оно есть на каждом слайде: 50% — только у +/// медиа без товара и без непустых текстов (голое фото или видео), иначе 30%. +double storyScrimOpacity(StorySlide slide) => + storyMediaOf(slide) != StoryMedia.none && + storyProductElement(slide) == null && + storyTextBlocks(slide).isEmpty + ? 0.5 + : 0.3; + +/// Трекается ли id: только целые положительные числа. Динамические слайды (`39_0`) API +/// трекинга не принимает — они пропускаются молча на всех платформах. +bool storyTrackableId(String id) { + final trimmed = id.trim(); + if (!RegExp(r'^\d+$').hasMatch(trimmed)) return false; + final number = int.tryParse(trimmed); + return number != null && number > 0; +} + +/// Процент без лишних нулей: `10` → «10%», `12.5` → «12.5%». +String storyPercent(double value) { + final text = value == value.roundToDouble() + ? value.toStringAsFixed(0) + : value.toString(); + return '$text%'; +} + /// Цена товара для [PersonalizationStoryPrice]: вид блока и его строки. /// -/// Есть промокод — вид promoCode, цена с промокодом (`price_with_promocode_formatted`, -/// без неё обычная); иначе скидка больше нуля — вид discount («N%»); иначе просто цена. -/// Старая цена — когда она выше текущей. +/// - Промокод — вид promoCode: крупно цена с промокодом +/// (`price_with_promocode_formatted`, без неё обычная); зачёркнута старая цена, если +/// она есть, иначе обычная цена, если она отличается от цены с промокодом. +/// - Иначе скидка больше нуля — вид discount с процентом `discount_percent` (дробный +/// остаётся дробным: «12.5%»). +/// - Иначе просто цена. +/// +/// Старая цена показывается, только если она численно больше цены; числа читаются +/// десятичными, не целыми. ({ PersonalizationStoryPriceType type, String price, @@ -45,17 +137,22 @@ Color? parseStoryColor(String value, {double opacity = 1}) { String? promoCode, }) storyPriceOf(StoryProduct product) { - final oldPrice = product.hasOldPrice ? product.oldPriceFormatted : null; - final price = product.priceFormatted.isNotEmpty + final regular = product.priceFormatted.isNotEmpty ? product.priceFormatted : _plainPrice(product); + final oldPrice = product.hasOldPrice ? product.oldPriceFormatted : null; if (product.promocode.isNotEmpty) { + final promoPrice = product.priceWithPromocodeFormatted.isNotEmpty + ? product.priceWithPromocodeFormatted + : regular; + // Числом сравниваем, когда сервер прислал цену с промокодом числом; иначе — текстом. + final cheaper = product.priceWithPromocode > 0 + ? product.price > product.priceWithPromocode + : promoPrice != regular; return ( type: PersonalizationStoryPriceType.promoCode, - price: product.priceWithPromocodeFormatted.isNotEmpty - ? product.priceWithPromocodeFormatted - : price, - oldPrice: oldPrice, + price: promoPrice, + oldPrice: oldPrice ?? (cheaper ? regular : null), discount: null, promoCode: product.promocode, ); @@ -63,15 +160,15 @@ storyPriceOf(StoryProduct product) { if (product.discountPercent > 0) { return ( type: PersonalizationStoryPriceType.discount, - price: price, + price: regular, oldPrice: oldPrice, - discount: '${product.discountPercent}%', + discount: storyPercent(product.discountPercent), promoCode: null, ); } return ( type: PersonalizationStoryPriceType.price, - price: price, + price: regular, oldPrice: oldPrice, discount: null, promoCode: null, @@ -85,6 +182,12 @@ String _plainPrice(StoryProduct product) { return '$amount ${product.currency}'.trim(); } +/// Подпись над промокодом: `title` элемента товара из админки; пустой — текст хоста. +String storyPromoCaption(StoryProductElement? element, String fallback) { + final title = element?.title.trim() ?? ''; + return title.isNotEmpty ? title : fallback; +} + /// Товар сторис → данные карточки кита для карусели товаров слайда. PersonalizationProduct storyCardProduct( StoryProduct product, @@ -101,7 +204,7 @@ PersonalizationProduct storyCardProduct( brand: product.brand.isEmpty ? null : product.brand, oldPrice: hasOldPrice ? product.oldPriceFormatted : null, discount: hasOldPrice && product.discountPercent > 0 - ? '-${product.discountPercent}%' + ? '-${storyPercent(product.discountPercent)}' : null, ); } @@ -126,11 +229,27 @@ String storyProductLink(StoryProduct product) { return own.isNotEmpty ? own : product.url; } +/// Куда ведёт кнопка товарного слайда: своя ссылка кнопки (платформенная, затем общая), +/// без неё — товар слайда (диплинк, затем `url`). +String storySlideButtonLink(StoryButtonElement button, StoryProduct? product) { + final own = storyButtonLink(button); + if (own.isNotEmpty || product == null) return own; + return storyProductLink(product); +} + +/// Выключка текстового блока: `left`/`start` — к началу строки, `center` — по центру, +/// `right`/`end` — к концу (для RTL зеркально). +TextAlign storyTextAlign(String value) => switch (value.trim().toLowerCase()) { + 'center' => TextAlign.center, + 'right' || 'end' => TextAlign.end, + _ => TextAlign.start, +}; + /// Текстовый блок сервера → [PersonalizationStoryTextBlock]. /// /// Шрифт `serif` / `monospaced` — системные семейства с запасными для iOS, где имён -/// `serif` и `monospace` нет; `sans-serif` и пусто — шрифт темы. Интерлиньяж 0 — свой -/// у шрифта. +/// `serif` и `monospace` нет; `sans-serif` и пусто — шрифт темы. Межстрочный не задан — +/// заготовка макета для этого кегля ([PersonalizationStoryTextBlock.presetLineHeight]). PersonalizationStoryTextBlock storyTextBlock(StoryTextBlockElement element) { final (family, fallback) = switch (element.fontType) { 'serif' => ('serif', const ['Georgia', 'Times New Roman']), @@ -140,7 +259,9 @@ PersonalizationStoryTextBlock storyTextBlock(StoryTextBlockElement element) { return PersonalizationStoryTextBlock( text: element.text, fontSize: element.fontSize, - lineHeight: element.lineSpacing > 0 ? element.lineSpacing : null, + lineHeight: element.lineSpacing > 0 + ? element.lineSpacing + : PersonalizationStoryTextBlock.presetLineHeight(element.fontSize), color: parseStoryColor(element.textColor), background: element.backgroundOpacity > 0 ? parseStoryColor( @@ -148,11 +269,7 @@ PersonalizationStoryTextBlock storyTextBlock(StoryTextBlockElement element) { opacity: element.backgroundOpacity, ) : null, - textAlign: switch (element.textAlign) { - 'center' => TextAlign.center, - 'right' => TextAlign.end, - _ => TextAlign.start, - }, + textAlign: storyTextAlign(element.textAlign), bold: element.bold, italic: element.italic, fontFamily: family, diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index dc1294f..6e6dc88 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:rees46_sdk/rees46_sdk.dart'; import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; import 'package:rees46_sdk/src/ui/personalization_ui.dart'; -import 'package:rees46_sdk/src/ui/widgets/stories_support.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_seen_store.dart'; /// A 1×1 transparent PNG: slides and covers need an image that loads offline. final ImageProvider _pixel = MemoryImage( @@ -23,54 +23,48 @@ final ImageProvider _pixel = MemoryImage( ImageProvider _offline(String url) => _pixel; -StoryProduct _product({ - String promocode = '', - int discountPercent = 0, - double oldPrice = 0, -}) => StoryProduct( - id: 'p1', - name: 'Laptop', - brand: 'Apple', - price: 1190900, - priceFormatted: '1 190 900 ₽', - oldPrice: oldPrice, - oldPriceFormatted: oldPrice > 0 ? '245 000 ₽' : '', - discountPercent: discountPercent, - promocode: promocode, - priceWithPromocodeFormatted: promocode.isEmpty ? '' : '1 000 000 ₽', - url: 'https://shop.example/p1', -); +/// A product slide (no background: no media to wait for) with numeric id [id]. +Map _productSlide( + Object id, + int product, { + Object? button, +}) => { + 'id': id, + 'duration': 1, + 'type': '', + 'elements': >[ + if (button != null) {'type': 'button', ...?button as Map?}, + { + 'type': 'product', + 'item': { + 'id': 'p$product', + 'name': 'Product $product', + 'price': 100, + 'price_formatted': '100 ₽', + 'picture': 'https://cdn.example/p$product.jpg', + 'url': 'https://shop.example/p$product', + }, + }, + ], +}; -/// A block of two one-slide product stories, one second each. -String _blockJson() => jsonEncode({ +/// Story 1: slides 10 and 11; story 2: slide 20. One second each. +String _blockJson({Object slideOne = 10}) => jsonEncode({ 'id': 1, 'stories': >[ - for (final id in [1, 2]) - { - 'id': id, - 'name': 'Story $id', - 'avatar': 'https://cdn.example/$id.jpg', - 'slides': >[ - { - 'id': '${id}_0', - 'duration': 1, - 'type': '', - 'elements': >[ - { - 'type': 'product', - 'item': { - 'id': 'p$id', - 'name': 'Product $id', - 'price': 100, - 'price_formatted': '100 ₽', - 'picture': 'https://cdn.example/p$id.jpg', - 'url': 'https://shop.example/p$id', - }, - }, - ], - }, - ], - }, + { + 'id': 1, + 'name': 'Story 1', + 'avatar': 'https://cdn.example/1.jpg', + 'slides': [_productSlide(slideOne, 1), _productSlide(11, 1)], + }, + { + 'id': 2, + 'name': 'Story 2', + 'avatar': 'https://cdn.example/2.jpg', + 'slides': [_productSlide(20, 2)], + }, + {'id': 3, 'name': 'No slides', 'slides': []}, ], }); @@ -82,6 +76,8 @@ class _FakeHostApi extends pigeon.PersonalizationHostApi { Completer? hold; final List views = []; final List clicks = []; + final List stored = []; + Map> seen = >{}; @override Future getStories(String code, String? shopId) async { @@ -91,6 +87,16 @@ class _FakeHostApi extends pigeon.PersonalizationHostApi { return json; } + @override + Future>> getStoriesSeen(String shop) async => seen; + + @override + Future setStorySlideSeen( + String shop, + String storyId, + String slideId, + ) async => stored.add('$storyId/$slideId'); + @override Future trackStoryView( String storyId, @@ -117,64 +123,43 @@ Widget _host(Widget child) => MaterialApp( ), ); -void main() { - group('storyPriceOf', () { - test('promo code wins over discount, discount over plain price', () { - final promo = storyPriceOf( - _product(promocode: 'PROMO', discountPercent: 10, oldPrice: 245000), - ); - expect(promo.type, PersonalizationStoryPriceType.promoCode); - expect(promo.price, '1 000 000 ₽', reason: 'the price with the code'); - expect(promo.promoCode, 'PROMO'); - - final discount = storyPriceOf(_product(discountPercent: 10)); - expect(discount.type, PersonalizationStoryPriceType.discount); - expect(discount.discount, '10%'); - expect(discount.price, '1 190 900 ₽'); - - final plain = storyPriceOf(_product()); - expect(plain.type, PersonalizationStoryPriceType.price); - expect(plain.discount, isNull); - expect(plain.promoCode, isNull); - }); +PersonalizationStoryPreview _preview(WidgetTester tester, String label) => + tester.widget( + find.ancestor( + of: find.text(label), + matching: find.byType(PersonalizationStoryPreview), + ), + ); + +/// Taps the cover [label] and lets the viewer route come in. +Future _openStory(WidgetTester tester, String label) async { + await tester.tap(find.text(label)); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); + await tester.pump(); +} - test('the old price shows only when it is above the price', () { - expect(storyPriceOf(_product(oldPrice: 245000)).oldPrice, isNull); - expect(storyPriceOf(_product(oldPrice: 2000000)).oldPrice, '245 000 ₽'); - }); - }); +/// Lets [time] pass in 100 ms frames: the slide clock takes at most a second per frame, +/// as a real device delivers frames far more often. +Future _wait(WidgetTester tester, Duration time) async { + for (var left = time; left > Duration.zero; left -= _frame) { + await tester.pump(left < _frame ? left : _frame); + } +} - group('storyTextBlock', () { - test('a server block maps opacity, alignment and font', () { - final solid = storyTextBlock( - const StoryTextBlockElement( - text: 'Sale', - fontSize: 24, - fontType: 'serif', - textAlign: 'center', - backgroundColor: '#16AE13', - backgroundOpacity: 0.4, - ), - ); - expect(solid.solid, isTrue); - expect(solid.background!.a, closeTo(0.4, 0.01)); - expect(solid.textAlign, TextAlign.center); - expect(solid.fontFamily, 'serif'); - expect(solid.fontSize, 24); - - final clear = storyTextBlock( - const StoryTextBlockElement( - text: 'Sale', - backgroundColor: '#16AE13', - backgroundOpacity: 0, - ), - ); - expect(clear.solid, isFalse); - }); - }); +const Duration _frame = Duration(milliseconds: 100); + +/// Lets the viewer route go away. +Future _closed(WidgetTester tester) async { + await tester.pump(); + await tester.pump(const Duration(milliseconds: 300)); +} + +void main() { + setUp(() => StoriesSeenStore.instance = StoriesSeenStore()); group('PersonalizationStoryViewer', () { - /// One story: two image slides, a text block on the first. + /// One story: two image slides, a text block on each, products on the first. final story = Story.fromJson({ 'id': 7, 'name': 'Media', @@ -192,12 +177,19 @@ void main() { 'text_input': 'Slide $id', 'y_offset': 30, }, + if (id == 70) + { + 'type': 'products', + 'products': >[ + {'id': 'm1', 'name': 'Mouse', 'price': 1}, + ], + }, ], }, ], }); - Future> open(WidgetTester tester) async { + Future<_FakeHostApi> open(WidgetTester tester) async { final api = _FakeHostApi(null); await tester.pumpWidget( MaterialApp( @@ -221,7 +213,12 @@ void main() { ); await tester.pump(); await tester.pump(); - return api.views; + return api; + } + + Offset at(WidgetTester tester, double x) { + final size = tester.getSize(find.byType(PersonalizationStoryViewer)); + return Offset(size.width * x, size.height / 2); } testWidgets('media slides take the dark tokens in a light app', ( @@ -230,184 +227,229 @@ void main() { await open(tester); final text = tester.widget(find.text('Slide 70')); expect(text.style!.color, PersonalizationColors.dark.textPrimary); - final fill = tester - .widgetList( - find.descendant( - of: find.byType(PersonalizationStoryProgress), - matching: find.byType(ColoredBox), - ), - ) - .last; - expect(fill.color, PersonalizationColors.dark.textSecondary); }); - testWidgets('taps move between slides, holding pauses', (tester) async { - final views = await open(tester); - expect(views, ['7/70/block']); + testWidgets('thirds: back, nothing, next; a hold pauses, never moves', ( + tester, + ) async { + final api = await open(tester); + expect(api.views, ['7/70/block']); - final size = tester.getSize(find.byType(PersonalizationStoryViewer)); - // Right two thirds: the next slide. - await tester.tapAt(Offset(size.width * 0.8, size.height / 2)); + await tester.tapAt(at(tester, 0.5)); await tester.pump(); + expect(find.text('Slide 70'), findsOneWidget, reason: 'the centre'); + + await tester.tapAt(at(tester, 0.8)); await tester.pump(); expect(find.text('Slide 71'), findsOneWidget); - expect(views, ['7/70/block', '7/71/block']); + expect(api.views, ['7/70/block', '7/71/block']); - // Left third: back. - await tester.tapAt(Offset(size.width * 0.1, size.height / 2)); - await tester.pump(); + await tester.tapAt(at(tester, 0.1)); await tester.pump(); expect(find.text('Slide 70'), findsOneWidget); - // Held longer than the slide lasts: still there. - final hold = await tester.startGesture( - Offset(size.width / 2, size.height / 2), - ); - await tester.pump(const Duration(seconds: 1)); - await tester.pump(const Duration(seconds: 6)); + // Held on the right third longer than the slide lasts: still there. + final hold = await tester.startGesture(at(tester, 0.8)); + await tester.pump(const Duration(milliseconds: 300)); + await _wait(tester, const Duration(seconds: 6)); expect(find.text('Slide 70'), findsOneWidget); await hold.up(); await tester.pump(); - await tester.pump(const Duration(seconds: 6)); + expect(find.text('Slide 70'), findsOneWidget, reason: 'release stays'); + await _wait(tester, const Duration(seconds: 5)); + await tester.pump(); + expect(find.text('Slide 71'), findsOneWidget); + }); + + testWidgets('in the background the clock stands still', (tester) async { + await open(tester); + tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.paused); + await _wait(tester, const Duration(seconds: 30)); + tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.resumed); + await tester.pump(); + expect(find.text('Slide 70'), findsOneWidget); + await _wait(tester, const Duration(seconds: 6)); + await tester.pump(); expect(find.text('Slide 71'), findsOneWidget); }); + + testWidgets('the open sheet pauses; a tap outside only closes it', ( + tester, + ) async { + await open(tester); + await tester.tap(find.text('Used products')); + await tester.pump(); + expect(find.text('Hide products'), findsOneWidget); + await _wait(tester, const Duration(seconds: 10)); + expect(find.text('Slide 70'), findsOneWidget, reason: 'paused'); + + // Above the sheet, on the right third. + await tester.tapAt(at(tester, 0.9) - const Offset(0, 200)); + await tester.pump(); + expect(find.text('Used products'), findsOneWidget, reason: 'closed'); + expect(find.text('Slide 70'), findsOneWidget, reason: 'no navigation'); + }); }); group('PersonalizationStories', () { - testWidgets('skeletons while loading, hidden when empty', (tester) async { - final api = _FakeHostApi(jsonEncode({'stories': []})) - ..hold = Completer(); + Future<_FakeHostApi> bar( + WidgetTester tester, { + _FakeHostApi? api, + PersonalizationStoriesController? controller, + ValueChanged? onLink, + List? errors, + String code = 'block', + }) async { + final host = api ?? _FakeHostApi(_blockJson()); await tester.pumpWidget( _host( PersonalizationStories( - code: 'block', - sdk: PersonalizationSdk(api: api), + code: code, + sdk: PersonalizationSdk(api: host, shopId: 'shop'), + controller: controller, + imageProvider: _offline, + productButtonText: 'Open', + onLinkClick: onLink, + onProductClick: (product) => onLink?.call('product:${product.id}'), + onError: errors?.add, ), ), ); - final skeletons = find.byWidgetPredicate( - (widget) => - widget is PersonalizationStoryPreview && - widget.state == PersonalizationStoryCoverState.skeleton, - ); - expect(skeletons, findsNWidgets(4)); - - api.hold!.complete(); await tester.pump(); await tester.pump(); - expect(find.byType(PersonalizationStoriesBar), findsNothing); - }); + return host; + } - testWidgets('an error hides the block and reaches onError', (tester) async { - final errors = []; + testWidgets('skeletons while loading, hidden when empty', (tester) async { + final api = _FakeHostApi(jsonEncode({'stories': []})) + ..hold = Completer(); await tester.pumpWidget( _host( PersonalizationStories( code: 'block', - sdk: PersonalizationSdk(api: _FakeHostApi(null)), - onError: errors.add, + sdk: PersonalizationSdk(api: api), ), ), ); + expect(find.byType(PersonalizationStoryPreview), findsNWidgets(4)); + api.hold!.complete(); await tester.pump(); await tester.pump(); expect(find.byType(PersonalizationStoriesBar), findsNothing); - expect(errors.single, isA()); }); - testWidgets('a story played to the end turns viewed in the bar', ( + testWidgets('errors, a missing code and a slow load reach onError', ( tester, ) async { - final api = _FakeHostApi(_blockJson()); - await tester.pumpWidget( - _host( - PersonalizationStories( - code: 'block', - sdk: PersonalizationSdk(api: api), - imageProvider: _offline, - ), - ), - ); - await tester.pump(); + final errors = []; + await bar(tester, api: _FakeHostApi(null), errors: errors); + expect(find.byType(PersonalizationStoriesBar), findsNothing); + expect(errors.single, isA()); + + errors.clear(); + await bar(tester, errors: errors, code: ''); + expect(errors.single, isA()); + + errors.clear(); + final slow = _FakeHostApi(_blockJson())..hold = Completer(); + await bar(tester, api: slow, errors: errors); + expect(find.byType(PersonalizationStoryPreview), findsNWidgets(4)); + await tester.pump(PersonalizationStories.loadTimeout); await tester.pump(); + expect(errors.single, isA()); + expect(find.byType(PersonalizationStoriesBar), findsNothing); + }); - PersonalizationStoryPreview preview(String label) => - tester.widget( - find.ancestor( - of: find.text(label), - matching: find.byType(PersonalizationStoryPreview), - ), - ); - expect(preview('Story 2').state, PersonalizationStoryCoverState.unviewed); - expect(preview('Story 2').segments, 1); - - // Open the last story: its only slide plays, then the viewer closes. - await tester.tap(find.text('Story 2')); - await tester.pump(); // route pushed - await tester.pump(const Duration(milliseconds: 300)); // transition - expect(find.byType(PersonalizationStoryViewer), findsOneWidget); - expect(find.text('Product 2'), findsOneWidget); - expect(find.text('More info'), findsOneWidget); - // A product slide sits on Background/Card of the app theme. - expect( - find.descendant( - of: find.byType(PersonalizationStoryViewer), - matching: find.byWidgetPredicate( - (widget) => - widget is ColoredBox && - widget.color == PersonalizationColors.light.backgroundCard, - ), - ), - findsWidgets, + testWidgets('seen slides persist, light the ring, pick the start', ( + tester, + ) async { + final api = await bar( + tester, + api: _FakeHostApi(_blockJson()) + ..seen = >{ + '1': ['11'], + }, ); - expect(api.views, ['2/2_0/block']); + expect(find.text('No slides'), findsNothing); + expect(_preview(tester, 'Story 1').seenSegments, {1}); - await tester.pump(const Duration(milliseconds: 1100)); // the slide - await tester.pump(const Duration(milliseconds: 300)); // pop transition - expect(find.byType(PersonalizationStoryViewer), findsNothing); + await _openStory(tester, 'Story 1'); + expect(find.text('Product 1'), findsOneWidget); + expect(api.views, ['1/10/block'], reason: 'the first unseen'); + expect(api.stored, ['1/10']); - expect(preview('Story 2').state, PersonalizationStoryCoverState.viewed); - expect(preview('Story 2').seenSegments, 1); - expect(preview('Story 1').state, PersonalizationStoryCoverState.unviewed); + // Both slides seen: the story is viewed. Then story 2 plays to the end. + await _wait(tester, const Duration(seconds: 4)); + await _closed(tester); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + expect(api.views, ['1/10/block', '1/11/block', '2/20/block']); + expect( + _preview(tester, 'Story 1').state, + PersonalizationStoryCoverState.viewed, + ); + expect( + _preview(tester, 'Story 2').state, + PersonalizationStoryCoverState.viewed, + ); }); - testWidgets('the button tracks a click and hands the link to the host', ( + testWidgets('a button closes the viewer, then hands over the link', ( tester, ) async { - final api = _FakeHostApi(_blockJson()); final links = []; - await tester.pumpWidget( - _host( - PersonalizationStories( - code: 'block', - sdk: PersonalizationSdk(api: api), - imageProvider: _offline, - moreInfoText: 'Open', - onLinkClick: links.add, - ), - ), - ); - await tester.pump(); - await tester.pump(); - await tester.tap(find.text('Story 1')); - await tester.pump(); - await tester.pump(const Duration(milliseconds: 300)); - + final api = await bar(tester, onLink: links.add); + await _openStory(tester, 'Story 2'); await tester.tap(find.text('Open')); - await tester.pump(); - expect(api.clicks, ['1/1_0/block']); - // No button on the slide: the product's own link. - expect(links, ['https://shop.example/p1']); - // Close with the cross before the slide runs out. - await tester.tap( - find.descendant( - of: find.byType(PersonalizationStoryNavigation), - matching: find.byType(GestureDetector), - ), + expect(links, ['product:p2']); + expect(api.clicks, ['2/20/block']); + await _closed(tester); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + }); + + testWidgets('dynamic slide ids are not tracked', (tester) async { + final api = await bar( + tester, + api: _FakeHostApi(_blockJson(slideOne: '1_0')), ); - await tester.pump(); - await tester.pump(const Duration(milliseconds: 300)); + await _openStory(tester, 'Story 1'); + expect(api.views, isEmpty); + expect(api.stored, ['1/1_0'], reason: 'still seen locally'); + }); + + testWidgets('the controller opens a story and pauses it', (tester) async { + final controller = PersonalizationStoriesController(); + final api = await bar(tester, controller: controller); + unawaited(controller.openStory('2')); + await _closed(tester); + expect(find.text('Product 2'), findsOneWidget); + controller.pause(); + await _wait(tester, const Duration(seconds: 3)); + expect(find.text('Product 2'), findsOneWidget); + controller.resume(); + await _wait(tester, const Duration(seconds: 2)); + await _closed(tester); expect(find.byType(PersonalizationStoryViewer), findsNothing); + expect(api.views, ['2/20/block']); + }); + + testWidgets('show() opens a block without the bar', (tester) async { + final api = _FakeHostApi(_blockJson()); + await tester.pumpWidget(_host(const Placeholder())); + final context = tester.element(find.byType(Placeholder)); + var done = false; + PersonalizationStories.show( + context, + code: 'block', + sdk: PersonalizationSdk(api: api, shopId: 'shop'), + startStoryId: '2', + imageProvider: _offline, + ).then((_) => done = true); + await tester.pump(); + await _closed(tester); + expect(find.text('Product 2'), findsOneWidget); + await _wait(tester, const Duration(seconds: 2)); + await _closed(tester); + expect(done, isTrue); }); }); } diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart index 1602e70..68dac9f 100644 --- a/test/ui/personalization_story_components_test.dart +++ b/test/ui/personalization_story_components_test.dart @@ -277,7 +277,44 @@ void main() { }); }); - testWidgets('a viewed cover rings solid; a pinned one keeps its segments', ( + test('ring colours: viewed solid, pinned always warning, seen by index', () { + const c = PersonalizationColors.light; + List ring( + PersonalizationStoryCoverState state, { + bool pinned = false, + Set seen = const {}, + }) => PersonalizationStoryCover.ringColors( + c, + state: state, + pinned: pinned, + segments: 4, + seen: seen, + ); + + expect(ring(PersonalizationStoryCoverState.viewed), [c.neutralSubtle]); + expect( + ring(PersonalizationStoryCoverState.viewed, pinned: true, seen: {0, 1}), + [c.semanticWarning], + reason: 'a fully viewed pinned story: a plain warning ring', + ); + expect(ring(PersonalizationStoryCoverState.unviewed, seen: {1, 3}), [ + c.buttonPrimary, + c.buttonPrimaryDisabled, + c.buttonPrimary, + c.buttonPrimaryDisabled, + ]); + expect( + ring(PersonalizationStoryCoverState.unviewed, pinned: true, seen: {0}), + [ + c.buttonPrimaryDisabled, + c.semanticWarning, + c.semanticWarning, + c.semanticWarning, + ], + ); + }); + + testWidgets('a viewed cover rings solid; a partly seen one in arcs', ( tester, ) async { const light = PersonalizationColors.light; @@ -302,40 +339,30 @@ void main() { alignment: Alignment.topLeft, child: PersonalizationStoryCover( state: PersonalizationStoryCoverState.viewed, + pinned: true, segments: 5, - seenSegments: 2, + seenSegments: {0, 1, 2, 3, 4}, ), ), ), ); - expect(ring(), paints..something(drawn(#drawOval, light.neutralSubtle))); + expect(ring(), paints..something(drawn(#drawOval, light.semanticWarning))); expect(ring(), isNot(paints..arc())); await tester.pumpWidget( _host( const Align( alignment: Alignment.topLeft, - child: PersonalizationStoryCover( - state: PersonalizationStoryCoverState.viewed, - pinned: true, - segments: 5, - seenSegments: 2, - ), + child: PersonalizationStoryCover(segments: 3, seenSegments: {2}), ), ), ); expect( ring(), paints - ..something(drawn(#drawArc, light.buttonPrimaryDisabled)) - ..something(drawn(#drawArc, light.buttonPrimaryDisabled)) - ..something(drawn(#drawArc, light.semanticWarning)) - ..something(drawn(#drawArc, light.semanticWarning)) - ..something(drawn(#drawArc, light.semanticWarning)), - ); - expect( - ring(), - isNot(paints..something(drawn(#drawOval, light.neutralSubtle))), + ..something(drawn(#drawArc, light.buttonPrimary)) + ..something(drawn(#drawArc, light.buttonPrimary)) + ..something(drawn(#drawArc, light.buttonPrimaryDisabled)), ); }); @@ -350,7 +377,7 @@ void main() { label: 'Pinned', pinned: true, segments: 5, - seenSegments: 2, + seenSegments: {0, 1}, ), ), ), @@ -380,6 +407,35 @@ void main() { ); }); + testWidgets('a cover label takes up to two lines, as wide as the cover', ( + tester, + ) async { + await tester.pumpWidget( + _host( + const Align( + alignment: Alignment.topLeft, + child: PersonalizationStoryPreview( + label: 'A label far too long for one line or even two of them', + ), + ), + ), + ); + final text = tester.widget(find.byType(Text)); + expect(text.maxLines, 2); + expect(text.overflow, TextOverflow.ellipsis); + expect(text.textAlign, TextAlign.center); + expect( + tester.getSize(find.byType(PersonalizationStoryPreview)), + const Size(88, 88 + 8 + 32), + ); + }); + + test('a text block without a line spacing takes the preset for its size', () { + expect(PersonalizationStoryTextBlock.presetLineHeight(48), 1); + expect(PersonalizationStoryTextBlock.presetLineHeight(30), 1.2); + expect(PersonalizationStoryTextBlock.presetLineHeight(14), 1.2); + }); + testWidgets('progress fills the passed segments and part of the current', ( tester, ) async { diff --git a/test/ui/stories_mapping_test.dart b/test/ui/stories_mapping_test.dart new file mode 100644 index 0000000..5f3f60d --- /dev/null +++ b/test/ui/stories_mapping_test.dart @@ -0,0 +1,176 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_support.dart'; + +StoryProduct _product({ + String promocode = '', + double discountPercent = 0, + double oldPrice = 0, + String withPromo = '', + double withPromoNumber = 0, +}) => StoryProduct( + id: 'p1', + name: 'Laptop', + price: 1190900, + priceFormatted: '1 190 900 ₽', + oldPrice: oldPrice, + oldPriceFormatted: oldPrice > 0 ? '${oldPrice.toInt()} ₽' : '', + discountPercent: discountPercent, + promocode: promocode, + priceWithPromocode: withPromoNumber, + priceWithPromocodeFormatted: withPromo, + url: 'https://shop.example/p1', + deeplinkAndroid: 'app://p1', +); + +StorySlide _slide({ + StorySlideType type = StorySlideType.image, + String background = 'https://cdn.example/1.jpg', + String color = '', + List elements = const [], +}) => StorySlide( + id: '1', + type: type, + background: background, + backgroundColor: color, + elements: elements, +); + +void main() { + group('price', () { + test('promo code: the promo price, the old price crossed out', () { + final price = storyPriceOf( + _product(promocode: 'P', oldPrice: 2000000, withPromo: '1 000 000 ₽'), + ); + expect(price.type, PersonalizationStoryPriceType.promoCode); + expect(price.price, '1 000 000 ₽'); + expect(price.oldPrice, '2000000 ₽'); + expect(price.promoCode, 'P'); + }); + + test('promo code without an old price crosses out the regular one', () { + final crossed = storyPriceOf( + _product(promocode: 'P', withPromo: '1 000 000 ₽'), + ); + expect(crossed.oldPrice, '1 190 900 ₽'); + final same = storyPriceOf( + _product(promocode: 'P', withPromo: '1 190 900 ₽'), + ); + expect(same.oldPrice, isNull, reason: 'the same price is not crossed'); + final numeric = storyPriceOf( + _product(promocode: 'P', withPromo: 'x', withPromoNumber: 1190900), + ); + expect(numeric.oldPrice, isNull, reason: 'numbers decide when sent'); + }); + + test('discount keeps a fractional percent; old price only if greater', () { + final discount = storyPriceOf(_product(discountPercent: 12.5)); + expect(discount.type, PersonalizationStoryPriceType.discount); + expect(discount.discount, '12.5%'); + expect(storyPriceOf(_product(discountPercent: 10)).discount, '10%'); + expect(storyPriceOf(_product(oldPrice: 245000)).oldPrice, isNull); + expect(storyPriceOf(_product(oldPrice: 2000000)).oldPrice, isNotNull); + }); + }); + + group('slide', () { + test('media is a non-empty background, not the slide type', () { + expect(storyMediaOf(_slide()), StoryMedia.image); + expect(storyMediaOf(_slide(background: ' ')), StoryMedia.none); + expect( + storyMediaOf(_slide(type: StorySlideType.product)), + StoryMedia.image, + ); + expect( + storyMediaOf(_slide(type: StorySlideType.video)), + StoryMedia.video, + ); + }); + + test('the letterbox is background_color, else black', () { + expect(storyLetterbox(_slide(color: '#FF0000')), const Color(0xFFFF0000)); + expect(storyLetterbox(_slide()), const Color(0xFF000000)); + }); + + test('scrim: 50% only on bare media, 30% otherwise', () { + expect(storyScrimOpacity(_slide()), 0.5); + expect( + storyScrimOpacity( + _slide(elements: const [StoryTextBlockElement(text: ' ')]), + ), + 0.5, + reason: 'a blank text block does not count', + ); + expect( + storyScrimOpacity( + _slide(elements: const [StoryTextBlockElement(text: 'Sale')]), + ), + 0.3, + ); + expect( + storyScrimOpacity( + _slide(elements: [StoryProductElement(item: _product())]), + ), + 0.3, + ); + expect(storyScrimOpacity(_slide(background: '')), 0.3); + }); + + test('only positive integer ids are tracked', () { + expect(storyTrackableId('36'), isTrue); + expect(storyTrackableId('39_0'), isFalse); + expect(storyTrackableId('0'), isFalse); + expect(storyTrackableId('-3'), isFalse); + expect(storyTrackableId(''), isFalse); + }); + }); + + group('links and texts', () { + test('a product slide button: its own link first, else the product', () { + debugDefaultTargetPlatformOverride = TargetPlatform.android; + addTearDown(() => debugDefaultTargetPlatformOverride = null); + final product = _product(); + expect( + storySlideButtonLink( + const StoryButtonElement(title: 'Buy', link: 'w', linkAndroid: 'a'), + product, + ), + 'a', + ); + expect( + storySlideButtonLink(const StoryButtonElement(title: 'Buy'), product), + 'app://p1', + ); + }); + + test('promo caption: the admin title, else the host text', () { + expect( + storyPromoCaption(const StoryProductElement(title: 'Code'), 'Promo'), + 'Code', + ); + expect( + storyPromoCaption(const StoryProductElement(title: ' '), 'Promo'), + 'Promo', + ); + }); + + test('text blocks: blank ones skipped, alignment and line height', () { + final slide = _slide( + elements: const [ + StoryTextBlockElement(text: ''), + StoryTextBlockElement(text: 'Big', fontSize: 48, textAlign: 'end'), + ], + ); + final texts = storyTextBlocks(slide); + expect(texts, hasLength(1)); + final block = storyTextBlock(texts.single); + expect(block.textAlign, TextAlign.end); + expect(block.lineHeight, 1); + expect(storyTextAlign('left'), TextAlign.start); + expect(storyTextAlign('right'), TextAlign.end); + expect(storyTextAlign('center'), TextAlign.center); + }); + }); +} From a76ef3c2259f7c2475bc0f4aa15611c690975a38 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:36:37 +0400 Subject: [PATCH 57/79] feat(example): stories v2 round-2 exhibits The live block takes a controller: buttons open the second story and pause it for three seconds, reload the block, and show it without the bar. The sample viewer gains a product slide over a video with two buttons, used products and the sound toggle, a square photo fitted on its letterbox colour, a photo that fails and offers Retry, and a fractional discount. Covers show segments lit by index and a viewed pinned story; a long label takes two lines. --- example/lib/ui_kit_pane.dart | 227 ++++++++++++++++++++++++++--------- 1 file changed, 173 insertions(+), 54 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index 27f5194..caf44b9 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -692,13 +692,18 @@ final DateTime _timerEnd = DateTime.now().add( const Duration(days: 2, hours: 18, minutes: 33, seconds: 24), ); +/// Drives the live block from the buttons under it. +final PersonalizationStoriesController _storiesController = + PersonalizationStoriesController(); + List<_Exhibit> _storyExhibits(String shopId) => [ _Exhibit( 'Stories — live block $_storiesCode (demo shop); ' - 'links open in the system browser', + 'links open in the system browser. Seen slides survive a restart.', (context) => PersonalizationStories( code: _storiesCode, shopId: shopId, + controller: _storiesController, padding: EdgeInsets.zero, promoCopiedText: 'Code copied to clipboard', onProductClick: (product) => @@ -708,8 +713,52 @@ List<_Exhibit> _storyExhibits(String shopId) => [ ), ), _Exhibit( - 'Story Viewer — sample slides: price, promo code, discount, text blocks, ' - 'used products (offline)', + 'Stories — programmatic control: open the second story, pause and ' + 'resume it after 3 s, reload the block, show the block without the bar', + (context) => Wrap( + spacing: 8, + runSpacing: 8, + children: [ + PersonalizationButton( + label: 'Open #2, pause at 3 s', + size: PersonalizationButtonSize.sm, + onPressed: () { + _storiesController.open(1); + Future.delayed(const Duration(seconds: 3), () { + _storiesController.pause(); + Future.delayed( + const Duration(seconds: 3), + _storiesController.resume, + ); + }); + }, + ), + PersonalizationButton( + label: 'Reload', + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.secondary, + onPressed: _storiesController.reload, + ), + PersonalizationButton( + label: 'Show without bar', + size: PersonalizationButtonSize.sm, + view: PersonalizationButtonView.secondary, + onPressed: () => PersonalizationStories.show( + context, + code: _storiesCode, + shopId: shopId, + promoCopiedText: 'Code copied to clipboard', + onError: (error) => _snack(context, 'Stories error: $error'), + iconBuilder: _icon, + ), + ), + ], + ), + ), + _Exhibit( + 'Story Viewer — sample slides: price, promo code, discount, a product ' + 'video with buttons, carousel and sound, a fitted photo on its letterbox, ' + 'text blocks with a promo code, a failed photo with Retry', (context) => Align( alignment: Alignment.centerLeft, child: PersonalizationButton( @@ -738,30 +787,47 @@ List<_Exhibit> _storyExhibits(String shopId) => [ ], ); }), - _Exhibit('Story Cover — segments: 5 slides, 2 seen', (context) { - return _ScrollRow( - children: [ - PersonalizationStoryCover( - image: _image('sneakers'), - segments: 5, - seenSegments: const {0, 1}, - ), - PersonalizationStoryCover( - image: _image('sneakers'), - pinned: true, - segments: 5, - seenSegments: const {0, 1}, - iconBuilder: _icon, - ), - PersonalizationStoryCover( - image: _image('sneakers'), - state: PersonalizationStoryCoverState.viewed, - segments: 5, - seenSegments: const {0, 1, 2, 3, 4}, - ), - ], - ); - }), + _Exhibit( + 'Story Cover — segments lit by index: slides 1, 2 / 2, 4 seen; pinned with ' + '1 seen; viewed; pinned and viewed (a plain warning ring)', + (context) { + return _ScrollRow( + children: [ + PersonalizationStoryCover( + image: _image('sneakers'), + segments: 5, + seenSegments: const {0, 1}, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + segments: 5, + seenSegments: const {1, 3}, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + pinned: true, + segments: 5, + seenSegments: const {0}, + iconBuilder: _icon, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + state: PersonalizationStoryCoverState.viewed, + segments: 5, + seenSegments: const {0, 1, 2, 3, 4}, + ), + PersonalizationStoryCover( + image: _image('sneakers'), + state: PersonalizationStoryCoverState.viewed, + pinned: true, + segments: 5, + seenSegments: const {0, 1, 2, 3, 4}, + iconBuilder: _icon, + ), + ], + ); + }, + ), _Exhibit('Story Preview and Stories Bar — pinned, default, viewed', ( context, ) { @@ -790,7 +856,7 @@ List<_Exhibit> _storyExhibits(String shopId) => [ ), PersonalizationStoryItem( id: '4', - label: 'A label too long for one line', + label: 'A label too long for one line takes two, then an ellipsis', image: _image('bottle'), ), ], @@ -1043,9 +1109,42 @@ final List _sampleStories = StoriesBlock.fromJson({ 'price_formatted': r'140 $', 'oldprice': 165, 'oldprice_formatted': r'165 $', - 'discount_percent': 15, + 'discount_percent': 12.5, 'url': 'https://example.com/pegasus', }), + // A product over a video: every slide button, the used products and the + // sound toggle; the video streams once and then plays from the disk cache. + { + 'id': 'video', + 'duration': 10, + 'type': 'video', + 'background': _sampleVideo, + 'background_color': '#1E3A5F', + 'elements': [ + { + 'type': 'button', + 'title': 'Buy now', + 'link': 'https://example.com', + }, + {'type': 'button', 'title': 'Open the product'}, + { + 'type': 'product', + 'title': 'Your code', + 'item': { + 'id': 'b1', + 'brand': 'Osprey', + 'name': 'Daylite backpack', + 'picture': 'asset:backpack', + 'price': 80, + 'price_formatted': r'80 $', + 'promocode': 'BUTTERFLY', + 'price_with_promocode_formatted': r'64 $', + 'url': 'https://example.com/backpack', + }, + }, + _sampleUsedProducts, + ], + }, ], }, { @@ -1053,11 +1152,21 @@ final List _sampleStories = StoriesBlock.fromJson({ 'name': 'Media', 'avatar': 'asset:jacket', 'slides': [ + // A square photo fitted whole: the rest of the screen is its letterbox + // colour, and a bare photo takes the 50% scrim. + { + 'id': 'fitted', + 'duration': 5, + 'type': 'image', + 'background': 'asset:sneakers', + 'background_color': '#1E3A5F', + }, { 'id': 'text', 'duration': 8, 'type': 'image', 'background': 'asset:jacket', + 'background_color': '#3B2A1E', 'elements': [ { 'type': 'text_block', @@ -1088,38 +1197,48 @@ final List _sampleStories = StoriesBlock.fromJson({ 'title': 'Go shopping', 'link': 'https://example.com', }, - { - 'type': 'products', - 'labels': { - 'show_carousel': 'Used products', - 'hide_carousel': 'Hide products', - }, - 'products': [ - for (final (index, name) in [ - 'backpack', - 'bottle', - 'sunglasses', - ].indexed) - { - 'id': 'm$index', - 'brand': 'Brand', - 'name': 'Product ${index + 1}', - 'picture': 'asset:$name', - 'price': 99, - 'price_formatted': r'99 $', - 'oldprice': 120, - 'oldprice_formatted': r'120 $', - 'discount_percent': 18, - }, - ], - }, + _sampleUsedProducts, ], }, + // The photo cannot load: the slide stops and offers Retry. + { + 'id': 'retry', + 'duration': 5, + 'type': 'image', + 'background': 'asset:missing', + }, ], }, ], }).stories; +/// A short public clip (the Flutter docs' butterfly). +const String _sampleVideo = + 'https://flutter.github.io/assets-for-api-docs/assets/videos/butterfly.mp4'; + +/// The "Used products" carousel of the sample slides. +final Map _sampleUsedProducts = { + 'type': 'products', + 'labels': { + 'show_carousel': 'Used products', + 'hide_carousel': 'Hide products', + }, + 'products': [ + for (final (index, name) in ['backpack', 'bottle', 'sunglasses'].indexed) + { + 'id': 'm$index', + 'brand': 'Brand', + 'name': 'Product ${index + 1}', + 'picture': 'asset:$name', + 'price': 99, + 'price_formatted': r'99 $', + 'oldprice': 120, + 'oldprice_formatted': r'120 $', + 'discount_percent': 17.5, + }, + ], +}; + void _openSampleStories(BuildContext context) { Navigator.of(context, rootNavigator: true).push( PersonalizationStoryViewer.route( From 644e6b7d31856b1b527edb4b4ed9d2a1691e9cd0 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 07:37:57 +0400 Subject: [PATCH 58/79] fix(ui): a carousel product closes the stories viewer with the sheet open The viewer pops its route itself instead of maybePop, which the sheet's PopScope held back. A video that keeps failing schedules one automatic retry, not one per player update. --- .../widgets/personalization_story_viewer.dart | 13 +++++-- test/ui/personalization_stories_test.dart | 37 +++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index eba9f30..d96d421 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -360,9 +360,12 @@ class _PersonalizationStoryViewerState extends State final onClose = widget.onClose; if (onClose != null) { onClose(); - } else { - Navigator.maybePop(context); + return; } + // Не maybePop: при раскрытой шторке PopScope держит маршрут, а закрыть просмотр + // нужно и из карусели товаров. + final navigator = Navigator.of(context); + if (navigator.canPop()) navigator.pop(); } /// Закрыть просмотр, потом [action] — переход по ссылке или к товару. @@ -499,6 +502,7 @@ class _PersonalizationStoryViewerState extends State _sync(); if (storyMediaOf(_playback.slide) == StoryMedia.video) { // Видео повторяет загрузку и само. + _autoRetry?.cancel(); _autoRetry = Timer(_videoRetry, _retry); } setState(() {}); @@ -520,7 +524,10 @@ class _PersonalizationStoryViewerState extends State final video = _video; if (video == null) return; final value = video.value; - if (value.hasError) return _failed(_playback.generation); + if (value.hasError) { + video.removeListener(_onVideo); + return _failed(_playback.generation); + } _playback.syncVideoPosition(value.position); _progress.value = _playback.progress; final ended = diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 6e6dc88..066e07e 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -289,6 +289,43 @@ void main() { expect(find.text('Used products'), findsOneWidget, reason: 'closed'); expect(find.text('Slide 70'), findsOneWidget, reason: 'no navigation'); }); + + testWidgets( + 'a carousel product closes the viewer even with the sheet open', + (tester) async { + final products = []; + final api = _FakeHostApi(null); + await tester.pumpWidget( + MaterialApp( + home: Builder( + builder: (context) => TextButton( + onPressed: () => Navigator.of(context).push( + PersonalizationStoryViewer.route( + PersonalizationStoryViewer( + stories: [story], + code: 'block', + sdk: PersonalizationSdk(api: api), + imageProvider: _offline, + onProductClick: (product) => products.add(product.id), + ), + ), + ), + child: const Text('open'), + ), + ), + ), + ); + await tester.tap(find.text('open')); + await _closed(tester); + await tester.tap(find.text('Used products')); + await tester.pump(); + await tester.tap(find.text('Mouse')); + await _closed(tester); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + expect(products, ['m1']); + expect(api.clicks, ['7/70/block']); + }, + ); }); group('PersonalizationStories', () { From e8a8102eaac5c0f0798efa1b7d2c1f67a07ce008 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:32:33 +0400 Subject: [PATCH 59/79] fix(ui): stories video plays from the network while the cache fills --- .../widgets/personalization_story_viewer.dart | 9 +- lib/src/ui/widgets/stories_media_cache.dart | 110 +++++++++++++----- test/ui/stories_media_cache_test.dart | 41 ++++++- 3 files changed, 128 insertions(+), 32 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index d96d421..1402bc5 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -37,7 +37,8 @@ import 'stories_support.dart'; /// - часы слайда стартуют, когда медиа готово; не загрузилось или не успело за 10 с — пауза /// и кнопка [retryText]; видео ещё и само повторяет загрузку через 15 с; /// - видео длится по своей реальной длине, прогресс идёт за воспроизведением и стоит на -/// подгрузке; видео кэшируется на диске ([StoriesMediaCache]), следующий слайд +/// подгрузке; видео не ждёт загрузки целиком: играет по сети, пока кэш на диске +/// ([StoriesMediaCache]) заполняется в фоне, и из файла в следующий раз; следующий слайд /// подгружается заранее. Звук выключен при первом открытии, выбор помнится до конца /// процесса, кнопка громкости «вверх» включает звук ([StoriesSound]). /// @@ -451,11 +452,15 @@ class _PersonalizationStoryViewerState extends State ).then((_) => failed ? _failed(generation) : _ready(generation)); } + /// Видео из кэша, а нет файла — сразу по сети, пока кэш заполняется в фоне: загрузка + /// целиком не ждётся. Готово — когда плеер готов играть. Future _loadVideo(String url, int generation) async { try { await StoriesSound.instance.beforeVideo(); - final file = await StoriesMediaCache.instance.fetch(url); + final cache = StoriesMediaCache.instance; + final file = await cache.cached(url); if (!_current(generation)) return; + if (file == null) cache.fill(url); final options = VideoPlayerOptions(mixWithOthers: true); final video = file != null ? VideoPlayerController.file(file, videoPlayerOptions: options) diff --git a/lib/src/ui/widgets/stories_media_cache.dart b/lib/src/ui/widgets/stories_media_cache.dart index b991913..3744e88 100644 --- a/lib/src/ui/widgets/stories_media_cache.dart +++ b/lib/src/ui/widgets/stories_media_cache.dart @@ -9,10 +9,14 @@ import '../../pigeon/personalization_api.g.dart' as pigeon; /// Дисковый кэш видео сторис: LRU на 50 МБ в папке `personalization_stories` кэша /// приложения, один на процесс — общий для всех просмотров. /// -/// Каждый файл качается один раз: повторный запрос, пока файл ещё качается, ждёт ту же -/// загрузку. Файл сначала пишется во временный `.part` и только целиком переименовывается, -/// поэтому оборванная загрузка в кэш не попадает. После загрузки самые давно открытые -/// файлы удаляются, пока кэш не уложится в лимит. Без зависимостей: `dart:io`. +/// Видео не ждёт кэша: просмотр берёт готовый файл ([cached]), а нет его — играет по +/// сети и тем временем заполняет кэш в фоне ([fill]); в следующий раз видео идёт из файла. +/// Каждый адрес качается одним потоком: повторный запрос, пока файл ещё качается, ждёт ту +/// же загрузку. Файл сначала пишется во временный `.part` и только целиком +/// переименовывается, поэтому оборванная загрузка в кэш не попадает. Файл больше лимита +/// бросается на первом лишнем байте (тело не дочитывается) и до конца процесса больше не +/// качается. После загрузки самые давно открытые файлы удаляются, пока кэш не уложится в +/// лимит. Без зависимостей: `dart:io`. class StoriesMediaCache { StoriesMediaCache({ this.maxBytes = 50 * 1024 * 1024, @@ -26,6 +30,9 @@ class StoriesMediaCache { final Future Function() _directory; final Map> _downloads = >{}; + /// Адреса, которые в кэш не помещаются: второй раз их не качаем. + final Set _oversized = {}; + /// Когда файл открывали в этом процессе. Время изменения файла — отметка для /// следующих запусков, но система пишет его с точностью до секунды. final Map _opened = {}; @@ -50,10 +57,26 @@ class StoriesMediaCache { return url.isNotEmpty && !path.endsWith('.m3u8'); } + /// Готовый файл [url] из кэша; нет — `null`. Ничего не качает. + Future cached(String url) async { + if (!cacheable(url)) return null; + try { + final file = await _file(url); + if (!await file.exists()) return null; + await _touch(file); + return file; + } catch (error) { + debugPrint('PersonalizationStories: cache lookup $url — $error'); + return null; + } + } + /// Файл [url] из кэша или загруженный сейчас; `null` — не вышло (тогда плеер берёт /// адрес из сети). Future fetch(String url) { - if (!cacheable(url)) return Future.value(); + if (!cacheable(url) || _oversized.contains(url)) { + return Future.value(); + } // Блок, а не стрелка: `remove` вернул бы саму загрузку, и whenComplete ждал бы её // же — вечно. return _downloads[url] ??= _fetch(url).whenComplete(() { @@ -61,37 +84,36 @@ class StoriesMediaCache { }); } - /// Загрузить [url] заранее — для следующего слайда. - void preload(String url) => unawaited(fetch(url)); + /// Положить [url] в кэш в фоне — пока видео играет по сети или для следующего слайда. + void fill(String url) => unawaited(fetch(url)); + + /// То же, что [fill]: заранее для следующего слайда. + void preload(String url) => fill(url); + + Future _file(String url) async { + final root = await (_root ??= _directory()); + return File('${root.path}/${_name(url)}'); + } + + /// Отметка для LRU: открытый файл — свежий. + Future _touch(File file) async { + final now = DateTime.now(); + _opened[file.path] = now; + await file.setLastModified(now); + } Future _fetch(String url) async { try { - final root = await (_root ??= _directory()); - final file = File('${root.path}/${_name(url)}'); + final file = await _file(url); if (await file.exists()) { - // Отметка для LRU: открытый файл — свежий. - final now = DateTime.now(); - _opened[file.path] = now; - await file.setLastModified(now); + await _touch(file); return file; } final part = File('${file.path}.part'); - final client = HttpClient(); - try { - final request = await client.getUrl(Uri.parse(url)); - final response = await request.close(); - if (response.statusCode != HttpStatus.ok || - response.contentLength > maxBytes) { - await response.drain(); - return null; - } - await response.pipe(part.openWrite()); - } finally { - client.close(); - } + if (!await _download(url, part)) return null; await part.rename(file.path); _opened[file.path] = DateTime.now(); - await _trim(root, keep: file.path); + await _trim(file.parent, keep: file.path); return file; } catch (error) { debugPrint('PersonalizationStories: cannot cache $url — $error'); @@ -99,6 +121,40 @@ class StoriesMediaCache { } } + /// Скачать [url] в [part]. Ответ не 200 или файл больше лимита — `false`, соединение + /// рвётся сразу, без дочитывания тела. + Future _download(String url, File part) async { + final client = HttpClient(); + try { + final request = await client.getUrl(Uri.parse(url)); + final response = await request.close(); + if (response.statusCode != HttpStatus.ok) return false; + if (response.contentLength > maxBytes) { + _oversized.add(url); + return false; + } + final sink = part.openWrite(); + var bytes = 0; + try { + // Длина бывает не известна заранее: считаем байты по ходу. + await for (final chunk in response) { + bytes += chunk.length; + if (bytes > maxBytes) break; + sink.add(chunk); + } + } finally { + await sink.close(); + } + if (bytes <= maxBytes) return true; + _oversized.add(url); + await part.delete(); + return false; + } finally { + // force: недочитанное тело не тянется до конца. + client.close(force: true); + } + } + /// Удаляет самые давно открытые файлы, пока кэш больше лимита; [keep] не трогается. Future _trim(Directory root, {required String keep}) async { final files = <(File, FileStat)>[]; diff --git a/test/ui/stories_media_cache_test.dart b/test/ui/stories_media_cache_test.dart index b1a6564..6289f96 100644 --- a/test/ui/stories_media_cache_test.dart +++ b/test/ui/stories_media_cache_test.dart @@ -15,7 +15,14 @@ void main() { server.listen((request) { requests.add(request.uri.path); final size = int.parse(request.uri.queryParameters['size'] ?? '10'); - request.response + final response = request.response; + // Chunked: the length is not known up front. + if (request.uri.queryParameters['chunked'] != null) { + response.headers.chunkedTransferEncoding = true; + } else { + response.contentLength = size; + } + response ..add(List.filled(size, 7)) ..close(); }); @@ -26,8 +33,9 @@ void main() { await root.delete(recursive: true); }); - String url(String name, {int size = 10}) => - 'http://127.0.0.1:${server.port}/$name.mp4?size=$size'; + String url(String name, {int size = 10, bool chunked = false}) => + 'http://127.0.0.1:${server.port}/$name.mp4?size=$size' + '${chunked ? '&chunked=1' : ''}'; test('each file downloads once, also when asked twice at once', () async { final cache = StoriesMediaCache(directory: () async => root); @@ -57,9 +65,36 @@ void main() { expect(await b!.exists(), isFalse); }); + test('a lookup never downloads; a filled file is found next time', () async { + final cache = StoriesMediaCache(directory: () async => root); + expect(await cache.cached(url('a')), isNull); + expect(requests, isEmpty); + + cache.fill(url('a')); + cache.fill(url('a')); + final file = await cache.fetch(url('a')); + expect(await cache.cached(url('a')), isNotNull); + expect((await cache.cached(url('a')))!.path, file!.path); + expect(requests, ['/a.mp4'], reason: 'one download per address'); + }); + + test('a file over the limit is cut short and never fetched again', () async { + final cache = StoriesMediaCache(maxBytes: 250, directory: () async => root); + expect(await cache.fetch(url('big', size: 300)), isNull); + expect(await cache.fetch(url('big', size: 300)), isNull); + expect(requests, ['/big.mp4']); + + // Without a length up front, the download stops on the first byte too many. + expect(await cache.fetch(url('chunk', size: 300, chunked: true)), isNull); + expect(await cache.fetch(url('chunk', size: 300, chunked: true)), isNull); + expect(requests, ['/big.mp4', '/chunk.mp4']); + expect(root.listSync(), isEmpty, reason: 'no part files are left'); + }); + test('HLS is left to the player', () async { final cache = StoriesMediaCache(directory: () async => root); expect(await cache.fetch('https://cdn.example/clip.m3u8'), isNull); + expect(await cache.cached('https://cdn.example/clip.m3u8'), isNull); expect(StoriesMediaCache.cacheable('https://cdn.example/clip.mp4'), isTrue); }); } From f672df4dc24381d487e804b48ffdc4728d02a789 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:33:07 +0400 Subject: [PATCH 60/79] fix(ui): a stories button without a link keeps the viewer open --- .../widgets/personalization_story_viewer.dart | 9 ++-- test/ui/personalization_stories_test.dart | 47 +++++++++++++++++-- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 1402bc5..581158e 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -49,7 +49,8 @@ import 'stories_support.dart'; /// сообщает [onSlideShown]. /// /// Кнопки, товары и карусель сначала закрывают просмотр, потом зовут [onLinkClick] / -/// [onProductClick]; не заданы — ссылку открывает система через SDK. +/// [onProductClick]; не заданы — ссылку открывает система через SDK. Кнопка без ссылки +/// на медиа-слайде ничего не открывает и просмотр не закрывает — только `click`. /// /// Открывается маршрутом [route] или встраивается как обычный виджет с [onClose]. class PersonalizationStoryViewer extends StatefulWidget { @@ -600,12 +601,14 @@ class _PersonalizationStoryViewerState extends State setState(() {}); } + /// Кнопка слайда: своя ссылка, у товарного слайда без неё — товар. Кнопка без ссылки на + /// медиа-слайде — только `click`: просмотр остаётся открытым. void _button(StoryButtonElement button) { _clicked(); final product = storyProductElement(_playback.slide)?.item; final own = storyButtonLink(button); - if (own.isEmpty && product != null) return _closeThen(() => _goTo(product)); - _closeThen(() => _openLink(own)); + if (own.isNotEmpty) return _closeThen(() => _openLink(own)); + if (product != null) _closeThen(() => _goTo(product)); } void _product(StoryProduct product) { diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 066e07e..39eb602 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -189,16 +189,22 @@ void main() { ], }); - Future<_FakeHostApi> open(WidgetTester tester) async { + Future<_FakeHostApi> open( + WidgetTester tester, { + List? stories, + VoidCallback? onClose, + ValueChanged? onLink, + }) async { final api = _FakeHostApi(null); await tester.pumpWidget( MaterialApp( home: PersonalizationStoryViewer( - stories: [story], + stories: stories ?? [story], code: 'block', sdk: PersonalizationSdk(api: api), imageProvider: _offline, - onClose: () {}, + onClose: onClose ?? () {}, + onLinkClick: onLink, ), ), ); @@ -290,6 +296,41 @@ void main() { expect(find.text('Slide 70'), findsOneWidget, reason: 'no navigation'); }); + testWidgets('a button without a link only counts the click', ( + tester, + ) async { + final buttonStory = Story.fromJson({ + 'id': 8, + 'name': 'Button', + 'avatar': '', + 'slides': >[ + { + 'id': 80, + 'duration': 5, + 'type': 'image', + 'background': 'https://cdn.example/80.jpg', + 'elements': >[ + {'type': 'button', 'title': 'Nowhere'}, + ], + }, + ], + }); + var closed = false; + final links = []; + final api = await open( + tester, + stories: [buttonStory], + onClose: () => closed = true, + onLink: links.add, + ); + await tester.tap(find.text('Nowhere')); + await tester.pump(); + expect(api.clicks, ['8/80/block']); + expect(closed, isFalse); + expect(links, isEmpty); + expect(find.text('Nowhere'), findsOneWidget); + }); + testWidgets( 'a carousel product closes the viewer even with the sheet open', (tester) async { From bc5fbed8017425247d90323d62992368f5092792 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:33:54 +0400 Subject: [PATCH 61/79] fix(ui): restarting a story slide keeps its media and tracking --- .../widgets/personalization_story_viewer.dart | 9 +++++-- lib/src/ui/widgets/stories_playback.dart | 14 +++++++---- test/ui/personalization_stories_test.dart | 25 +++++++++++++++++++ test/ui/stories_playback_test.dart | 5 ++-- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 581158e..3757b40 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -25,8 +25,9 @@ import 'stories_support.dart'; /// Поведение (общие правила всех платформ): /// - касание левой трети — назад, правой — вперёд, середина ничего не делает; в RTL края /// меняются местами. Удержание от 200 мс — пауза, отпускание её снимает и никуда не -/// листает. Назад на первом слайде первой сторис перезапускает слайд, вперёд на -/// последнем слайде последней — закрывает просмотр; +/// листает. Назад на первом слайде первой сторис перезапускает слайд — прогресс и видео +/// с нуля, без перезагрузки и повторного `view`; вперёд на последнем слайде последней — +/// закрывает просмотр; /// - свайп вбок листает сторис; заход на сторис (просмотр слайда, трекинг `view`) — только /// когда страница осела, подглядывание соседней не считается. Свайп вниз дальше 120 или /// быстрее 800 в секунду закрывает, иначе слайд пружинит назад; пока тянут — пауза; @@ -336,6 +337,10 @@ class _PersonalizationStoryViewerState extends State return; case StoriesStep.slide: _entered(); + case StoriesStep.restart: + // Тот же заход: медиа не перезагружается, `view` не повторяется. + _progress.value = 0; + _video?.seekTo(Duration.zero); case StoriesStep.turn: _sync(); final target = _playback.turnTarget!; diff --git a/lib/src/ui/widgets/stories_playback.dart b/lib/src/ui/widgets/stories_playback.dart index 8825abc..5d7fd4a 100644 --- a/lib/src/ui/widgets/stories_playback.dart +++ b/lib/src/ui/widgets/stories_playback.dart @@ -32,9 +32,13 @@ enum StoriesStep { /// Ничего не поменялось (например, шаг заблокирован шторкой). none, - /// Новый заход на слайд текущей сторис — другой или тот же заново. + /// Новый заход на слайд текущей сторис — другой. slide, + /// Тот же слайд с начала: прогресс с нуля, видео — к началу. Это не новый заход: + /// медиа не перезагружается, `view` и просмотренное не повторяются. + restart, + /// Перелистнуть страницу на сторис [StoriesPlayback.turnTarget]; заход на неё /// случится, когда страница осядет ([StoriesPlayback.settle]). turn, @@ -54,8 +58,8 @@ enum StoriesStep { /// - сторис открывается: с первого непросмотренного слайда, если часть просмотрена; с /// `start_position` сервера, если ничего; с начала, если просмотрена вся /// ([startSlideOf]); -/// - назад на первом слайде первой сторис перезапускает слайд, вперёд на последнем -/// слайде последней — закрывает просмотр; +/// - назад на первом слайде первой сторис перезапускает слайд (только время — с нуля, +/// без нового захода), вперёд на последнем слайде последней — закрывает просмотр; /// - пока раскрыта шторка товаров, слайды и сторис не листаются; любая смена слайда /// шторку закрывает; /// - время слайда копится только из реально прошедших промежутков и только пока ничто @@ -207,8 +211,8 @@ class StoriesPlayback { _turnTo(_story - 1); return StoriesStep.turn; } - _enter(); - return StoriesStep.slide; + _elapsed = Duration.zero; + return StoriesStep.restart; } /// Перелистнуть на сторис [index] программно (по id из хоста). Та же — `none`. diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 39eb602..eea25a4 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -194,6 +194,7 @@ void main() { List? stories, VoidCallback? onClose, ValueChanged? onLink, + void Function(Story story, int slideIndex)? onSlideShown, }) async { final api = _FakeHostApi(null); await tester.pumpWidget( @@ -205,6 +206,7 @@ void main() { imageProvider: _offline, onClose: onClose ?? () {}, onLinkClick: onLink, + onSlideShown: onSlideShown, ), ), ); @@ -267,6 +269,29 @@ void main() { expect(find.text('Slide 71'), findsOneWidget); }); + testWidgets('back on the first slide restarts it without a new view', ( + tester, + ) async { + final shown = []; + final api = await open( + tester, + onSlideShown: (_, index) => shown.add(index), + ); + expect(shown, [0]); + await _wait(tester, const Duration(seconds: 3)); + await tester.tapAt(at(tester, 0.1)); + await tester.pump(); + expect(api.views, ['7/70/block']); + expect(shown, [0]); + + // The slide starts over: its five seconds run again. + await _wait(tester, const Duration(seconds: 4)); + expect(find.text('Slide 70'), findsOneWidget); + await _wait(tester, const Duration(seconds: 2)); + await tester.pump(); + expect(find.text('Slide 71'), findsOneWidget); + }); + testWidgets('in the background the clock stands still', (tester) async { await open(tester); tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.paused); diff --git a/test/ui/stories_playback_test.dart b/test/ui/stories_playback_test.dart index e0bb36b..92bf217 100644 --- a/test/ui/stories_playback_test.dart +++ b/test/ui/stories_playback_test.dart @@ -87,10 +87,11 @@ void main() { playback.tick(const Duration(seconds: 2)); final generation = playback.generation; - expect(playback.previous(), StoriesStep.slide); + expect(playback.previous(), StoriesStep.restart); expect(playback.slide.id, 'a0'); - expect(playback.generation, greaterThan(generation)); + expect(playback.generation, generation, reason: 'no new entry'); expect(playback.elapsed, Duration.zero); + expect(playback.running, isTrue, reason: 'the media stays ready'); }); test('back into the previous story opens its start slide', () { From 792baf4ef352fc024de3fa0733ab1b7121825ef7 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:34:22 +0400 Subject: [PATCH 62/79] fix(ui): the stories sound button names the current sound state --- .../personalization_story_sound_button.dart | 7 +++--- .../widgets/personalization_story_viewer.dart | 3 ++- ...personalization_story_components_test.dart | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/src/ui/components/personalization_story_sound_button.dart b/lib/src/ui/components/personalization_story_sound_button.dart index c8af45e..ac77e2a 100644 --- a/lib/src/ui/components/personalization_story_sound_button.dart +++ b/lib/src/ui/components/personalization_story_sound_button.dart @@ -21,8 +21,8 @@ class PersonalizationStorySoundButton extends StatelessWidget { final bool muted; final VoidCallback? onPressed; - /// Подписи для скринридера — действие, которое сделает нажатие: без звука — - /// [soundOnLabel], со звуком — [soundOffLabel]. + /// Подписи для скринридера — текущее состояние звука: без звука — [soundOffLabel], + /// со звуком — [soundOnLabel]. Сама кнопка — переключатель: включён, когда звук есть. final String soundOnLabel; final String soundOffLabel; @@ -41,7 +41,8 @@ class PersonalizationStorySoundButton extends StatelessWidget { final colors = PersonalizationTheme.of(context).colors; return Semantics( button: true, - label: muted ? soundOnLabel : soundOffLabel, + toggled: !muted, + label: muted ? soundOffLabel : soundOnLabel, child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: onPressed, diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 3757b40..abf1ab3 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -136,7 +136,8 @@ class PersonalizationStoryViewer extends StatefulWidget { /// Подпись кнопки повтора загрузки медиа. final String retryText; - /// Подписи для скринридера: крестик и кнопка звука (включить / выключить). + /// Подписи для скринридера: крестик и кнопка звука — её текущее состояние (звук + /// включён / выключен). final String closeLabel; final String soundOnLabel; final String soundOffLabel; diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart index 68dac9f..0d247c4 100644 --- a/test/ui/personalization_story_components_test.dart +++ b/test/ui/personalization_story_components_test.dart @@ -436,6 +436,28 @@ void main() { expect(PersonalizationStoryTextBlock.presetLineHeight(14), 1.2); }); + testWidgets('the sound button names the current state and toggles', ( + tester, + ) async { + final handle = tester.ensureSemantics(); + for (final muted in [true, false]) { + await tester.pumpWidget( + _host(PersonalizationStorySoundButton(muted: muted, onPressed: () {})), + ); + expect( + tester.getSemantics(find.byType(PersonalizationStorySoundButton)), + matchesSemantics( + label: muted ? 'Sound off' : 'Sound on', + isButton: true, + hasToggledState: true, + isToggled: !muted, + hasTapAction: true, + ), + ); + } + handle.dispose(); + }); + testWidgets('progress fills the passed segments and part of the current', ( tester, ) async { From 054d81b153183a2e42d50b647b61c74afde47636 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:35:12 +0400 Subject: [PATCH 63/79] fix(ui): the stories cross closes the viewer with the sheet open --- .../personalization_story_navigation.dart | 16 +++++++--- lib/src/ui/widgets/stories_slide_view.dart | 15 +++++++--- test/ui/personalization_stories_test.dart | 29 +++++++++++++++++++ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/lib/src/ui/components/personalization_story_navigation.dart b/lib/src/ui/components/personalization_story_navigation.dart index 2a06bca..6d57dee 100644 --- a/lib/src/ui/components/personalization_story_navigation.dart +++ b/lib/src/ui/components/personalization_story_navigation.dart @@ -11,6 +11,7 @@ import 'personalization_story_progress.dart'; /// /// Колонка с шагом 12: [PersonalizationStoryProgress] и строка высотой 32, в конце /// которой крестик — иконка cross 32 (глиф 18) цвета Text/Secondary с прозрачностью 65%. +/// Касания ловит только крестик. class PersonalizationStoryNavigation extends StatelessWidget { const PersonalizationStoryNavigation({ super.key, @@ -43,6 +44,10 @@ class PersonalizationStoryNavigation extends StatelessWidget { static const double _close = 32; + /// Высота шапки: прогресс, шаг 12 и строка крестика. + static const double height = + PersonalizationStoryProgress.height + 12 + _close; + @override Widget build(BuildContext context) { final colors = PersonalizationTheme.of(context).colors; @@ -50,10 +55,13 @@ class PersonalizationStoryNavigation extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisSize: MainAxisSize.min, children: [ - PersonalizationStoryProgress( - count: count, - current: current, - progress: progress, + // Прогресс касаний не ловит: они уходят слайду под шапкой. + IgnorePointer( + child: PersonalizationStoryProgress( + count: count, + current: current, + progress: progress, + ), ), const SizedBox(height: 12), SizedBox( diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart index d51118d..a42cdc3 100644 --- a/lib/src/ui/widgets/stories_slide_view.dart +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -261,6 +261,11 @@ class StorySlideView extends StatelessWidget { ); } + /// Шапка поверх всего слайда, и подложки шторки тоже: крестик закрывает просмотр и + /// при раскрытой шторке; мимо крестика касание доходит до подложки. + Widget _header() => + Positioned(left: 16, top: 16, right: 16, child: _navigation()); + /// Кнопка звука — только у видео. Widget? _sound(StorySlide slide) { if (storyMediaOf(slide) != StoryMedia.video) return null; @@ -292,7 +297,8 @@ class StorySlideView extends StatelessWidget { ); /// Нижняя строка: «Используемые товары» со звуком в начале или только звук. Под - /// раскрытой шторкой — подложка: тап мимо шторки её закрывает и никуда не листает. + /// раскрытой шторкой — подложка: тап мимо шторки её закрывает и никуда не листает; + /// крестик шапки над ней и закрывает просмотр. List _bottomRow(StorySlide slide) { final products = storyProducts(slide); final sound = _sound(slide); @@ -366,7 +372,6 @@ class StorySlideView extends StatelessWidget { top: constraints.maxHeight * text.yOffset.clamp(0, 100) / 100, child: _textBlock(context, text), ), - Positioned(left: 16, top: 16, right: 16, child: _navigation()), Positioned( left: 16, right: 16, @@ -374,6 +379,7 @@ class StorySlideView extends StatelessWidget { child: _primaryButtons(buttons), ), ..._bottomRow(slide), + _header(), ], ), ); @@ -430,7 +436,8 @@ class StorySlideView extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - _navigation(), + // Место шапки: сама она поверх всего ([_header]). + const SizedBox(height: PersonalizationStoryNavigation.height), const SizedBox(height: 16), if (product.brand.isNotEmpty) ...[ Text( @@ -500,7 +507,7 @@ class StorySlideView extends StatelessWidget { ); return Stack( fit: StackFit.expand, - children: [column, ..._bottomRow(slide)], + children: [column, ..._bottomRow(slide), _header()], ); } } diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index eea25a4..eeedace 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -356,6 +356,35 @@ void main() { expect(find.text('Nowhere'), findsOneWidget); }); + testWidgets('the cross closes the viewer also with the sheet open', ( + tester, + ) async { + var closed = 0; + await open(tester, onClose: () => closed++); + await tester.tap(find.text('Used products')); + await tester.pump(); + + // The header row beside the cross is outside the sheet: only the sheet goes. + final header = tester.getTopLeft( + find.byType(PersonalizationStoryNavigation), + ); + await tester.tapAt(header + const Offset(40, 30)); + await tester.pump(); + expect(find.text('Used products'), findsOneWidget); + expect(closed, 0); + + await tester.tap(find.text('Used products')); + await tester.pump(); + await tester.tap( + find.descendant( + of: find.byType(PersonalizationStoryNavigation), + matching: find.byType(GestureDetector), + ), + ); + await tester.pump(); + expect(closed, 1); + }); + testWidgets( 'a carousel product closes the viewer even with the sheet open', (tester) async { From 3bb7d34a908e8f657ad1b11a2ed20f0b4ab3284c Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:35:38 +0400 Subject: [PATCH 64/79] fix(ui): story text line spacing follows the nearest preset --- .../personalization_story_text_block.dart | 18 +++++++++++++++--- .../personalization_story_components_test.dart | 13 ++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/src/ui/components/personalization_story_text_block.dart b/lib/src/ui/components/personalization_story_text_block.dart index 521cbb4..5e6e047 100644 --- a/lib/src/ui/components/personalization_story_text_block.dart +++ b/lib/src/ui/components/personalization_story_text_block.dart @@ -68,9 +68,21 @@ class PersonalizationStoryTextBlock extends StatelessWidget { /// Блок со сплошным фоном: у фона есть непрозрачность. bool get solid => background != null && background!.a > 0; - /// Интерлиньяж заготовки для кегля [fontSize], в долях кегля: больше 30 — Large - /// (48/48), иначе Medium и Small (36/30, 24/20). - static double presetLineHeight(double fontSize) => fontSize > 30 ? 1 : 1.2; + /// Интерлиньяж заготовки для кегля [fontSize], в долях кегля: берётся ближайшая по + /// кеглю заготовка — Large 48/48 (×1), Medium 30/36 и Small 20/24 (×1,2); поровну — + /// Large. Высота строки — кегль × доля, округлённая до целого. + static double presetLineHeight(double fontSize) { + if (fontSize <= 0) return 1.2; + // Large первой: при равном расстоянии остаётся она. + const presets = <(double, double)>[(48, 1), (30, 1.2), (20, 1.2)]; + var nearest = presets.first; + for (final preset in presets) { + if ((fontSize - preset.$1).abs() < (fontSize - nearest.$1).abs()) { + nearest = preset; + } + } + return (fontSize * nearest.$2).roundToDouble() / fontSize; + } @override Widget build(BuildContext context) { diff --git a/test/ui/personalization_story_components_test.dart b/test/ui/personalization_story_components_test.dart index 0d247c4..38e2249 100644 --- a/test/ui/personalization_story_components_test.dart +++ b/test/ui/personalization_story_components_test.dart @@ -431,9 +431,16 @@ void main() { }); test('a text block without a line spacing takes the preset for its size', () { - expect(PersonalizationStoryTextBlock.presetLineHeight(48), 1); - expect(PersonalizationStoryTextBlock.presetLineHeight(30), 1.2); - expect(PersonalizationStoryTextBlock.presetLineHeight(14), 1.2); + double line(double size) => + PersonalizationStoryTextBlock.presetLineHeight(size) * size; + expect(line(48), 48); + expect(line(30), closeTo(36, 1e-9)); + expect(line(20), closeTo(24, 1e-9)); + // The nearest preset; a tie between Large and Medium goes to Large. + expect(line(39), 39, reason: 'tie: Large'); + expect(line(38), closeTo(46, 1e-9), reason: 'Medium, 45.6 rounded'); + expect(line(40), 40, reason: 'Large'); + expect(line(14), closeTo(17, 1e-9), reason: 'Small, 16.8 rounded'); }); testWidgets('the sound button names the current state and toggles', ( From fe0c4dbf532ee6078daf6a88e10c013bfe7db62a Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:36:54 +0400 Subject: [PATCH 65/79] fix(ui): stories readiness and retry timers freeze in the background --- .../widgets/personalization_story_viewer.dart | 36 ++++++++++-- lib/src/ui/widgets/stories_playback.dart | 55 +++++++++++++++++++ test/ui/personalization_stories_test.dart | 53 ++++++++++++++++++ 3 files changed, 138 insertions(+), 6 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index abf1ab3..771c908 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -36,7 +36,8 @@ import 'stories_support.dart'; /// - пауза и когда приложение свёрнуто или потеряло фокус, и когда просмотр закрыт другим /// экраном, и по [paused] от хоста; время слайда в паузе не идёт; /// - часы слайда стартуют, когда медиа готово; не загрузилось или не успело за 10 с — пауза -/// и кнопка [retryText]; видео ещё и само повторяет загрузку через 15 с; +/// и кнопка [retryText]; видео ещё и само повторяет загрузку через 15 с. Оба отсчёта в +/// фоне и под другим экраном стоят и потом досчитывают остаток; /// - видео длится по своей реальной длине, прогресс идёт за воспроизведением и стоит на /// подгрузке; видео не ждёт загрузки целиком: играет по сети, пока кэш на диске /// ([StoriesMediaCache]) заполняется в фоне, и из файла в следующий раз; следующий слайд @@ -199,8 +200,10 @@ class _PersonalizationStoryViewerState extends State VideoPlayerController? _video; bool _videoReady = false; bool _videoPlaying = false; - Timer? _timeout; - Timer? _autoRetry; + + /// 10 с на готовность медиа и 15 с до самоповтора видео; в фоне замирают. + StoriesTimer? _timeout; + StoriesTimer? _autoRetry; bool _closing = false; static const Duration _turn = Duration(milliseconds: 300); @@ -287,9 +290,30 @@ class _PersonalizationStoryViewerState extends State /// Поставить или снять паузу [reason]; часы и видео меняются только на переходе. void _setPaused(StoriesPauseReason reason, bool paused) { final changed = paused ? _playback.pause(reason) : _playback.resume(reason); + if (reason == StoriesPauseReason.background || + reason == StoriesPauseReason.covered) { + _freezeTimers(); + } if (changed) _sync(); } + /// Просмотра не видно: приложение в фоне или сверху другой экран. + bool get _hidden => + _playback.pausedBy(StoriesPauseReason.background) || + _playback.pausedBy(StoriesPauseReason.covered); + + /// Пока просмотра не видно, таймеры готовности и самоповтора стоят; потом + /// досчитывают остаток. + void _freezeTimers() { + for (final timer in [_timeout, _autoRetry]) { + if (timer == null) continue; + _hidden ? timer.freeze() : timer.resume(); + } + } + + StoriesTimer _timer(Duration duration, void Function() onFire) => + StoriesTimer(duration, onFire, frozen: _hidden); + /// Часы и видео идут, только пока слайд не стоит. Вызывается на переходах, не на кадре. void _sync() { final running = _playback.running; @@ -440,10 +464,10 @@ class _PersonalizationStoryViewerState extends State case StoryMedia.none: _ready(generation); case StoryMedia.image: - _timeout = Timer(_readyTimeout, () => _failed(generation)); + _timeout = _timer(_readyTimeout, () => _failed(generation)); _loadImage(slide.background, generation); case StoryMedia.video: - _timeout = Timer(_readyTimeout, () => _failed(generation)); + _timeout = _timer(_readyTimeout, () => _failed(generation)); _loadVideo(slide.background, generation); } } @@ -515,7 +539,7 @@ class _PersonalizationStoryViewerState extends State if (storyMediaOf(_playback.slide) == StoryMedia.video) { // Видео повторяет загрузку и само. _autoRetry?.cancel(); - _autoRetry = Timer(_videoRetry, _retry); + _autoRetry = _timer(_videoRetry, _retry); } setState(() {}); } diff --git a/lib/src/ui/widgets/stories_playback.dart b/lib/src/ui/widgets/stories_playback.dart index 5d7fd4a..b1f04bb 100644 --- a/lib/src/ui/widgets/stories_playback.dart +++ b/lib/src/ui/widgets/stories_playback.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import '../../stories/stories_response.dart'; /// Почему стоит текущий слайд. Часы слайда идут, только когда причин нет. @@ -327,3 +329,56 @@ class StoriesPlayback { (_seen[story.id] ??= {}).add(slide.id); } } + +/// Таймер просмотра, который замирает: пока приложение в фоне или просмотр закрыт другим +/// экраном, время не идёт, а после возврата досчитывается остаток ([freeze], [resume]). +/// +/// Считает шагами по [step] — так он идёт и на подменённых часах тестов; на заморозке +/// теряется не больше шага. +class StoriesTimer { + /// Через [duration] — [onFire]; [frozen] — создать замороженным. + StoriesTimer(Duration duration, void Function() onFire, {bool frozen = false}) + : _left = duration, + _onFire = onFire { + if (!frozen) _run(); + } + + static const Duration step = Duration(milliseconds: 100); + + final void Function() _onFire; + Duration _left; + Timer? _timer; + bool _done = false; + + /// Сколько осталось. + Duration get remaining => _left; + + /// Таймер ещё не сработал и не отменён. + bool get isActive => !_done; + + /// Остановить отсчёт, сохранив остаток. + void freeze() { + _timer?.cancel(); + _timer = null; + } + + /// Продолжить отсчёт с остатка. + void resume() { + if (_done || _timer != null) return; + _run(); + } + + void cancel() { + _done = true; + freeze(); + } + + void _run() { + _timer = Timer.periodic(step, (_) { + _left -= step; + if (_left > Duration.zero) return; + cancel(); + _onFire(); + }); + } +} diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index eeedace..7832aca 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -23,6 +23,19 @@ final ImageProvider _pixel = MemoryImage( ImageProvider _offline(String url) => _pixel; +/// An image that never arrives: its slide waits for the readiness timeout. +class _NeverImage extends ImageProvider<_NeverImage> { + @override + Future<_NeverImage> obtainKey(ImageConfiguration configuration) => + Future<_NeverImage>.value(this); + + @override + ImageStreamCompleter loadImage( + _NeverImage key, + ImageDecoderCallback decode, + ) => OneFrameImageStreamCompleter(Completer().future); +} + /// A product slide (no background: no media to wait for) with numeric id [id]. Map _productSlide( Object id, @@ -304,6 +317,46 @@ void main() { expect(find.text('Slide 71'), findsOneWidget); }); + testWidgets('the readiness timeout stands still in the background', ( + tester, + ) async { + final stuck = Story.fromJson({ + 'id': 9, + 'name': 'Stuck', + 'avatar': '', + 'slides': >[ + { + 'id': 90, + 'duration': 5, + 'type': 'image', + 'background': 'https://cdn.example/90.jpg', + 'elements': [], + }, + ], + }); + await tester.pumpWidget( + MaterialApp( + home: PersonalizationStoryViewer( + stories: [stuck], + imageProvider: (_) => _NeverImage(), + onClose: () {}, + ), + ), + ); + await tester.pump(); + await tester.pump(const Duration(seconds: 6)); + tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.paused); + await tester.pump(const Duration(seconds: 30)); + expect(find.text('Retry'), findsNothing); + + tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.resumed); + await tester.pump(const Duration(seconds: 3)); + expect(find.text('Retry'), findsNothing, reason: '9 of 10 seconds'); + await tester.pump(const Duration(milliseconds: 1200)); + await tester.pump(); + expect(find.text('Retry'), findsOneWidget); + }); + testWidgets('the open sheet pauses; a tap outside only closes it', ( tester, ) async { From e6af726fd1377046048cd9f07b71f805a2da58bd Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:37:40 +0400 Subject: [PATCH 66/79] fix(ui): stories drop promoToastPosition, the toast is always on top --- lib/src/ui/widgets/personalization_stories.dart | 7 ------- lib/src/ui/widgets/personalization_story_viewer.dart | 7 +------ lib/src/ui/widgets/stories_slide_view.dart | 3 +-- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 25989a2..7228b74 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -7,7 +7,6 @@ import '../../multi_instance/rees46.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; import '../components/personalization_stories_bar.dart'; -import '../components/personalization_toast.dart'; import 'personalization_story_viewer.dart'; import 'stories_playback.dart'; import 'stories_seen_store.dart'; @@ -73,7 +72,6 @@ class PersonalizationStories extends StatefulWidget { this.onPromoCopied, this.onError, this.promoCopiedText = 'Copied', - this.promoToastPosition = PersonalizationToastPosition.top, this.promoCaption = 'Promo code', this.productButtonText = 'More info', this.showProductsText = 'Used products', @@ -109,7 +107,6 @@ class PersonalizationStories extends StatefulWidget { /// Тексты просмотра — см. одноимённые у [PersonalizationStoryViewer]. final String promoCopiedText; - final PersonalizationToastPosition promoToastPosition; final String promoCaption; final String productButtonText; final String showProductsText; @@ -153,8 +150,6 @@ class PersonalizationStories extends StatefulWidget { ValueChanged? onPromoCopied, ValueChanged? onError, String promoCopiedText = 'Copied', - PersonalizationToastPosition promoToastPosition = - PersonalizationToastPosition.top, String promoCaption = 'Promo code', String productButtonText = 'More info', String showProductsText = 'Used products', @@ -179,7 +174,6 @@ class PersonalizationStories extends StatefulWidget { onProductClick: onProductClick, onPromoCopied: onPromoCopied, promoCopiedText: promoCopiedText, - promoToastPosition: promoToastPosition, promoCaption: promoCaption, productButtonText: productButtonText, showProductsText: showProductsText, @@ -248,7 +242,6 @@ Future _present( productButtonText: config.productButtonText, promoCaption: config.promoCaption, promoCopiedText: config.promoCopiedText, - promoToastPosition: config.promoToastPosition, showProductsText: config.showProductsText, hideProductsText: config.hideProductsText, retryText: config.retryText, diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 771c908..7978a04 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -8,7 +8,6 @@ import 'package:video_player/video_player.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; -import '../components/personalization_toast.dart'; import 'stories_media_cache.dart'; import 'stories_playback.dart'; import 'stories_seen_store.dart'; @@ -72,7 +71,6 @@ class PersonalizationStoryViewer extends StatefulWidget { this.productButtonText = 'More info', this.promoCaption = 'Promo code', this.promoCopiedText = 'Copied', - this.promoToastPosition = PersonalizationToastPosition.top, this.showProductsText = 'Used products', this.hideProductsText = 'Hide products', this.retryText = 'Retry', @@ -124,12 +122,9 @@ class PersonalizationStoryViewer extends StatefulWidget { /// Подпись над промокодом, когда в админке у товара нет своей. final String promoCaption; - /// Текст тоста после копирования промокода. + /// Текст тоста после копирования промокода; тост всегда сверху. final String promoCopiedText; - /// У какого края показать этот тост. - final PersonalizationToastPosition promoToastPosition; - /// Подписи переключателя товаров, когда их не прислал сервер. final String showProductsText; final String hideProductsText; diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart index a42cdc3..ec60b85 100644 --- a/lib/src/ui/widgets/stories_slide_view.dart +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -397,7 +397,7 @@ class StorySlideView extends StatelessWidget { PersonalizationToast.show( context, config.promoCopiedText, - position: config.promoToastPosition, + position: PersonalizationToastPosition.top, ); onPromoCopied?.call(code); }, @@ -487,7 +487,6 @@ class StorySlideView extends StatelessWidget { promoCode: price.promoCode, promoCaption: storyPromoCaption(element, config.promoCaption), copiedText: config.promoCopiedText, - copiedToastPosition: config.promoToastPosition, onPromoCopied: live ? onPromoCopied : null, iconBuilder: config.iconBuilder, ), From ece5bdcd05be5babe29d11edf9115dae41ce55f8 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:42:46 +0400 Subject: [PATCH 67/79] fix(ui): stories controller queues open, turns the open viewer, waits for the SDK --- .../ui/widgets/personalization_stories.dart | 244 ++++++++++++++---- .../widgets/personalization_story_viewer.dart | 19 ++ test/ui/personalization_stories_test.dart | 110 ++++++++ 3 files changed, 320 insertions(+), 53 deletions(-) diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 7228b74..3767715 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import '../../multi_instance/rees46.dart'; +import '../../multi_instance/sdk_exceptions.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; import '../components/personalization_stories_bar.dart'; @@ -15,32 +15,120 @@ import 'stories_support.dart'; /// Программное управление блоком сторис: открыть сторис, пауза, продолжение, перезагрузка. /// /// Передаётся в [PersonalizationStories.controller] или в [PersonalizationStories.show]. -/// [pause] и [resume] действуют на открытый просмотр; при закрытии просмотра пауза -/// снимается. +/// - [open] и [openStory] до загрузки блока ждут её и открывают сторис после; при уже +/// открытом просмотре листают на эту сторис внутри него. Future завершается, когда +/// просмотр закроют. +/// - [pause] и [resume] действуют только на открытый просмотр, без него ничего не +/// делают; при закрытии просмотра пауза снимается. class PersonalizationStoriesController { _PersonalizationStoriesState? _bar; final ValueNotifier _paused = ValueNotifier(false); - /// Открыть сторис номер [index] ленты — со стартового слайда по общим правилам. Future - /// завершается, когда просмотр закроют. Блок ещё не загружен — ничего. - Future open(int index) => _bar?._open(index) ?? Future.value(); + /// Открытый просмотр; `null` — закрыт. + _StoriesSession? _session; - /// Открыть сторис с id [storyId]; нет такой — ничего. - Future openStory(String storyId) { - final bar = _bar; - if (bar == null) return Future.value(); - final index = bar._stories.indexWhere((story) => story.id == storyId); - return index < 0 ? Future.value() : bar._open(index); - } + /// Открытие, которое ждёт загрузки блока. + _QueuedOpen? _queued; + + /// Открыть сторис номер [index] ленты — со стартового слайда по общим правилам. Блок + /// ещё грузится — откроется после загрузки (новая просьба заменяет прежнюю); просмотр + /// уже открыт — перелистнёт в нём. Нет такой сторис — ничего. + Future open(int index) => _request(index: index); - /// Остановить открытый просмотр. - void pause() => _paused.value = true; + /// Открыть сторис с id [storyId] — как [open]; нет такой — ничего. + Future openStory(String storyId) => _request(storyId: storyId); - /// Продолжить после [pause]. - void resume() => _paused.value = false; + /// Остановить открытый просмотр; без него — ничего. + void pause() { + if (_session != null) _paused.value = true; + } + + /// Продолжить после [pause]; без открытого просмотра — ничего. + void resume() { + if (_session != null) _paused.value = false; + } /// Заново загрузить блок. Future reload() => _bar?._load() ?? Future.value(); + + Future _request({int? index, String? storyId}) { + final session = _session; + if (session != null) return session.turn(index: index, storyId: storyId); + final bar = _bar; + if (bar != null && !bar._loading) { + return bar._openStory(index: index, storyId: storyId); + } + final previous = _queued; + final queued = _queued = _QueuedOpen(index, storyId); + previous?.done.complete(); + return queued.done.future; + } + + /// Блок загрузился или не загрузился: отложенное открытие — сейчас. + void _flush() { + final queued = _queued; + if (queued == null) return; + _queued = null; + queued.done.complete( + _request(index: queued.index, storyId: queued.storyId), + ); + } + + /// Блок ушёл из дерева: отложенное открытие не случится. + void _drop() { + final queued = _queued; + _queued = null; + queued?.done.complete(); + } + + _StoriesSession _begin(List stories) => + _session = _StoriesSession(stories); + + void _end(_StoriesSession session) { + session.end(); + if (_session != session) return; + _session = null; + _paused.value = false; + } +} + +/// Открытие сторис, которое ждёт загрузки блока. +class _QueuedOpen { + _QueuedOpen(this.index, this.storyId); + + final int? index; + final String? storyId; + final Completer done = Completer(); +} + +/// Открытый просмотр: его сторис, просьбы перелистнуть и конец. +class _StoriesSession { + _StoriesSession(this.stories); + + final List stories; + + /// Индексы сторис, на которые перелистнуть. Не broadcast: просьба до первой сборки + /// просмотра ждёт его подписки. + final StreamController turns = StreamController(); + final Completer _closed = Completer(); + + /// Перелистнуть на сторис [index] или с id [storyId]; нет такой — ничего. Завершается, + /// когда просмотр закроют. + Future turn({int? index, String? storyId}) { + final target = storyId != null + ? stories.indexWhere((story) => story.id == storyId) + : index ?? -1; + if (target < 0 || target >= stories.length || turns.isClosed) { + return Future.value(); + } + turns.add(target); + return _closed.future; + } + + void end() { + unawaited(turns.close()); + if (!_closed.isCompleted) _closed.complete(); + } } /// Блок сторис с данными SDK: лента превью, по нажатию — полноэкранный просмотр. @@ -50,11 +138,13 @@ class PersonalizationStoriesController { /// [PersonalizationStoryViewer]. Без ленты сторис показывает [show]. /// /// Инстанс SDK: [sdk] явно, иначе [shopId] выбирает магазин при нескольких -/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). +/// зарегистрированных; без него берётся единственный (`REES46.getInstance`). Магазин ещё +/// не зарегистрирован — виджет ждёт регистрации до 15 с ([registrationTimeout]). /// /// Пока блок грузится, в ленте заглушки. Пустой блок — виджет исчезает. Ошибка загрузки, -/// пустой [code], магазин не найден или неоднозначен, загрузка дольше 15 с — виджет -/// исчезает и зовёт [onError]; вечных заглушек нет. Сторис без слайдов выпадают. +/// пустой [code], магазин не зарегистрирован за 15 с или неоднозначен, загрузка дольше +/// 15 с — виджет исчезает и зовёт [onError]; вечных заглушек нет. Сторис без слайдов +/// выпадают. /// /// Просмотренные слайды хранятся на устройстве по магазину и переживают перезапуск: /// сторис просмотрена, когда так говорит сервер или просмотрены все её слайды; дуги @@ -133,11 +223,15 @@ class PersonalizationStories extends StatefulWidget { /// Сколько ждать блок, прежде чем сдаться и позвать [onError]. static const Duration loadTimeout = Duration(seconds: 15); + /// Сколько ждать регистрации SDK (`REES46.initialize` / `registerShops`), когда + /// инстанс не передан явно, прежде чем сдаться и позвать [onError]. + static const Duration registrationTimeout = Duration(seconds: 15); + /// Показать сторис блока [code] без ленты: загрузить блок и открыть просмотр — со /// сторис [startStoryId] (нет такой — с первой). Тексты, колбэки и [controller] — как - /// у виджета. Ошибка (пустой код, магазин не найден, загрузка не удалась или дольше - /// 15 с) уходит в [onError], просмотр не открывается. Future завершается, когда - /// просмотр закроют. + /// у виджета. Ошибка (пустой код, магазин не зарегистрирован за 15 с или неоднозначен, + /// загрузка не удалась или дольше 15 с) уходит в [onError], просмотр не открывается. + /// Future завершается, когда просмотр закроют. static Future show( BuildContext context, { required String code, @@ -188,7 +282,7 @@ class PersonalizationStories extends StatefulWidget { final PersonalizationSdk resolved; final List stories; try { - resolved = _resolve(sdk, shopId); + resolved = await _resolve(sdk, shopId); stories = await _fetch(resolved, code); } catch (error) { debugPrint('PersonalizationStories.show: $code — $error'); @@ -197,18 +291,14 @@ class PersonalizationStories extends StatefulWidget { } if (stories.isEmpty || !context.mounted) return; final index = stories.indexWhere((story) => story.id == startStoryId); - try { - await _present( - context, - config: config, - sdk: resolved, - stories: stories, - index: index < 0 ? 0 : index, - paused: controller?._paused, - ); - } finally { - controller?._paused.value = false; - } + await _present( + context, + config: config, + sdk: resolved, + stories: stories, + index: index < 0 ? 0 : index, + controller: controller, + ); } @override @@ -216,16 +306,18 @@ class PersonalizationStories extends StatefulWidget { } /// Открыть просмотр [stories] со сторис [index] поверх корневого навигатора; тексты и -/// колбэки — из [config]. Завершается, когда просмотр закроют. +/// колбэки — из [config]. Пока просмотр открыт, [controller] ставит его на паузу и +/// листает. Завершается, когда просмотр закроют. Future _present( BuildContext context, { required PersonalizationStories config, required PersonalizationSdk? sdk, required List stories, required int index, - ValueListenable? paused, + PersonalizationStoriesController? controller, void Function(Story story, int slideIndex)? onSlideShown, -}) { +}) async { + final session = controller?._begin(stories); final viewer = PersonalizationStoryViewer( stories: stories, initialStory: index, @@ -234,7 +326,8 @@ Future _present( : StoriesSeenStore.instance.seen(sdk), code: config.code, sdk: sdk, - paused: paused, + paused: controller?._paused, + storyRequests: session?.turns.stream, onSlideShown: onSlideShown, onLinkClick: config.onLinkClick, onProductClick: config.onProductClick, @@ -252,17 +345,44 @@ Future _present( iconBuilder: config.iconBuilder, ); final navigator = Navigator.of(context, rootNavigator: true); - // Тема едет с просмотром: хост мог задать её поддереву, а не приложению. - return navigator.push( - PersonalizationStoryViewer.route( - InheritedTheme.capture(from: context, to: navigator.context).wrap(viewer), - ), - ); + try { + // Тема едет с просмотром: хост мог задать её поддереву, а не приложению. + await navigator.push( + PersonalizationStoryViewer.route( + InheritedTheme.capture( + from: context, + to: navigator.context, + ).wrap(viewer), + ), + ); + } finally { + if (session != null) controller?._end(session); + } } -/// SDK по [sdk] или [shopId]; не вышло — ошибка резолва. -PersonalizationSdk _resolve(PersonalizationSdk? sdk, String? shopId) => - sdk ?? REES46.getInstance(shopId); +/// SDK по [sdk] или [shopId]. Магазин ещё не зарегистрирован — ждём регистрации до +/// [PersonalizationStories.registrationTimeout], проверяя раз в 100 мс; не дождались — +/// [UnknownShopIdException]. Неоднозначный выбор ([AmbiguousShopException]) — сразу. +/// [alive] вернул `false` — ждать больше незачем, та же ошибка. +Future _resolve( + PersonalizationSdk? sdk, + String? shopId, { + bool Function()? alive, +}) async { + if (sdk != null) return sdk; + const poll = Duration(milliseconds: 100); + for (var waited = Duration.zero; ; waited += poll) { + try { + return REES46.getInstance(shopId); + } on UnknownShopIdException { + final waiting = alive?.call() ?? true; + if (!waiting || waited >= PersonalizationStories.registrationTimeout) { + rethrow; + } + } + await Future.delayed(poll); + } +} /// Блок [code] со сторис, у которых есть слайды, и просмотренное магазина — не дольше /// [PersonalizationStories.loadTimeout]. @@ -299,6 +419,7 @@ class _PersonalizationStoriesState extends State { if (oldWidget.controller != widget.controller) { if (oldWidget.controller?._bar == this) oldWidget.controller?._bar = null; widget.controller?._bar = this; + if (!_loading) widget.controller?._flush(); } if (oldWidget.sdk != widget.sdk || oldWidget.shopId != widget.shopId || @@ -309,7 +430,11 @@ class _PersonalizationStoriesState extends State { @override void dispose() { - if (widget.controller?._bar == this) widget.controller?._bar = null; + final controller = widget.controller; + if (controller?._bar == this) { + controller?._bar = null; + controller?._drop(); + } super.dispose(); } @@ -317,13 +442,19 @@ class _PersonalizationStoriesState extends State { final seq = ++_seq; setState(() => _loading = true); try { - final sdk = _sdk = _resolve(widget.sdk, widget.shopId); + final sdk = await _resolve( + widget.sdk, + widget.shopId, + alive: () => mounted && seq == _seq, + ); final stories = await _fetch(sdk, widget.code); if (!mounted || seq != _seq) return; setState(() { + _sdk = sdk; _loading = false; _stories = stories; }); + widget.controller?._flush(); } catch (error) { if (!mounted || seq != _seq) return; debugPrint('PersonalizationStories: ${widget.code} — $error'); @@ -331,6 +462,7 @@ class _PersonalizationStoriesState extends State { _loading = false; _stories = const []; }); + widget.controller?._flush(); // После кадра: ошибка бывает и до первой сборки, а хост в ответ может, например, // показать снекбар — посреди сборки это запрещено. WidgetsBinding.instance.addPostFrameCallback((_) { @@ -339,6 +471,13 @@ class _PersonalizationStoriesState extends State { } } + /// Открыть сторис номер [index] или с id [storyId]; нет такой — ничего. + Future _openStory({int? index, String? storyId}) => _open( + storyId != null + ? _stories.indexWhere((story) => story.id == storyId) + : index ?? -1, + ); + Future _open(int index) async { final sdk = _sdk; if (_presenting || index < 0 || index >= _stories.length) return; @@ -350,14 +489,13 @@ class _PersonalizationStoriesState extends State { sdk: sdk, stories: _stories, index: index, - paused: widget.controller?._paused, + controller: widget.controller, onSlideShown: (_, _) { if (mounted) setState(() {}); }, ); } finally { _presenting = false; - widget.controller?._paused.value = false; } } diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 7978a04..6d3bc55 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -63,6 +63,7 @@ class PersonalizationStoryViewer extends StatefulWidget { this.code, this.sdk, this.paused, + this.storyRequests, this.onSlideShown, this.onClose, this.onLinkClick, @@ -100,6 +101,10 @@ class PersonalizationStoryViewer extends StatefulWidget { /// Пауза от хоста: пока `true`, слайд стоит. final ValueListenable? paused; + /// Просьбы хоста перелистнуть открытый просмотр на сторис — индекс в [stories]. + /// Сторис без слайдов и текущая просьбы пропускают. + final Stream? storyRequests; + /// Слайд [slideIndex] сторис [story] стал текущим. final void Function(Story story, int slideIndex)? onSlideShown; @@ -192,6 +197,7 @@ class _PersonalizationStoryViewerState extends State /// Насколько просмотр стянут вниз; перестраивает только сдвиг, не страницы. final ValueNotifier _drag = ValueNotifier(0); + StreamSubscription? _requests; VideoPlayerController? _video; bool _videoReady = false; bool _videoPlaying = false; @@ -227,6 +233,7 @@ class _PersonalizationStoryViewerState extends State StoriesSound.instance.muted.addListener(_onMuted); widget.paused?.addListener(_onHostPause); _onHostPause(); + _requests = widget.storyRequests?.listen(_onStoryRequest); _onLifecycle(WidgetsBinding.instance.lifecycleState); // Первая страница осела сразу: заход после кадра — загрузка картинки читает контекст. WidgetsBinding.instance.addPostFrameCallback((_) { @@ -242,6 +249,10 @@ class _PersonalizationStoryViewerState extends State widget.paused?.addListener(_onHostPause); _onHostPause(); } + if (oldWidget.storyRequests != widget.storyRequests) { + _requests?.cancel(); + _requests = widget.storyRequests?.listen(_onStoryRequest); + } } @override @@ -270,6 +281,7 @@ class _PersonalizationStoryViewerState extends State void dispose() { WidgetsBinding.instance.removeObserver(this); widget.paused?.removeListener(_onHostPause); + _requests?.cancel(); StoriesSound.instance.muted.removeListener(_onMuted); _timeout?.cancel(); _autoRetry?.cancel(); @@ -379,6 +391,13 @@ class _PersonalizationStoryViewerState extends State if (mounted) setState(() {}); } + /// Хост просит сторис [index] исходного списка: листаем к ней, шторка сворачивается. + void _onStoryRequest(int index) { + if (_closing || index < 0 || index >= widget.stories.length) return; + final target = _playback.stories.indexOf(widget.stories[index]); + if (target >= 0) _step(_playback.turnTo(target)); + } + void _close() { if (_closing) return; _closing = true; diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 7832aca..4c45944 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -617,6 +617,116 @@ void main() { expect(api.views, ['2/20/block']); }); + testWidgets('open before the block loads runs after the load', ( + tester, + ) async { + final controller = PersonalizationStoriesController(); + final api = _FakeHostApi(_blockJson())..hold = Completer(); + await bar(tester, api: api, controller: controller); + var done = false; + unawaited(controller.openStory('2').then((_) => done = true)); + await tester.pump(); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + + api.hold!.complete(); + await tester.pump(); + await _closed(tester); + expect(find.text('Product 2'), findsOneWidget); + expect(done, isFalse); + await _wait(tester, const Duration(seconds: 2)); + await _closed(tester); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + expect(done, isTrue); + }); + + testWidgets('open with the viewer open turns to that story inside it', ( + tester, + ) async { + final controller = PersonalizationStoriesController(); + final api = await bar(tester, controller: controller); + var first = false; + var second = false; + unawaited(controller.open(0).then((_) => first = true)); + await _closed(tester); + expect(find.text('Product 1'), findsOneWidget); + + unawaited(controller.openStory('2').then((_) => second = true)); + await _wait(tester, const Duration(milliseconds: 500)); + expect(find.text('Product 2'), findsOneWidget); + expect(find.byType(PersonalizationStoryViewer), findsOneWidget); + expect(api.views, ['1/10/block', '2/20/block']); + expect(second, isFalse, reason: 'done when the viewer closes'); + + await _wait(tester, const Duration(seconds: 2)); + await _closed(tester); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + expect(first, isTrue); + expect(second, isTrue); + }); + + testWidgets('pause and resume without a viewer do nothing', (tester) async { + final controller = PersonalizationStoriesController(); + await bar(tester, controller: controller); + controller.pause(); + unawaited(controller.openStory('2')); + await _closed(tester); + expect(find.text('Product 2'), findsOneWidget); + await _wait(tester, const Duration(seconds: 2)); + await _closed(tester); + expect( + find.byType(PersonalizationStoryViewer), + findsNothing, + reason: 'the earlier pause did not stick', + ); + }); + + group('without an explicit SDK', () { + late _FakeHostApi api; + + setUp(() { + api = _FakeHostApi(_blockJson()); + REES46.debugFactory = (config) => + PersonalizationSdk(api: api, shopId: config.shopId); + }); + + tearDown(REES46.reset); + + Future> pumpBar(WidgetTester tester) async { + final errors = []; + await tester.pumpWidget( + _host( + PersonalizationStories( + code: 'block', + imageProvider: _offline, + onError: errors.add, + ), + ), + ); + return errors; + } + + testWidgets('the widget waits for the SDK registration', (tester) async { + final errors = await pumpBar(tester); + await tester.pump(const Duration(seconds: 3)); + expect(find.byType(PersonalizationStoryPreview), findsNWidgets(4)); + + REES46.initialize(const REES46Config(shopId: 'shop')); + await tester.pump(const Duration(milliseconds: 200)); + await tester.pump(); + expect(find.text('Story 1'), findsOneWidget); + expect(errors, isEmpty); + }); + + testWidgets('no registration in 15 s reaches onError', (tester) async { + final errors = await pumpBar(tester); + await tester.pump(PersonalizationStories.registrationTimeout); + await tester.pump(const Duration(milliseconds: 200)); + await tester.pump(); + expect(errors.single, isA()); + expect(find.byType(PersonalizationStoriesBar), findsNothing); + }); + }); + testWidgets('show() opens a block without the bar', (tester) async { final api = _FakeHostApi(_blockJson()); await tester.pumpWidget(_host(const Placeholder())); From f7a0164c96a8b195bc9500063cdcd673a3fe42a1 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:42:54 +0400 Subject: [PATCH 68/79] fix(ui): stories show() reports an empty block --- .../ui/widgets/personalization_stories.dart | 10 +++-- test/ui/personalization_stories_test.dart | 39 +++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 3767715..5a10e98 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -230,8 +230,9 @@ class PersonalizationStories extends StatefulWidget { /// Показать сторис блока [code] без ленты: загрузить блок и открыть просмотр — со /// сторис [startStoryId] (нет такой — с первой). Тексты, колбэки и [controller] — как /// у виджета. Ошибка (пустой код, магазин не зарегистрирован за 15 с или неоднозначен, - /// загрузка не удалась или дольше 15 с) уходит в [onError], просмотр не открывается. - /// Future завершается, когда просмотр закроют. + /// загрузка не удалась или дольше 15 с, в блоке нет сторис) уходит в [onError], + /// просмотр не открывается, Future завершается. Иначе Future завершается, когда + /// просмотр закроют. static Future show( BuildContext context, { required String code, @@ -284,12 +285,15 @@ class PersonalizationStories extends StatefulWidget { try { resolved = await _resolve(sdk, shopId); stories = await _fetch(resolved, code); + if (stories.isEmpty) { + throw StateError('stories block "$code" has no stories'); + } } catch (error) { debugPrint('PersonalizationStories.show: $code — $error'); onError?.call(error); return; } - if (stories.isEmpty || !context.mounted) return; + if (!context.mounted) return; final index = stories.indexWhere((story) => story.id == startStoryId); await _present( context, diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 4c45944..265dd2b 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -727,6 +727,45 @@ void main() { }); }); + testWidgets('show() reports an empty block and completes', (tester) async { + final api = _FakeHostApi(jsonEncode({'stories': []})); + await tester.pumpWidget(_host(const Placeholder())); + final errors = []; + var done = false; + unawaited( + PersonalizationStories.show( + tester.element(find.byType(Placeholder)), + code: 'block', + sdk: PersonalizationSdk(api: api, shopId: 'shop'), + onError: errors.add, + ).then((_) => done = true), + ); + await tester.pump(); + await tester.pump(); + expect(errors.single, isA()); + expect(done, isTrue); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + }); + + testWidgets('show() with an unknown start story opens the first', ( + tester, + ) async { + final api = _FakeHostApi(_blockJson()); + await tester.pumpWidget(_host(const Placeholder())); + unawaited( + PersonalizationStories.show( + tester.element(find.byType(Placeholder)), + code: 'block', + sdk: PersonalizationSdk(api: api, shopId: 'shop'), + startStoryId: 'missing', + imageProvider: _offline, + ), + ); + await tester.pump(); + await _closed(tester); + expect(find.text('Product 1'), findsOneWidget); + }); + testWidgets('show() opens a block without the bar', (tester) async { final api = _FakeHostApi(_blockJson()); await tester.pumpWidget(_host(const Placeholder())); From 653b383688ad8e45fed8c60aec08300b87dbc790 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:43:56 +0400 Subject: [PATCH 69/79] fix(ui): a stories controller handed to a loaded block runs its queued open --- .../ui/widgets/personalization_stories.dart | 10 ++++++-- test/ui/personalization_stories_test.dart | 25 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 5a10e98..1051657 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -420,15 +420,21 @@ class _PersonalizationStoriesState extends State { @override void didUpdateWidget(PersonalizationStories oldWidget) { super.didUpdateWidget(oldWidget); - if (oldWidget.controller != widget.controller) { + final controllerChanged = oldWidget.controller != widget.controller; + if (controllerChanged) { if (oldWidget.controller?._bar == this) oldWidget.controller?._bar = null; widget.controller?._bar = this; - if (!_loading) widget.controller?._flush(); } if (oldWidget.sdk != widget.sdk || oldWidget.shopId != widget.shopId || oldWidget.code != widget.code) { _load(); + } else if (controllerChanged) { + // Новый контроллер мог ждать загрузки, а блок уже загружен. После кадра: открытие + // просмотра посреди сборки запрещено. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted && !_loading) widget.controller?._flush(); + }); } } diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 265dd2b..b4baf2b 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -639,6 +639,31 @@ void main() { expect(done, isTrue); }); + testWidgets('a controller handed to a loaded block runs its open', ( + tester, + ) async { + final controller = PersonalizationStoriesController(); + unawaited(controller.openStory('2')); + final sdk = PersonalizationSdk(api: _FakeHostApi(_blockJson())); + Widget block(PersonalizationStoriesController? controller) => _host( + PersonalizationStories( + code: 'block', + sdk: sdk, + controller: controller, + imageProvider: _offline, + ), + ); + await tester.pumpWidget(block(null)); + await tester.pump(); + await tester.pump(); + expect(find.text('Story 2'), findsOneWidget); + expect(find.byType(PersonalizationStoryViewer), findsNothing); + + await tester.pumpWidget(block(controller)); + await _closed(tester); + expect(find.text('Product 2'), findsOneWidget); + }); + testWidgets('open with the viewer open turns to that story inside it', ( tester, ) async { From 3e6b9b688fd727597573715c5cb040598843a512 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 09:44:05 +0400 Subject: [PATCH 70/79] fix(ui): a story restart seeks only a ready video --- lib/src/ui/widgets/personalization_story_viewer.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 6d3bc55..06afdff 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -372,7 +372,7 @@ class _PersonalizationStoryViewerState extends State case StoriesStep.restart: // Тот же заход: медиа не перезагружается, `view` не повторяется. _progress.value = 0; - _video?.seekTo(Duration.zero); + if (_videoReady) _video?.seekTo(Duration.zero); case StoriesStep.turn: _sync(); final target = _playback.turnTarget!; From 97cb2e3be80d04eb8a3295dcbcb3f8d8b5bc8eee Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 2 Oct 2026 10:11:15 +0400 Subject: [PATCH 71/79] fix(ui): stories v2 drop repeated story ids --- .../ui/widgets/personalization_stories.dart | 2 +- lib/src/ui/widgets/stories_support.dart | 10 +++++++++ test/ui/stories_mapping_test.dart | 21 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 1051657..0205b2c 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -400,7 +400,7 @@ Future> _fetch(PersonalizationSdk sdk, String code) async { StoriesSeenStore.instance.load(sdk), ]).timeout(PersonalizationStories.loadTimeout); final block = results.first as StoriesBlock; - return block.stories.where((story) => story.slides.isNotEmpty).toList(); + return playableStories(block.stories); } class _PersonalizationStoriesState extends State { diff --git a/lib/src/ui/widgets/stories_support.dart b/lib/src/ui/widgets/stories_support.dart index c849302..e286823 100644 --- a/lib/src/ui/widgets/stories_support.dart +++ b/lib/src/ui/widgets/stories_support.dart @@ -276,3 +276,13 @@ PersonalizationStoryTextBlock storyTextBlock(StoryTextBlockElement element) { fontFamilyFallback: fallback, ); } + +/// Сторис, которые можно показать: со слайдами (C16) и без повторов id — сервер иногда +/// отдаёт одну сторис дважды; остаётся первая, иначе просмотренность по id склеивается. +List playableStories(Iterable stories) { + final ids = {}; + return [ + for (final story in stories) + if (story.slides.isNotEmpty && ids.add(story.id)) story, + ]; +} diff --git a/test/ui/stories_mapping_test.dart b/test/ui/stories_mapping_test.dart index 5f3f60d..a1dd25d 100644 --- a/test/ui/stories_mapping_test.dart +++ b/test/ui/stories_mapping_test.dart @@ -173,4 +173,25 @@ void main() { expect(storyTextAlign('center'), TextAlign.center); }); }); + + test('repeated story ids and stories without slides are dropped', () { + Story story(Object id, String name, {bool slides = true}) => Story.fromJson( + { + 'id': id, + 'name': name, + 'slides': slides + ? >[ + {'id': 1, 'type': 'image', 'background': 'x'}, + ] + : >[], + }, + ); + final list = playableStories([ + story(7, 'first'), + story(8, 'empty', slides: false), + story('7', 'again'), + story(9, 'other'), + ]); + expect(list.map((s) => s.name), ['first', 'other']); + }); } From debbfd854cae5ec51e92669acb3499d87717e4c0 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 6 Oct 2026 16:41:00 +0400 Subject: [PATCH 72/79] feat(ui): stories v2 reads gif frame delays and loop length --- lib/src/ui/widgets/stories_gif.dart | 128 ++++++++++++++++++++++++++++ test/ui/stories_gif_test.dart | 85 ++++++++++++++++++ 2 files changed, 213 insertions(+) create mode 100644 lib/src/ui/widgets/stories_gif.dart create mode 100644 test/ui/stories_gif_test.dart diff --git a/lib/src/ui/widgets/stories_gif.dart b/lib/src/ui/widgets/stories_gif.dart new file mode 100644 index 0000000..b8325b6 --- /dev/null +++ b/lib/src/ui/widgets/stories_gif.dart @@ -0,0 +1,128 @@ +import 'package:flutter/foundation.dart'; + +/// GIF по его байтам: размер и задержки кадров — без декодирования картинки. +/// +/// GIF узнаётся только по подписи `GIF87a` / `GIF89a` в начале байтов — не по адресу и +/// не по типу слайда. Задержка кадра — из его Graphic Control Extension; меньше 20 мс (и +/// 0, и кадр без расширения) считается 100 мс — как в браузерах. Один круг анимации +/// ([loop]) — сумма задержек всех кадров. Правила общие для всех платформ. +@immutable +class StoryGif { + const StoryGif._({ + required this.width, + required this.height, + required this.delays, + required bool complete, + }) : _complete = complete; + + /// Размер холста GIF в пикселях. + final int width; + final int height; + + /// Задержки кадров по порядку, уже с поправкой на короткие ([frameDelay]). + final List delays; + + /// Разбор дошёл до конца без ошибок. + final bool _complete; + + /// Короче этого задержка кадра не бывает: такая считается [shortDelay]. + static const Duration minDelay = Duration(milliseconds: 20); + + /// Задержка вместо слишком короткой. + static const Duration shortDelay = Duration(milliseconds: 100); + + /// Длина одного круга анимации; `null` — неизвестна: байты битые или кадров нет. + Duration? get loop { + if (!_complete || delays.isEmpty) return null; + return delays.fold(Duration.zero, (sum, delay) => sum + delay); + } + + /// Задержка кадра по правилу браузеров: меньше 20 мс (и 0) — 100 мс. + static Duration frameDelay(Duration delay) => + delay < minDelay ? shortDelay : delay; + + /// Байты начинаются с подписи GIF. + static bool isGif(List bytes) { + if (bytes.length < 6) return false; + // «GIF8», затем «7a» или «9a». + return bytes[0] == 0x47 && + bytes[1] == 0x49 && + bytes[2] == 0x46 && + bytes[3] == 0x38 && + (bytes[4] == 0x37 || bytes[4] == 0x39) && + bytes[5] == 0x61; + } + + /// Разобрать [bytes]; не GIF — `null`. Битый GIF разбирается до первой ошибки, а его + /// круг неизвестен ([loop] — `null`). + static StoryGif? parse(List bytes) { + if (!isGif(bytes)) return null; + final delays = []; + if (bytes.length < 13) { + return StoryGif._(width: 0, height: 0, delays: delays, complete: false); + } + final width = bytes[6] | bytes[7] << 8; + final height = bytes[8] | bytes[9] << 8; + // Заголовок 6 байт, описание экрана 7 байт, за ним общая палитра. + var at = 13 + _paletteSize(bytes[10]); + var delay = Duration.zero; + var complete = true; + while (at < bytes.length) { + final block = bytes[at++]; + if (block == 0x3B) break; // Конец файла. + if (block == 0x21) { + // Расширение: метка, затем подблоки до пустого. + if (at >= bytes.length) { + complete = false; + break; + } + final label = bytes[at++]; + // Graphic Control Extension: размер 4, флаги, задержка в сотых секунды (LE). + if (label == 0xF9 && at + 3 < bytes.length && bytes[at] >= 4) { + final hundredths = bytes[at + 2] | bytes[at + 3] << 8; + delay = Duration(milliseconds: hundredths * 10); + } + at = _skipSubBlocks(bytes, at); + } else if (block == 0x2C) { + // Кадр: 9 байт описания, своя палитра, размер кода LZW, подблоки данных. + if (at + 9 > bytes.length) { + complete = false; + break; + } + at += 9 + _paletteSize(bytes[at + 8]) + 1; + at = _skipSubBlocks(bytes, at); + if (at >= 0) { + delays.add(frameDelay(delay)); + delay = Duration.zero; + } + } else { + at = -1; // Неизвестный блок. + } + if (at < 0) { + complete = false; + break; + } + } + return StoryGif._( + width: width, + height: height, + delays: List.unmodifiable(delays), + complete: complete, + ); + } + + /// Байт палитры по флагам: есть палитра — 3 × 2^(N+1). + static int _paletteSize(int flags) => + flags & 0x80 == 0 ? 0 : 3 * (1 << ((flags & 0x07) + 1)); + + /// Позиция после подблоков, начиная с [at]; байты кончились раньше — `-1`. + static int _skipSubBlocks(List bytes, int at) { + var position = at; + while (position < bytes.length) { + final size = bytes[position++]; + if (size == 0) return position; + position += size; + } + return -1; + } +} diff --git a/test/ui/stories_gif_test.dart b/test/ui/stories_gif_test.dart new file mode 100644 index 0000000..4fc43f1 --- /dev/null +++ b/test/ui/stories_gif_test.dart @@ -0,0 +1,85 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_gif.dart'; + +/// The fixture all four SDKs test with: 2×2, 3 frames, delays 10 / 0 / 50 hundredths +/// of a second → 100 + 100 + 500 = 700 ms per loop. +final Uint8List gifFixture = base64Decode( + 'R0lGODlhAgACAIEAAP8AAAD/AAAA/////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQACgAAACwAAAAAAgACAAA' + 'CAoRRACH5BAAAAAAALAAAAAACAAIAAAICjFMAIfkEADIAAAAsAAAAAAIAAgAAAgKUVQA7', +); + +void main() { + group('StoryGif', () { + test('the shared fixture: 3 frames, 100/100/500 ms, a 700 ms loop', () { + expect(StoryGif.isGif(gifFixture), isTrue); + final gif = StoryGif.parse(gifFixture)!; + expect(gif.width, 2); + expect(gif.height, 2); + expect(gif.delays, const [ + Duration(milliseconds: 100), + Duration(milliseconds: 100), + Duration(milliseconds: 500), + ]); + expect(gif.loop, const Duration(milliseconds: 700)); + }); + + test('GIF87a is a GIF too; other bytes are not', () { + final old = Uint8List.fromList(gifFixture)..[4] = 0x37; // "GIF87a" + expect(StoryGif.isGif(old), isTrue); + expect(StoryGif.parse(old)!.loop, const Duration(milliseconds: 700)); + + const png = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0, 0]; + expect(StoryGif.isGif(png), isFalse); + expect(StoryGif.parse(png), isNull); + expect(StoryGif.isGif(ascii.encode('GIF90a')), isFalse); + expect( + StoryGif.isGif(ascii.encode('GIF8')), + isFalse, + reason: 'too short', + ); + expect(StoryGif.parse([]), isNull); + }); + + test('a delay below 20 ms counts as 100 ms, the browser rule', () { + expect(StoryGif.frameDelay(Duration.zero), StoryGif.shortDelay); + expect( + StoryGif.frameDelay(const Duration(milliseconds: 10)), + const Duration(milliseconds: 100), + ); + expect( + StoryGif.frameDelay(const Duration(milliseconds: 19)), + const Duration(milliseconds: 100), + ); + expect( + StoryGif.frameDelay(const Duration(milliseconds: 20)), + const Duration(milliseconds: 20), + ); + }); + + test('a broken GIF has no known loop', () { + // Cut inside the second frame. + final cut = StoryGif.parse(gifFixture.sublist(0, 80))!; + expect(StoryGif.isGif(gifFixture.sublist(0, 80)), isTrue); + expect(cut.loop, isNull); + // An unknown block. + final garbled = Uint8List.fromList(gifFixture)..[0x2C] = 0x99; + expect(StoryGif.parse(garbled)!.loop, isNull); + // A header alone: no frames. + expect(StoryGif.parse(gifFixture.sublist(0, 13))!.loop, isNull); + }); + + test( + 'a GIF that ends after its last frame without a trailer still counts', + () { + final noTrailer = gifFixture.sublist(0, gifFixture.length - 1); + expect( + StoryGif.parse(noTrailer)!.loop, + const Duration(milliseconds: 700), + ); + }, + ); + }); +} From 0b84eac3014176cf79ee261e5c7acdd194ef6df2 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 6 Oct 2026 16:51:47 +0400 Subject: [PATCH 73/79] feat(ui): stories v2 loads images itself, a gif off the slide stays on its first frame --- .../ui/widgets/personalization_stories.dart | 2 +- .../widgets/personalization_story_viewer.dart | 2 +- lib/src/ui/widgets/stories_image.dart | 193 ++++++++++++++++++ lib/src/ui/widgets/stories_support.dart | 13 +- test/ui/stories_gif_test.dart | 92 +++++++++ test/ui/stories_image_test.dart | 126 ++++++++++++ 6 files changed, 422 insertions(+), 6 deletions(-) create mode 100644 lib/src/ui/widgets/stories_image.dart create mode 100644 test/ui/stories_image_test.dart diff --git a/lib/src/ui/widgets/personalization_stories.dart b/lib/src/ui/widgets/personalization_stories.dart index 0205b2c..b853e1f 100644 --- a/lib/src/ui/widgets/personalization_stories.dart +++ b/lib/src/ui/widgets/personalization_stories.dart @@ -209,7 +209,7 @@ class PersonalizationStories extends StatefulWidget { /// Поля ленты. final EdgeInsetsGeometry padding; - /// Картинка по адресу; не задан — [NetworkImage]. + /// Картинка по адресу; не задан — загрузчик SDK ([PersonalizationStoryImageProvider]). final PersonalizationStoryImageProvider? imageProvider; final Widget Function( diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 06afdff..94b7964 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -143,7 +143,7 @@ class PersonalizationStoryViewer extends StatefulWidget { final String soundOnLabel; final String soundOffLabel; - /// Картинка по адресу; не задан — [NetworkImage]. + /// Картинка по адресу; не задан — загрузчик SDK ([PersonalizationStoryImageProvider]). final PersonalizationStoryImageProvider? imageProvider; final Widget Function( diff --git a/lib/src/ui/widgets/stories_image.dart b/lib/src/ui/widgets/stories_image.dart new file mode 100644 index 0000000..2bad4ea --- /dev/null +++ b/lib/src/ui/widgets/stories_image.dart @@ -0,0 +1,193 @@ +import 'dart:async'; +import 'dart:collection'; +import 'dart:io'; +import 'dart:ui' as ui; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/painting.dart'; + +import 'stories_gif.dart'; + +/// Байты картинок сторис из сети — так же, как их качает [NetworkImage]. Один адрес +/// качается одним запросом: повторный, пока идёт загрузка, ждёт её же. +/// +/// Байты фонов слайдов ([load] с `keep`) ещё и остаются в памяти — несколько последних +/// ([maxEntries], [maxBytes]): возврат на слайд начинает его GIF с первого кадра без +/// новой загрузки, а фото и GIF одного слайда не качаются дважды. Неудача не запоминается. +class StoriesImageBytes { + StoriesImageBytes({ + this.maxEntries = 4, + this.maxBytes = 48 * 1024 * 1024, + Future Function(Uri uri)? fetch, + }) : _fetch = fetch ?? _download; + + /// Загрузчик процесса. Тесты подменяют его. + static StoriesImageBytes instance = StoriesImageBytes(); + + final int maxEntries; + final int maxBytes; + final Future Function(Uri uri) _fetch; + final Map> _loading = >{}; + final Set _keep = {}; + + /// Оставленные байты: последний — самый свежий. + final LinkedHashMap _kept = + LinkedHashMap(); + + // Как у NetworkImage: сжатие снимает consolidateHttpClientResponseBytes. + static final HttpClient _client = HttpClient()..autoUncompress = false; + + static Future _download(Uri uri) async { + final request = await _client.getUrl(uri); + final response = await request.close(); + if (response.statusCode != HttpStatus.ok) { + await response.drain>([]); + throw NetworkImageLoadException( + statusCode: response.statusCode, + uri: uri, + ); + } + final bytes = await consolidateHttpClientResponseBytes(response); + if (bytes.lengthInBytes == 0) { + throw Exception('PersonalizationStories: empty image $uri'); + } + return bytes; + } + + /// Байты [url]: из памяти, из идущей загрузки или скачанные сейчас. [keep] — оставить + /// их в памяти после загрузки (фон слайда). + Future load(String url, {bool keep = false}) { + final kept = _kept.remove(url); + if (kept != null) { + _kept[url] = kept; + return Future.value(kept); + } + if (keep) _keep.add(url); + final loading = _loading[url]; + if (loading != null) return loading; + final future = _fetch(Uri.base.resolve(url)) + .then((bytes) { + if (_keep.remove(url)) _put(url, bytes); + return bytes; + }) + .whenComplete(() { + _loading.remove(url); + _keep.remove(url); + }); + _loading[url] = future; + return future; + } + + /// Забыть байты [url] — «Повторить» качает заново. + void evict(String url) => _kept.remove(url); + + void _put(String url, Uint8List bytes) { + _kept[url] = bytes; + var total = _kept.values.fold(0, (sum, kept) => sum + kept.length); + while (_kept.isNotEmpty && + (_kept.length > maxEntries || total > maxBytes)) { + final oldest = _kept.keys.first; + total -= _kept.remove(oldest)!.length; + } + } +} + +/// Картинка сторис по адресу, когда хост не дал своего провайдера: качается как у +/// [NetworkImage] (через [StoriesImageBytes]), но GIF показывается только первым кадром и +/// не анимируется — так рисуются обложки, превью, постеры видео и картинки товаров. +/// Анимирует GIF только фон слайда ([StoryGifPlayer]). Прочие форматы — как у +/// [NetworkImage]. +@immutable +class StoryImage extends ImageProvider { + const StoryImage(this.url); + + final String url; + + @override + Future obtainKey(ImageConfiguration configuration) => + SynchronousFuture(this); + + @override + ImageStreamCompleter loadImage(StoryImage key, ImageDecoderCallback decode) => + MultiFrameImageStreamCompleter( + codec: _codec(key, decode), + scale: 1, + debugLabel: url, + informationCollector: () => [ + DiagnosticsProperty('Image provider', this), + DiagnosticsProperty('Image key', key), + ], + ); + + Future _codec(StoryImage key, ImageDecoderCallback decode) async { + try { + final bytes = await StoriesImageBytes.instance.load(url); + final codec = await decode(await ui.ImmutableBuffer.fromUint8List(bytes)); + return StoryGif.isGif(bytes) ? firstFrame(codec) : codec; + } catch (_) { + // Как у NetworkImage: неудача не остаётся в кэше — следующий показ грузит заново. + scheduleMicrotask(() => PaintingBinding.instance.imageCache.evict(key)); + rethrow; + } + } + + /// Кодек, у которого из [codec] остаётся один первый кадр. + @visibleForTesting + static ui.Codec firstFrame(ui.Codec codec) => _FirstFrame(codec); + + @override + bool operator ==(Object other) => other is StoryImage && other.url == url; + + @override + int get hashCode => url.hashCode; + + @override + String toString() => '${objectRuntimeType(this, 'StoryImage')}("$url")'; +} + +/// Кодек с одним кадром — первым: GIF стоит на месте. Декодер после первого кадра +/// закрывается — в памяти остаётся только сам кадр. +class _FirstFrame implements ui.Codec { + _FirstFrame(this._codec); + + ui.Codec? _codec; + Future? _first; + + @override + int get frameCount => 1; + + @override + int get repetitionCount => 0; + + @override + Future getNextFrame() async { + final first = await (_first ??= _decodeFirst()); + return _Frame(first.clone()); + } + + Future _decodeFirst() async { + final codec = _codec!; + final frame = await codec.getNextFrame(); + codec.dispose(); + _codec = null; + return frame.image; + } + + @override + void dispose() { + _codec?.dispose(); + _codec = null; + _first?.then((image) => image.dispose(), onError: (Object _) {}); + _first = null; + } +} + +class _Frame implements ui.FrameInfo { + _Frame(this.image); + + @override + final ui.Image image; + + @override + Duration get duration => Duration.zero; +} diff --git a/lib/src/ui/widgets/stories_support.dart b/lib/src/ui/widgets/stories_support.dart index e286823..0089959 100644 --- a/lib/src/ui/widgets/stories_support.dart +++ b/lib/src/ui/widgets/stories_support.dart @@ -5,18 +5,23 @@ import '../../stories/stories_response.dart'; import '../components/personalization_product.dart'; import '../components/personalization_story_price.dart'; import '../components/personalization_story_text_block.dart'; +import 'stories_image.dart'; -/// Как получить картинку по адресу из данных сторис. Не задан — [NetworkImage]; хост -/// подставляет свой провайдер, например с кэшем. +/// Как получить картинку по адресу из данных сторис. Не задан — свой загрузчик SDK: качает +/// как [NetworkImage], GIF анимирует только на фоне слайда и по нему же меряет длину +/// слайда, а обложки, превью, постеры и картинки товаров показывает первым кадром. Хост +/// подставляет свой провайдер, например с кэшем, — тогда GIF им и рисуется: SDK его не +/// анимирует, не останавливает и не меряет, слайд длится время из админки. typedef PersonalizationStoryImageProvider = ImageProvider Function(String url); -/// Картинка по адресу; пустой адрес — `null`. +/// Картинка по адресу — провайдер хоста или [StoryImage] (GIF — первым кадром); пустой +/// адрес — `null`. ImageProvider? storyImage( String url, PersonalizationStoryImageProvider? custom, ) { if (url.isEmpty) return null; - return custom?.call(url) ?? NetworkImage(url); + return custom?.call(url) ?? StoryImage(url); } /// Цвет из `#RRGGBB`, `#RGB` или `#AARRGGBB`; не разобрать — `null`. diff --git a/test/ui/stories_gif_test.dart b/test/ui/stories_gif_test.dart index 4fc43f1..8826a2c 100644 --- a/test/ui/stories_gif_test.dart +++ b/test/ui/stories_gif_test.dart @@ -1,8 +1,12 @@ import 'dart:convert'; import 'dart:typed_data'; +import 'dart:ui' as ui; +import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/personalization_ui.dart'; import 'package:rees46_sdk/src/ui/widgets/stories_gif.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_image.dart'; /// The fixture all four SDKs test with: 2×2, 3 frames, delays 10 / 0 / 50 hundredths /// of a second → 100 + 100 + 500 = 700 ms per loop. @@ -82,4 +86,92 @@ void main() { }, ); }); + + group('StoryImage', () { + setUp(() { + StoriesImageBytes.instance = StoriesImageBytes( + fetch: (_) async => gifFixture, + ); + }); + tearDown(() => StoriesImageBytes.instance = StoriesImageBytes()); + + test('a GIF codec gives its first frame only, again and again', () async { + final codec = await ui.instantiateImageCodec(gifFixture); + final frames = >[ + for (var i = 0; i < 3; i++) + await _pixel((await codec.getNextFrame()).image), + ]; + expect(frames[0], isNot(frames[1]), reason: 'the fixture frames differ'); + + final still = StoryImage.firstFrame( + await ui.instantiateImageCodec(gifFixture), + ); + expect(still.frameCount, 1); + expect(still.repetitionCount, 0); + for (var i = 0; i < 4; i++) { + expect(await _pixel((await still.getNextFrame()).image), frames[0]); + } + still.dispose(); + }); + + testWidgets('a GIF cover shows its first frame', (tester) async { + const image = StoryImage('https://cdn.example/cover.gif'); + final emitted = []; + final listener = ImageStreamListener( + (info, _) => emitted.add(info.image), + ); + await tester.pumpWidget( + const Directionality( + textDirection: TextDirection.ltr, + child: Center(child: PersonalizationStoryCover(image: image)), + ), + ); + final stream = image.resolve(ImageConfiguration.empty) + ..addListener(listener); + addTearDown(() => stream.removeListener(listener)); + + // Decoding is real async; give a 700 ms loop time to come round twice. + final first = await tester.runAsync(() async { + await precacheImage(image, tester.element(find.byType(Center))); + await Future.delayed(const Duration(milliseconds: 1500)); + final codec = await ui.instantiateImageCodec(gifFixture); + return _pixel((await codec.getNextFrame()).image); + }); + await tester.pump(); + + expect(emitted, hasLength(1), reason: 'one frame, no animation'); + final shown = tester.widget(find.byType(RawImage)).image!; + expect(await tester.runAsync(() => _pixel(shown)), first); + }); + + testWidgets('other formats stay as NetworkImage draws them', ( + tester, + ) async { + final png = base64Decode( + 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==', + ); + StoriesImageBytes.instance = StoriesImageBytes(fetch: (_) async => png); + const image = StoryImage('https://cdn.example/photo.png'); + await tester.pumpWidget( + const Directionality( + textDirection: TextDirection.ltr, + child: Center(child: PersonalizationStoryCover(image: image)), + ), + ); + await tester.runAsync( + () => precacheImage(image, tester.element(find.byType(Center))), + ); + await tester.pump(); + final shown = tester.widget(find.byType(RawImage)).image!; + expect(shown.width, 1); + expect(const StoryImage('a'), const StoryImage('a')); + expect(const StoryImage('a'), isNot(const StoryImage('b'))); + }); + }); +} + +/// The RGBA of the top-left pixel of [image]. +Future> _pixel(ui.Image image) async { + final data = await image.toByteData(); + return data!.buffer.asUint8List(0, 4).toList(); } diff --git a/test/ui/stories_image_test.dart b/test/ui/stories_image_test.dart new file mode 100644 index 0000000..ceba693 --- /dev/null +++ b/test/ui/stories_image_test.dart @@ -0,0 +1,126 @@ +import 'dart:async'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:flutter/painting.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_image.dart'; + +// No test binding here: the loader talks to a real loopback server. +void main() { + group('StoriesImageBytes', () { + late List fetched; + late Map> pending; + + StoriesImageBytes loader({int maxEntries = 4, int maxBytes = 1 << 20}) { + fetched = []; + pending = >{}; + return StoriesImageBytes( + maxEntries: maxEntries, + maxBytes: maxBytes, + fetch: (uri) { + fetched.add(uri.path); + return (pending[uri.path] = Completer()).future; + }, + ); + } + + Uint8List bytes(int size) => Uint8List(size); + + test( + 'one request per address; a slide background stays in memory', + () async { + final images = loader(); + final first = images.load('https://cdn.example/a.gif', keep: true); + final second = images.load('https://cdn.example/a.gif'); + expect(fetched, ['/a.gif']); + pending['/a.gif']!.complete(bytes(3)); + expect(await first, hasLength(3)); + expect(await second, hasLength(3)); + + // Kept: a restart or a return to the slide does not download again. + expect(await images.load('https://cdn.example/a.gif'), hasLength(3)); + expect(fetched, ['/a.gif']); + + // Evicted (Retry): downloaded again. + images.evict('https://cdn.example/a.gif'); + unawaited(images.load('https://cdn.example/a.gif')); + expect(fetched, ['/a.gif', '/a.gif']); + }, + ); + + test('a cover is not kept; a later keep request is honoured', () async { + final images = loader(); + final cover = images.load('https://cdn.example/c.jpg'); + final slide = images.load('https://cdn.example/c.jpg', keep: true); + pending['/c.jpg']!.complete(bytes(1)); + await cover; + await slide; + await images.load('https://cdn.example/c.jpg'); + expect(fetched, ['/c.jpg'], reason: 'kept for the slide'); + + unawaited(images.load('https://cdn.example/d.jpg')); + pending['/d.jpg']!.complete(bytes(1)); + await Future.delayed(Duration.zero); + unawaited(images.load('https://cdn.example/d.jpg')); + expect(fetched, ['/c.jpg', '/d.jpg', '/d.jpg']); + }); + + test('memory keeps the newest entries within both limits', () async { + final images = loader(maxEntries: 2, maxBytes: 10); + for (final name in ['a', 'b', 'c']) { + final load = images.load('https://cdn.example/$name', keep: true); + pending['/$name']!.complete(bytes(4)); + await load; + } + await images.load('https://cdn.example/c'); + await images.load('https://cdn.example/b'); + expect(fetched, ['/a', '/b', '/c'], reason: 'b and c kept'); + unawaited(images.load('https://cdn.example/a')); + expect(fetched.last, '/a', reason: 'a was the oldest'); + + final big = images.load('https://cdn.example/big', keep: true); + pending['/big']!.complete(bytes(11)); + await big; + unawaited(images.load('https://cdn.example/big')); + expect(fetched.last, '/big', reason: 'over the byte limit'); + }); + + test('a failure is not remembered', () async { + final images = loader(); + final failed = images.load('https://cdn.example/x', keep: true); + pending['/x']!.completeError(StateError('offline')); + await expectLater(failed, throwsStateError); + unawaited(images.load('https://cdn.example/x')); + expect(fetched, ['/x', '/x']); + }); + + test( + 'downloads like NetworkImage: a non-200 or empty answer fails', + () async { + final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0); + addTearDown(() => server.close(force: true)); + server.listen((request) { + final response = request.response; + switch (request.uri.path) { + case '/ok.gif': + response.add([0x47, 0x49, 0x46]); + case '/empty.gif': + break; + default: + response.statusCode = HttpStatus.notFound; + } + response.close(); + }); + final base = 'http://127.0.0.1:${server.port}'; + final images = StoriesImageBytes(); + expect(await images.load('$base/ok.gif'), [0x47, 0x49, 0x46]); + await expectLater( + images.load('$base/missing.gif'), + throwsA(isA()), + ); + await expectLater(images.load('$base/empty.gif'), throwsException); + }, + ); + }); +} From c324d279facf51730c4b38583f77f9049eead284 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 6 Oct 2026 16:55:55 +0400 Subject: [PATCH 74/79] feat(ui): stories v2 plays gif slides for at least one loop and pauses them with the slide --- .../widgets/personalization_story_viewer.dart | 74 ++++++- lib/src/ui/widgets/stories_gif_player.dart | 189 ++++++++++++++++++ lib/src/ui/widgets/stories_playback.dart | 11 +- lib/src/ui/widgets/stories_slide_view.dart | 17 ++ test/ui/gif_fixture.dart | 54 +++++ test/ui/personalization_stories_test.dart | 156 +++++++++++++++ test/ui/stories_gif_test.dart | 105 +++++++++- test/ui/stories_playback_test.dart | 52 +++++ 8 files changed, 643 insertions(+), 15 deletions(-) create mode 100644 lib/src/ui/widgets/stories_gif_player.dart create mode 100644 test/ui/gif_fixture.dart diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index 94b7964..c7e0709 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -8,6 +8,9 @@ import 'package:video_player/video_player.dart'; import '../../personalization_sdk.dart'; import '../../stories/stories_response.dart'; +import 'stories_gif.dart'; +import 'stories_gif_player.dart'; +import 'stories_image.dart'; import 'stories_media_cache.dart'; import 'stories_playback.dart'; import 'stories_seen_store.dart'; @@ -41,7 +44,12 @@ import 'stories_support.dart'; /// подгрузке; видео не ждёт загрузки целиком: играет по сети, пока кэш на диске /// ([StoriesMediaCache]) заполняется в фоне, и из файла в следующий раз; следующий слайд /// подгружается заранее. Звук выключен при первом открытии, выбор помнится до конца -/// процесса, кнопка громкости «вверх» включает звук ([StoriesSound]). +/// процесса, кнопка громкости «вверх» включает звук ([StoriesSound]); +/// - GIF на фоне слайда (узнаётся по байтам) играет по своим задержкам, а слайд длится +/// время из админки или один круг GIF — что дольше. Стоит слайд — стоит и GIF на +/// текущем кадре; перезапуск и новый заход начинают его с первого кадра без новой +/// загрузки ([StoryGifPlayer]). Обложки, постеры и картинки товаров показывают первый +/// кадр. С картинками хоста ([imageProvider]) GIF рисует хост, слайд — время админки. /// /// Трекинг через [sdk] с кодом [code]: `view` — на каждый слайд, ставший текущим на /// осевшей странице; `click` — кнопка, товар, карусель, копирование промокода. Id, которые @@ -202,6 +210,9 @@ class _PersonalizationStoryViewerState extends State bool _videoReady = false; bool _videoPlaying = false; + /// GIF фона текущего слайда; кадр у него есть — когда готов. + StoryGifPlayer? _gif; + /// 10 с на готовность медиа и 15 с до самоповтора видео; в фоне замирают. StoriesTimer? _timeout; StoriesTimer? _autoRetry; @@ -287,6 +298,7 @@ class _PersonalizationStoryViewerState extends State _autoRetry?.cancel(); _ticker.dispose(); _disposeVideo(); + _disposeGif(); StoriesSound.instance.detach(); _pages.dispose(); _progress.dispose(); @@ -345,6 +357,10 @@ class _PersonalizationStoryViewerState extends State (video == null || !video.isPlaying || video.isBuffering)) { return; } + // GIF идёт теми же шагами, что часы слайда: стоят часы — стоит и он. + _gif?.advance( + delta > StoriesPlayback.maxTick ? StoriesPlayback.maxTick : delta, + ); final ended = _playback.tick(delta); _progress.value = _playback.progress; if (ended) _step(_playback.next()); @@ -373,6 +389,7 @@ class _PersonalizationStoryViewerState extends State // Тот же заход: медиа не перезагружается, `view` не повторяется. _progress.value = 0; if (_videoReady) _video?.seekTo(Duration.zero); + _gif?.restart(); case StoriesStep.turn: _sync(); final target = _playback.turnTarget!; @@ -472,6 +489,7 @@ class _PersonalizationStoryViewerState extends State _timeout?.cancel(); _autoRetry?.cancel(); _disposeVideo(); + _disposeGif(); _sync(); final slide = _playback.slide; switch (storyMediaOf(slide)) { @@ -486,9 +504,30 @@ class _PersonalizationStoryViewerState extends State } } - void _loadImage(String url, int generation) { - final image = storyImage(url, widget.imageProvider); - if (image == null) return _ready(generation); + /// Картинка хоста — как есть, время слайда из админки. Своя — байты один раз: GIF + /// играет [StoryGifPlayer] (готов с первым кадром, слайд не короче круга), прочее — + /// фото как у [NetworkImage]. + Future _loadImage(String url, int generation) async { + final custom = widget.imageProvider; + if (custom != null) return _precache(custom(url), generation); + try { + final bytes = await StoriesImageBytes.instance.load(url, keep: true); + if (!_current(generation)) return; + final gif = StoryGif.parse(bytes); + if (gif == null) return _precache(StoryImage(url), generation); + final player = StoryGifPlayer(bytes, gif, limit: _slideLimit()); + _gif = player; + await player.start(); + if (!_current(generation) || _gif != player) return; + _playback.useGifLoop(gif.loop); + _ready(generation); + } catch (error) { + debugPrint('PersonalizationStoryViewer: image $url — $error'); + _failed(generation); + } + } + + void _precache(ImageProvider image, int generation) { var failed = false; precacheImage( image, @@ -497,6 +536,17 @@ class _PersonalizationStoryViewerState extends State ).then((_) => failed ? _failed(generation) : _ready(generation)); } + /// Площадь слайда в пикселях: больше неё кадры GIF не держатся. Слайд — во весь экран. + Size? _slideLimit() { + final size = View.maybeOf(context)?.physicalSize; + return size == null || size.isEmpty ? null : size; + } + + void _disposeGif() { + _gif?.dispose(); + _gif = null; + } + /// Видео из кэша, а нет файла — сразу по сети, пока кэш заполняется в фоне: загрузка /// целиком не ждётся. Готово — когда плеер готов играть. Future _loadVideo(String url, int generation) async { @@ -560,10 +610,10 @@ class _PersonalizationStoryViewerState extends State void _retry() { final slide = _playback.slide; - final image = storyMediaOf(slide) == StoryMedia.image - ? storyImage(slide.background, widget.imageProvider) - : null; - image?.evict(); + if (storyMediaOf(slide) == StoryMedia.image) { + storyImage(slide.background, widget.imageProvider)?.evict(); + StoriesImageBytes.instance.evict(slide.background); + } final generation = _playback.retry(); _progress.value = 0; _load(generation); @@ -617,6 +667,13 @@ class _PersonalizationStoryViewerState extends State case StoryMedia.none: break; case StoryMedia.image: + // Байты своего загрузчика остаются в памяти: GIF следующего слайда не качается + // второй раз, а его первый кадр уже готов. + if (widget.imageProvider == null) { + StoriesImageBytes.instance + .load(next.background, keep: true) + .then((_) {}, onError: (Object _) {}); + } final image = storyImage(next.background, widget.imageProvider); if (image != null) precacheImage(image, context, onError: (_, _) {}); case StoryMedia.video: @@ -770,6 +827,7 @@ class _PersonalizationStoryViewerState extends State generation: live ? _playback.generation : 0, progress: live ? _progress : null, video: live && _videoReady ? _video : null, + gif: live ? _gif : null, muted: StoriesSound.instance.muted.value, sheetOpen: live && _playback.sheetOpen, failed: live && _playback.pausedBy(StoriesPauseReason.error), diff --git a/lib/src/ui/widgets/stories_gif_player.dart b/lib/src/ui/widgets/stories_gif_player.dart new file mode 100644 index 0000000..94cc775 --- /dev/null +++ b/lib/src/ui/widgets/stories_gif_player.dart @@ -0,0 +1,189 @@ +import 'dart:math' as math; +import 'dart:ui' as ui; + +import 'package:flutter/foundation.dart'; + +import 'stories_gif.dart'; + +/// Проигрыватель GIF фона слайда: кадры по своим задержкам ([StoryGif.delays]), по +/// кругу, пока слайд идёт. +/// +/// - [start] декодирует первый кадр — с ним слайд готов, и его часы могут идти; +/// - время даёт просмотр ([advance]) теми же шагами, что часы слайда: стоят часы — стоит +/// и GIF на текущем кадре, а продолжение идёт с него же и с остатком его задержки; +/// - [restart] — с первого кадра из тех же байтов в памяти, без новой загрузки; +/// - кодек отдаёт кадры по одному: в памяти только показанный кадр и следующий. Кадр +/// крупнее [limit] (площадь слайда в пикселях) уменьшается до неё — движок +/// анимированные картинки при декодировании не ужимает. +class StoryGifPlayer extends ChangeNotifier { + StoryGifPlayer(this.bytes, this.gif, {this.limit}); + + /// Байты GIF — из них же кодек создаётся заново при [restart]. + final Uint8List bytes; + final StoryGif gif; + + /// Больше этого кадр не держится; `null` — без ограничения. + final ui.Size? limit; + + /// Как из байтов получить кодек. Тесты подменяют. + @visibleForTesting + static Future Function(Uint8List bytes) codecOf = + ui.instantiateImageCodec; + + ui.Codec? _codec; + ui.Image? _frame; + ui.Image? _next; + Duration _nextDuration = Duration.zero; + int _index = 0; + + /// Сколько ещё показывать текущий кадр; меньше нуля — следующий уже опаздывает. + Duration _left = Duration.zero; + + /// Номер запуска: декодирование прошлого запуска (до [restart] или [dispose]) + /// отбрасывается. + int _run = 0; + bool _disposed = false; + + /// Показанный кадр; `null` — первый ещё не готов. + ui.Image? get frame => _frame; + + /// Номер показанного кадра. + int get index => _index; + + /// Задержка кадра [index]: из разбора байтов, а если кодек насчитал другое число + /// кадров — из самого кодека, с той же поправкой на короткие. + Duration _delay(int index, Duration decoded) { + final codec = _codec; + if (codec != null && + gif.delays.length == codec.frameCount && + index < gif.delays.length) { + return gif.delays[index]; + } + return StoryGif.frameDelay(decoded); + } + + /// Декодировать первый кадр. Ошибка декодирования — исключение: слайд покажет + /// «Повторить», как у битого фото. + Future start() => _open(++_run); + + /// С первого кадра: новый кодек из тех же байтов. Пока он готовится, виден прежний + /// кадр, а время первого кадра уже идёт — вровень с часами слайда. До первого кадра + /// перезапускать нечего: [start] его и покажет. + Future restart() async { + if (_disposed || _frame == null) return; + final run = ++_run; + _next?.dispose(); + _next = null; + _index = 0; + _left = gif.delays.isEmpty ? StoryGif.shortDelay : gif.delays.first; + try { + await _open(run); + } catch (error) { + debugPrint('StoryGifPlayer: restart — $error'); + } + } + + Future _open(int run) async { + final codec = await codecOf(bytes); + if (run != _run) { + codec.dispose(); + return; + } + _codec?.dispose(); + _codec = codec; + final first = await codec.getNextFrame(); + if (run != _run) { + first.image.dispose(); + return; + } + // После перезапуска время первого кадра уже идёт ([restart]); при старте — с нуля. + final starting = _frame == null; + _show(_fit(first.image), 0); + if (starting) _left = _delay(0, first.duration); + _decodeNext(run); + } + + /// Прошло [delta] времени слайда. + void advance(Duration delta) { + if (_disposed || _frame == null || (_codec?.frameCount ?? 0) < 2) return; + _left -= delta; + _flush(); + } + + /// Время текущего кадра вышло, а следующий готов — показать его. + void _flush() { + final next = _next; + if (next == null || _left > Duration.zero) return; + _next = null; + final index = (_index + 1) % _codec!.frameCount; + _show(next, index); + _left += _delay(index, _nextDuration); + _decodeNext(_run); + } + + void _decodeNext(int run) { + final codec = _codec; + if (codec == null || codec.frameCount < 2) return; + codec.getNextFrame().then( + (frame) { + if (run != _run) { + frame.image.dispose(); + return; + } + _next = _fit(frame.image); + _nextDuration = frame.duration; + _flush(); + }, + onError: (Object error) { + // Кадр не декодировался: GIF стоит на текущем, слайд идёт дальше по часам. + if (run == _run) debugPrint('StoryGifPlayer: frame — $error'); + }, + ); + } + + void _show(ui.Image image, int index) { + final previous = _frame; + _frame = image; + _index = index; + previous?.dispose(); + notifyListeners(); + } + + /// Кадр крупнее [limit] — уменьшенная копия, пропорции те же. + ui.Image _fit(ui.Image image) { + final limit = this.limit; + if (limit == null || limit.isEmpty) return image; + final scale = math.min( + limit.width / image.width, + limit.height / image.height, + ); + if (scale >= 1) return image; + final width = math.max(1, (image.width * scale).round()); + final height = math.max(1, (image.height * scale).round()); + final recorder = ui.PictureRecorder(); + ui.Canvas(recorder).drawImageRect( + image, + ui.Rect.fromLTWH(0, 0, image.width.toDouble(), image.height.toDouble()), + ui.Rect.fromLTWH(0, 0, width.toDouble(), height.toDouble()), + ui.Paint()..filterQuality = ui.FilterQuality.medium, + ); + final picture = recorder.endRecording(); + final small = picture.toImageSync(width, height); + picture.dispose(); + image.dispose(); + return small; + } + + @override + void dispose() { + _disposed = true; + _run++; + _frame?.dispose(); + _frame = null; + _next?.dispose(); + _next = null; + _codec?.dispose(); + _codec = null; + super.dispose(); + } +} diff --git a/lib/src/ui/widgets/stories_playback.dart b/lib/src/ui/widgets/stories_playback.dart index b1f04bb..cef47b9 100644 --- a/lib/src/ui/widgets/stories_playback.dart +++ b/lib/src/ui/widgets/stories_playback.dart @@ -136,7 +136,8 @@ class StoriesPlayback { /// Сколько прошло на текущем слайде. Duration get elapsed => _elapsed; - /// Длительность текущего слайда: из админки, у видео — реальная длина ролика. + /// Длительность текущего слайда: из админки, у видео — реальная длина ролика, у GIF — + /// не меньше одного круга ([useGifLoop]). Duration get duration => _duration; /// Слайд длится столько, сколько ролик: конец — по концу видео, а не по часам. @@ -299,6 +300,14 @@ class StoriesPlayback { _byVideo = true; } + /// Длина одного круга GIF текущего слайда: слайд длится время из админки или круг — что + /// дольше; короткий GIF крутится до конца слайда, длинный проходит ровно один круг. + /// Неизвестная длина (`null`: битый GIF, картинка хоста) — время из админки. + void useGifLoop(Duration? loop) { + final server = slide.duration; + _duration = loop != null && loop > server ? loop : server; + } + /// Позиция видео: время слайда идёт за воспроизведением. void syncVideoPosition(Duration position) { if (!_byVideo) return; diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart index ec60b85..f016b87 100644 --- a/lib/src/ui/widgets/stories_slide_view.dart +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -15,6 +15,7 @@ import '../components/personalization_toast.dart'; import '../personalization_colors.dart'; import '../personalization_theme.dart'; import 'personalization_story_viewer.dart'; +import 'stories_gif_player.dart'; import 'stories_support.dart'; /// Один слайд просмотра сторис: фон, затемнение, содержимое, касания. @@ -28,6 +29,8 @@ import 'stories_support.dart'; /// другом), «Используемые товары» и звук у видео; текстовые блоки на нём не рисуются. /// - Медиа-слайд — непустые текстовые блоки на `y_offset`% высоты, кнопки внизу, /// «Используемые товары», звук у видео. +/// - GIF фона живого слайда рисует [StoryGifPlayer]; у соседних страниц и до готовности +/// — первый кадр. /// - Медиа не загрузилось — по центру кнопка кита [PersonalizationStoryViewer.retryText]. /// /// Живой ([live]) — только текущий слайд осевшей страницы: у него часы, видео, касания и @@ -42,6 +45,7 @@ class StorySlideView extends StatelessWidget { this.generation = 0, this.progress, this.video, + this.gif, this.muted = true, this.sheetOpen = false, this.failed = false, @@ -69,6 +73,10 @@ class StorySlideView extends StatelessWidget { /// Готовое видео живого слайда; `null` — постер. final VideoPlayerController? video; + + /// GIF живого слайда; с кадром — рисуется он, иначе картинка по адресу (у GIF — его + /// первый кадр). + final StoryGifPlayer? gif; final bool muted; final bool sheetOpen; final bool failed; @@ -203,6 +211,15 @@ class StorySlideView extends StatelessWidget { ), ); } + final gif = this.gif; + if (gif != null && gif.frame != null) { + // Кадры GIF меняет проигрыватель — перерисовывается только картинка. + return ListenableBuilder( + listenable: gif, + builder: (context, _) => + RawImage(image: gif.frame, fit: BoxFit.contain), + ); + } final url = storyMediaOf(slide) == StoryMedia.video ? slide.preview : slide.background; diff --git a/test/ui/gif_fixture.dart b/test/ui/gif_fixture.dart new file mode 100644 index 0000000..2967754 --- /dev/null +++ b/test/ui/gif_fixture.dart @@ -0,0 +1,54 @@ +import 'dart:convert'; +import 'dart:typed_data'; +import 'dart:ui' as ui; + +/// The fixture all four SDKs test with: 2×2, 3 frames, delays 10 / 0 / 50 hundredths +/// of a second → 100 + 100 + 500 = 700 ms per loop. +final Uint8List gifFixture = base64Decode( + 'R0lGODlhAgACAIEAAP8AAAD/AAAA/////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQACgAAACwAAAAAAgACAAA' + 'CAoRRACH5BAAAAAAALAAAAAACAAIAAAICjFMAIfkEADIAAAAsAAAAAAIAAgAAAgKUVQA7', +); + +/// A codec that needs no real decoding, so it runs on the fake clock of widget tests: +/// frame `i` is an image `i + 1` pixels wide and 1 pixel high, frames loop. +class FakeGifCodec implements ui.Codec { + FakeGifCodec(this.frameCount); + + @override + final int frameCount; + + int _next = 0; + + /// Frames handed out so far. + int decoded = 0; + bool disposed = false; + + @override + int get repetitionCount => -1; + + @override + Future getNextFrame() { + final index = _next; + _next = (_next + 1) % frameCount; + decoded++; + final recorder = ui.PictureRecorder(); + ui.Canvas(recorder); + final picture = recorder.endRecording(); + final image = picture.toImageSync(index + 1, 1); + picture.dispose(); + return Future.value(_Frame(image)); + } + + @override + void dispose() => disposed = true; +} + +class _Frame implements ui.FrameInfo { + _Frame(this.image); + + @override + final ui.Image image; + + @override + Duration get duration => Duration.zero; +} diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index b4baf2b..9b3a986 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:convert'; +import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -7,8 +8,12 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:rees46_sdk/rees46_sdk.dart'; import 'package:rees46_sdk/src/pigeon/personalization_api.g.dart' as pigeon; import 'package:rees46_sdk/src/ui/personalization_ui.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_gif_player.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_image.dart'; import 'package:rees46_sdk/src/ui/widgets/stories_seen_store.dart'; +import 'gif_fixture.dart'; + /// A 1×1 transparent PNG: slides and covers need an image that loads offline. final ImageProvider _pixel = MemoryImage( Uint8List.fromList(const [ @@ -474,6 +479,157 @@ void main() { expect(api.clicks, ['7/70/block']); }, ); + + group('GIF slides', () { + late List fetched; + late List codecs; + + setUp(() { + fetched = []; + codecs = []; + StoriesImageBytes.instance = StoriesImageBytes( + fetch: (uri) async { + fetched.add(uri.path); + return gifFixture; + }, + ); + StoryGifPlayer.codecOf = (_) async { + final codec = FakeGifCodec(3); + codecs.add(codec); + return codec; + }; + }); + tearDown(() { + StoriesImageBytes.instance = StoriesImageBytes(); + StoryGifPlayer.codecOf = ui.instantiateImageCodec; + PaintingBinding.instance.imageCache.clear(); + }); + + /// A GIF slide the server gives 300 ms (the fixture loops in 100 + 100 + 500 ms), + /// then a slide without media. No host imageProvider: the SDK loads the GIF. + final gifStory = Story( + id: '8', + name: 'GIF', + avatar: '', + slides: const [ + StorySlide( + id: '80', + type: StorySlideType.image, + background: 'https://cdn.example/clock.gif', + duration: Duration(milliseconds: 300), + ), + StorySlide(id: '81', type: StorySlideType.image), + ], + ); + + /// The GIF frame on screen by its width: frame i is i + 1 pixels wide. + int? frame(WidgetTester tester) { + for (final raw in tester.widgetList(find.byType(RawImage))) { + final image = raw.image; + if (image != null && image.height == 1) return image.width; + } + return null; + } + + Future> openGif( + WidgetTester tester, { + ValueNotifier? paused, + }) async { + final shown = []; + await tester.pumpWidget( + MaterialApp( + home: PersonalizationStoryViewer( + stories: [gifStory], + paused: paused, + onClose: () {}, + onSlideShown: (_, index) => shown.add(index), + ), + ), + ); + // The page settles and loads; then the first frame is in and the clock runs. + await tester.pump(); + await tester.pump(); + return shown; + } + + testWidgets('plays one loop at least and stands still with the slide', ( + tester, + ) async { + final paused = ValueNotifier(false); + final shown = await openGif(tester, paused: paused); + expect(frame(tester), 1); + await _wait(tester, const Duration(milliseconds: 100)); + expect(frame(tester), 2); + await _wait(tester, const Duration(milliseconds: 100)); + expect(frame(tester), 3); + + // pause() from the host: the slide and its GIF stay on the third frame. + paused.value = true; + await _wait(tester, const Duration(seconds: 2)); + expect(frame(tester), 3); + expect(shown, [0]); + + paused.value = false; + await tester.pump(); + // Past the server's 300 ms the slide goes on: one loop is 700 ms. + await _wait(tester, const Duration(milliseconds: 400)); + expect(shown, [0]); + expect(frame(tester), 3, reason: 'the 500 ms frame'); + await _wait(tester, const Duration(milliseconds: 100)); + await tester.pump(); + expect(shown, [0, 1]); + expect(fetched, ['/clock.gif']); + }); + + testWidgets('a hold freezes the frame; release goes on from it', ( + tester, + ) async { + await openGif(tester); + await _wait(tester, const Duration(milliseconds: 100)); + expect(frame(tester), 2); + final hold = await tester.startGesture(at(tester, 0.5)); + // 100 ms of the press still run; the hold stops the rest. + await tester.pump(const Duration(milliseconds: 100)); + await tester.pump(const Duration(milliseconds: 100)); + expect(frame(tester), 3); + await _wait(tester, const Duration(seconds: 3)); + expect(frame(tester), 3); + await hold.up(); + await tester.pump(); + await _wait(tester, const Duration(milliseconds: 400)); + expect(frame(tester), 3); + await _wait(tester, const Duration(milliseconds: 100)); + expect(frame(tester), isNull, reason: 'the next slide has no GIF'); + }); + + testWidgets('restart and a return begin at the first frame, no download', ( + tester, + ) async { + final shown = await openGif(tester); + await _wait(tester, const Duration(milliseconds: 200)); + expect(frame(tester), 3); + + // Back on the first slide of the first story restarts it. + await tester.tapAt(at(tester, 0.1)); + await tester.pump(); + await tester.pump(); + expect(frame(tester), 1); + await _wait(tester, const Duration(milliseconds: 100)); + expect(frame(tester), 2); + + // The next slide and back: the GIF starts over from the bytes in memory. + await tester.tapAt(at(tester, 0.9)); + await tester.pump(); + await tester.tapAt(at(tester, 0.1)); + await tester.pump(); + await tester.pump(); + expect(shown, [0, 1, 0]); + expect(frame(tester), 1); + expect(fetched, ['/clock.gif']); + expect(codecs, hasLength(3)); + expect(codecs.take(2).every((codec) => codec.disposed), isTrue); + }); + }); }); group('PersonalizationStories', () { diff --git a/test/ui/stories_gif_test.dart b/test/ui/stories_gif_test.dart index 8826a2c..ec15607 100644 --- a/test/ui/stories_gif_test.dart +++ b/test/ui/stories_gif_test.dart @@ -6,14 +6,10 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:rees46_sdk/src/ui/personalization_ui.dart'; import 'package:rees46_sdk/src/ui/widgets/stories_gif.dart'; +import 'package:rees46_sdk/src/ui/widgets/stories_gif_player.dart'; import 'package:rees46_sdk/src/ui/widgets/stories_image.dart'; -/// The fixture all four SDKs test with: 2×2, 3 frames, delays 10 / 0 / 50 hundredths -/// of a second → 100 + 100 + 500 = 700 ms per loop. -final Uint8List gifFixture = base64Decode( - 'R0lGODlhAgACAIEAAP8AAAD/AAAA/////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQACgAAACwAAAAAAgACAAA' - 'CAoRRACH5BAAAAAAALAAAAAACAAIAAAICjFMAIfkEADIAAAAsAAAAAAIAAgAAAgKUVQA7', -); +import 'gif_fixture.dart'; void main() { group('StoryGif', () { @@ -168,6 +164,103 @@ void main() { expect(const StoryImage('a'), isNot(const StoryImage('b'))); }); }); + + group('StoryGifPlayer', () { + final gif = StoryGif.parse(gifFixture)!; + late List codecs; + + setUp(() { + codecs = []; + StoryGifPlayer.codecOf = (_) async { + final codec = FakeGifCodec(3); + codecs.add(codec); + return codec; + }; + }); + tearDown(() => StoryGifPlayer.codecOf = ui.instantiateImageCodec); + + /// Lets the decoding of the next frame finish. + Future settle() => Future.delayed(Duration.zero); + + test( + 'frames follow their delays, loop, and wait while time stands', + () async { + final player = StoryGifPlayer(gifFixture, gif); + expect(player.frame, isNull); + await player.start(); + await settle(); + expect((player.index, player.frame!.width), (0, 1)); + + player.advance(const Duration(milliseconds: 99)); + expect(player.index, 0); + player.advance(const Duration(milliseconds: 1)); + expect((player.index, player.frame!.width), (1, 2)); + await settle(); + + // No time from the slide (it is paused): the frame stays. + await Future.delayed(const Duration(milliseconds: 150)); + expect(player.index, 1); + player.advance(const Duration(milliseconds: 60)); + expect(player.index, 1); + player.advance(const Duration(milliseconds: 40)); + expect(player.index, 2, reason: 'the rest of the paused frame'); + await settle(); + + player.advance(const Duration(milliseconds: 499)); + expect(player.index, 2, reason: 'the 500 ms frame'); + player.advance(const Duration(milliseconds: 1)); + expect(player.index, 0, reason: 'the loop starts over'); + expect(codecs, hasLength(1)); + player.dispose(); + expect(codecs.single.disposed, isTrue); + }, + ); + + test('restart begins at the first frame from the same bytes', () async { + final player = StoryGifPlayer(gifFixture, gif); + await player.start(); + await settle(); + player.advance(const Duration(milliseconds: 150)); + expect(player.index, 1); + + await player.restart(); + expect((player.index, player.frame!.width), (0, 1)); + expect(codecs, hasLength(2), reason: 'a new codec, no download'); + expect(codecs.first.disposed, isTrue); + await settle(); + player.advance(const Duration(milliseconds: 99)); + expect(player.index, 0); + player.advance(const Duration(milliseconds: 1)); + expect(player.index, 1); + player.dispose(); + }); + + test('a GIF the codec cannot read fails its start', () async { + StoryGifPlayer.codecOf = (_) async => throw Exception('broken'); + final player = StoryGifPlayer(gifFixture, gif); + await expectLater(player.start(), throwsException); + expect(player.frame, isNull); + player.dispose(); + }); + + testWidgets('real frames larger than the slide shrink to it', ( + tester, + ) async { + StoryGifPlayer.codecOf = ui.instantiateImageCodec; + await tester.runAsync(() async { + final player = StoryGifPlayer(gifFixture, gif, limit: const Size(1, 1)); + await player.start(); + expect(player.index, 0); + expect((player.frame!.width, player.frame!.height), (1, 1)); + player.dispose(); + + final full = StoryGifPlayer(gifFixture, gif); + await full.start(); + expect((full.frame!.width, full.frame!.height), (2, 2)); + full.dispose(); + }); + }); + }); } /// The RGBA of the top-left pixel of [image]. diff --git a/test/ui/stories_playback_test.dart b/test/ui/stories_playback_test.dart index 92bf217..86cf5bf 100644 --- a/test/ui/stories_playback_test.dart +++ b/test/ui/stories_playback_test.dart @@ -175,6 +175,58 @@ void main() { expect(playback.duration, const Duration(seconds: 30)); }); + test( + 'a GIF slide lasts the server time or one loop, whichever is longer', + () { + // The server says 5 s; an 8 s loop plays exactly once. + final playback = _open(StoriesPlayback(stories: [_story('a', 2)])); + playback.useGifLoop(const Duration(seconds: 8)); + expect(playback.duration, const Duration(seconds: 8)); + expect(playback.followsVideo, isFalse, reason: 'the clock ends it'); + for (var i = 0; i < 7; i++) { + expect(playback.tick(const Duration(seconds: 1)), isFalse); + } + expect(playback.tick(const Duration(seconds: 1)), isTrue); + + // A 700 ms loop repeats until the server's 5 s are up. + playback.next(); + playback.mediaReady(playback.generation); + playback.useGifLoop(const Duration(milliseconds: 700)); + expect(playback.duration, const Duration(seconds: 5)); + + // An unknown loop (a host image, a broken GIF): the server time. + playback.useGifLoop(const Duration(seconds: 8)); + playback.useGifLoop(null); + expect(playback.duration, const Duration(seconds: 5)); + }, + ); + + test('a paused GIF slide keeps its time; retry measures it again', () { + final playback = _open(StoriesPlayback(stories: [_story('a', 1)])); + playback.useGifLoop(const Duration(seconds: 8)); + playback.tick(const Duration(seconds: 1)); + for (final reason in [ + StoriesPauseReason.hold, + StoriesPauseReason.sheet, + StoriesPauseReason.background, + StoriesPauseReason.host, + ]) { + playback.pause(reason); + expect(playback.running, isFalse, reason: '$reason stops the clock'); + expect(playback.tick(const Duration(seconds: 1)), isFalse); + playback.resume(reason); + } + expect(playback.elapsed, const Duration(seconds: 1)); + + playback.mediaFailed(playback.generation); + playback.retry(); + expect( + playback.duration, + const Duration(seconds: 5), + reason: 'unmeasured', + ); + }); + test('a failed load pauses until retry; old loads are ignored', () { final playback = StoriesPlayback(stories: [_story('a', 1)]); playback.settle(0); From e9a5cf58cfdf38b33850bcce2381db70c3b8784d Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Tue, 6 Oct 2026 16:58:30 +0400 Subject: [PATCH 75/79] feat(example): stories v2 sample block with a gif story and a cover bar --- example/assets/uikit/story_clock.gif | Bin 0 -> 89726 bytes example/lib/ui_kit_pane.dart | 160 +++++++++++++++++++++------ 2 files changed, 125 insertions(+), 35 deletions(-) create mode 100644 example/assets/uikit/story_clock.gif diff --git a/example/assets/uikit/story_clock.gif b/example/assets/uikit/story_clock.gif new file mode 100644 index 0000000000000000000000000000000000000000..eb5888c3e8e7641c240b43a8e456fce27d116e99 GIT binary patch literal 89726 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 literal 0 HcmV?d00001 diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index caf44b9..c3753ce 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -1,4 +1,8 @@ +import 'dart:io'; + +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'app_theme_mode.dart'; @@ -756,17 +760,31 @@ List<_Exhibit> _storyExhibits(String shopId) => [ ), ), _Exhibit( - 'Story Viewer — sample slides: price, promo code, discount, a product ' + 'Story Viewer — sample block, offline: price, promo code, discount, a product ' 'video with buttons, carousel and sound, a fitted photo on its letterbox, ' - 'text blocks with a promo code, a failed photo with Retry', - (context) => Align( - alignment: Alignment.centerLeft, - child: PersonalizationButton( - label: 'Open sample stories', - size: PersonalizationButtonSize.md, - onPressed: () => _openSampleStories(context), - ), - ), + 'text blocks with a promo code, a failed photo with Retry, and a GIF: an 8 s ' + 'dial on a 5 s slide plays its whole loop and stops while held, its cover ' + 'stays on the first frame', + (context) { + final stories = _sampleStories((file) => 'assets/uikit/$file'); + return PersonalizationStoriesBar( + padding: EdgeInsets.zero, + items: [ + for (final story in stories) + PersonalizationStoryItem( + id: story.id, + label: story.name, + image: _FirstFrameAsset(story.avatar), + segments: story.slides.length, + ), + ], + onItemTap: (item) => _openSampleStories( + context, + index: stories.indexWhere((story) => story.id == item.id), + ), + iconBuilder: _icon, + ); + }, ), _Exhibit('Story Cover — default, pinned, viewed, skeleton', (context) { return _ScrollRow( @@ -1046,11 +1064,65 @@ class _SoundedUsedProductsState extends State<_SoundedUsedProducts> { } } -/// Photos of the sample stories ship with the app: `asset:` stands for -/// `assets/uikit/.jpg`, anything else loads from the network. -ImageProvider _sampleImage(String url) => url.startsWith('asset:') - ? _image(url.substring('asset:'.length)) - : NetworkImage(url); +/// Where a picture of the sample block lives: its file under `assets/uikit/`. +typedef _SampleUrl = String Function(String file); + +/// The pictures of the sample stories ship with the app and reach the viewer over a +/// loopback HTTP server: the viewer takes no imageProvider, so they go through the +/// SDK's own loader. Only that loader plays a GIF slide and stretches the slide to one +/// loop of it — a host imageProvider takes a GIF over, and its slide keeps the server +/// duration. +final Future _sampleServer = _serveSampleAssets(); + +Future _serveSampleAssets() async { + final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0); + server.listen((request) async { + final response = request.response; + try { + final data = await rootBundle.load('assets/uikit${request.uri.path}'); + response.add( + data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes), + ); + } catch (_) { + response.statusCode = HttpStatus.notFound; + } + await response.close(); + }); + return 'http://${server.address.address}:${server.port}'; +} + +/// A sample bar cover the way the SDK draws covers by default: a GIF stays on its +/// first frame. The sample bar is the host here, so the host draws its covers. +@immutable +class _FirstFrameAsset extends ImageProvider<_FirstFrameAsset> { + const _FirstFrameAsset(this.asset); + + final String asset; + + @override + Future<_FirstFrameAsset> obtainKey(ImageConfiguration configuration) => + SynchronousFuture<_FirstFrameAsset>(this); + + @override + ImageStreamCompleter loadImage( + _FirstFrameAsset key, + ImageDecoderCallback decode, + ) => OneFrameImageStreamCompleter(_load(decode)); + + Future _load(ImageDecoderCallback decode) async { + final codec = await decode(await rootBundle.loadBuffer(asset)); + final frame = await codec.getNextFrame(); + codec.dispose(); + return ImageInfo(image: frame.image); + } + + @override + bool operator ==(Object other) => + other is _FirstFrameAsset && other.asset == asset; + + @override + int get hashCode => asset.hashCode; +} Map _sampleProductSlide( String id, @@ -1066,21 +1138,21 @@ Map _sampleProductSlide( }; /// Stories in the server's shape, so the sample runs through the same parsing as -/// the live block: product slides of every price kind, and a media slide with text -/// blocks, a button and used products. -final List _sampleStories = StoriesBlock.fromJson({ +/// the live block: product slides of every price kind, a media slide with text +/// blocks, a button and used products, and a GIF slide. +List _sampleStories(_SampleUrl url) => StoriesBlock.fromJson({ 'id': 'sample', 'stories': [ { 'id': 'products', 'name': 'Products', - 'avatar': 'asset:headphones', + 'avatar': url('headphones.jpg'), 'slides': [ _sampleProductSlide('price', { 'id': 'h1', 'brand': 'Sony', 'name': 'Wireless over-ear headphones, noise cancelling', - 'picture': 'asset:headphones', + 'picture': url('headphones.jpg'), 'price': 299, 'price_formatted': r'299 $', 'oldprice': 349, @@ -1091,7 +1163,7 @@ final List _sampleStories = StoriesBlock.fromJson({ 'id': 'w1', 'brand': 'Garmin', 'name': 'GPS running watch', - 'picture': 'asset:watch', + 'picture': url('watch.jpg'), 'price': 449, 'price_formatted': r'449 $', 'oldprice': 499, @@ -1104,7 +1176,7 @@ final List _sampleStories = StoriesBlock.fromJson({ 'id': 's1', 'brand': 'Nike', 'name': 'Air Zoom Pegasus 41 running shoes', - 'picture': 'asset:pegasus', + 'picture': url('pegasus.jpg'), 'price': 140, 'price_formatted': r'140 $', 'oldprice': 165, @@ -1134,7 +1206,7 @@ final List _sampleStories = StoriesBlock.fromJson({ 'id': 'b1', 'brand': 'Osprey', 'name': 'Daylite backpack', - 'picture': 'asset:backpack', + 'picture': url('backpack.jpg'), 'price': 80, 'price_formatted': r'80 $', 'promocode': 'BUTTERFLY', @@ -1142,7 +1214,7 @@ final List _sampleStories = StoriesBlock.fromJson({ 'url': 'https://example.com/backpack', }, }, - _sampleUsedProducts, + _sampleUsedProducts(url), ], }, ], @@ -1150,7 +1222,7 @@ final List _sampleStories = StoriesBlock.fromJson({ { 'id': 'media', 'name': 'Media', - 'avatar': 'asset:jacket', + 'avatar': url('jacket.jpg'), 'slides': [ // A square photo fitted whole: the rest of the screen is its letterbox // colour, and a bare photo takes the 50% scrim. @@ -1158,14 +1230,14 @@ final List _sampleStories = StoriesBlock.fromJson({ 'id': 'fitted', 'duration': 5, 'type': 'image', - 'background': 'asset:sneakers', + 'background': url('sneakers.jpg'), 'background_color': '#1E3A5F', }, { 'id': 'text', 'duration': 8, 'type': 'image', - 'background': 'asset:jacket', + 'background': url('jacket.jpg'), 'background_color': '#3B2A1E', 'elements': [ { @@ -1197,7 +1269,7 @@ final List _sampleStories = StoriesBlock.fromJson({ 'title': 'Go shopping', 'link': 'https://example.com', }, - _sampleUsedProducts, + _sampleUsedProducts(url), ], }, // The photo cannot load: the slide stops and offers Retry. @@ -1205,7 +1277,23 @@ final List _sampleStories = StoriesBlock.fromJson({ 'id': 'retry', 'duration': 5, 'type': 'image', - 'background': 'asset:missing', + 'background': url('missing.jpg'), + }, + ], + }, + // An 8 s dial GIF on a 5 s slide: the slide lasts the whole loop, the hand stops + // while the slide is held, and the cover stays on the first frame. + { + 'id': 'gif', + 'name': 'GIF', + 'avatar': url('story_clock.gif'), + 'slides': [ + { + 'id': 'gif', + 'duration': 5, + 'type': 'image', + 'background': url('story_clock.gif'), + 'background_color': '#1B2A41', }, ], }, @@ -1217,7 +1305,7 @@ const String _sampleVideo = 'https://flutter.github.io/assets-for-api-docs/assets/videos/butterfly.mp4'; /// The "Used products" carousel of the sample slides. -final Map _sampleUsedProducts = { +Map _sampleUsedProducts(_SampleUrl url) => { 'type': 'products', 'labels': { 'show_carousel': 'Used products', @@ -1229,7 +1317,7 @@ final Map _sampleUsedProducts = { 'id': 'm$index', 'brand': 'Brand', 'name': 'Product ${index + 1}', - 'picture': 'asset:$name', + 'picture': url('$name.jpg'), 'price': 99, 'price_formatted': r'99 $', 'oldprice': 120, @@ -1239,17 +1327,19 @@ final Map _sampleUsedProducts = { ], }; -void _openSampleStories(BuildContext context) { - Navigator.of(context, rootNavigator: true).push( +Future _openSampleStories(BuildContext context, {int index = 0}) async { + final base = await _sampleServer; + if (!context.mounted) return; + await Navigator.of(context, rootNavigator: true).push( PersonalizationStoryViewer.route( PersonalizationStoryViewer( - stories: _sampleStories, + stories: _sampleStories((file) => '$base/$file'), + initialStory: index, // No SDK: the sample does not track; links and products come back here. onLinkClick: (url) => PersonalizationToast.show(context, 'Link: $url'), onProductClick: (product) => PersonalizationToast.show(context, 'Product: ${product.name}'), promoCopiedText: 'Code copied to clipboard', - imageProvider: _sampleImage, iconBuilder: _icon, ), ), From edfd13f0a90794ae7c5c8080f6ec560cf22efeb9 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 7 Oct 2026 14:09:59 +0400 Subject: [PATCH 76/79] fix(ui): stories v2 product card shows the promo code of the slide's text block --- lib/src/ui/widgets/stories_slide_view.dart | 6 +- lib/src/ui/widgets/stories_support.dart | 28 +++++++- test/ui/personalization_stories_test.dart | 73 +++++++++++++++++++++ test/ui/stories_mapping_test.dart | 74 ++++++++++++++++++++++ 4 files changed, 177 insertions(+), 4 deletions(-) diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart index f016b87..6563d2f 100644 --- a/lib/src/ui/widgets/stories_slide_view.dart +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -26,7 +26,8 @@ import 'stories_support.dart'; /// - Затемнение сверху и снизу на каждом слайде: 50% у голого медиа, иначе 30% /// ([storyScrimOpacity]), до прозрачного к 21% и от 86% высоты. /// - Товарный слайд — карточка товара кита, все кнопки слайда (Primary LG друг под -/// другом), «Используемые товары» и звук у видео; текстовые блоки на нём не рисуются. +/// другом), «Используемые товары» и звук у видео; текстовые блоки на нём не рисуются, +/// но промокод текстового блока, если у товара своего нет, показывает блок цены. /// - Медиа-слайд — непустые текстовые блоки на `y_offset`% высоты, кнопки внизу, /// «Используемые товары», звук у видео. /// - GIF фона живого слайда рисует [StoryGifPlayer]; у соседних страниц и до готовности @@ -434,7 +435,8 @@ class StorySlideView extends StatelessWidget { final product = element.item!; final theme = PersonalizationTheme.of(context); final colors = theme.colors; - final price = storyPriceOf(product); + // Промокод текстового блока слайда идёт в блок цены: сам блок здесь не рисуется. + final price = storyPriceOf(product, slidePromo: storySlidePromocode(slide)); final image = storyImage(product.image, config.imageProvider); final buttons = storyButtons(slide); diff --git a/lib/src/ui/widgets/stories_support.dart b/lib/src/ui/widgets/stories_support.dart index 0089959..4d56365 100644 --- a/lib/src/ui/widgets/stories_support.dart +++ b/lib/src/ui/widgets/stories_support.dart @@ -123,11 +123,26 @@ String storyPercent(double value) { return '$text%'; } +/// Промокод текстового блока слайда для блока цены товара: код первого текстового блока, +/// где он не пустой. Пробелы и строка «null» — не код. На товарном слайде сами блоки не +/// рисуются, а их код показывает карточка товара, как в макете ([storyPriceOf]). +String? storySlidePromocode(StorySlide slide) { + for (final element in slide.elements) { + if (element is! StoryTextBlockElement) continue; + final code = element.promocode?.trim() ?? ''; + if (code.isNotEmpty && code != 'null') return code; + } + return null; +} + /// Цена товара для [PersonalizationStoryPrice]: вид блока и его строки. /// -/// - Промокод — вид promoCode: крупно цена с промокодом +/// - Промокод товара — вид promoCode: крупно цена с промокодом /// (`price_with_promocode_formatted`, без неё обычная); зачёркнута старая цена, если /// она есть, иначе обычная цена, если она отличается от цены с промокодом. +/// - Иначе промокод текстового блока слайда ([slidePromo], см. [storySlidePromocode]) — +/// тоже вид promoCode, но крупно обычная цена: цена с промокодом относится только к +/// промокоду товара. Зачёркнута только старая цена, если она есть. /// - Иначе скидка больше нуля — вид discount с процентом `discount_percent` (дробный /// остаётся дробным: «12.5%»). /// - Иначе просто цена. @@ -141,7 +156,7 @@ String storyPercent(double value) { String? discount, String? promoCode, }) -storyPriceOf(StoryProduct product) { +storyPriceOf(StoryProduct product, {String? slidePromo}) { final regular = product.priceFormatted.isNotEmpty ? product.priceFormatted : _plainPrice(product); @@ -162,6 +177,15 @@ storyPriceOf(StoryProduct product) { promoCode: product.promocode, ); } + if (slidePromo != null && slidePromo.isNotEmpty) { + return ( + type: PersonalizationStoryPriceType.promoCode, + price: regular, + oldPrice: oldPrice, + discount: null, + promoCode: slidePromo, + ); + } if (product.discountPercent > 0) { return ( type: PersonalizationStoryPriceType.discount, diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 9b3a986..9c15679 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -414,6 +414,79 @@ void main() { expect(find.text('Nowhere'), findsOneWidget); }); + testWidgets('a product slide shows the text block promo in the card', ( + tester, + ) async { + String? clipboard; + tester.binding.defaultBinaryMessenger.setMockMethodCallHandler( + SystemChannels.platform, + (call) async { + if (call.method == 'Clipboard.setData') { + clipboard = (call.arguments as Map)['text'] as String; + } + return null; + }, + ); + addTearDown( + () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler( + SystemChannels.platform, + null, + ), + ); + final promoStory = Story.fromJson({ + 'id': 9, + 'name': 'Promo', + 'avatar': '', + 'slides': >[ + { + 'id': 90, + 'duration': 5, + 'type': 'product', + 'elements': >[ + { + 'type': 'text_block', + 'text_input': 'Your code SALE10', + 'promocode': 'SALE10', + 'y_offset': 30, + }, + { + 'type': 'product', + 'item': { + 'id': 'p9', + 'name': 'Product 9', + 'price': 100, + 'price_formatted': '100 ₽', + 'url': 'https://shop.example/p9', + }, + }, + ], + }, + ], + }); + final api = await open(tester, stories: [promoStory]); + + // The text block itself stays hidden on a product slide. + expect(find.byType(PersonalizationStoryTextBlock), findsNothing); + expect(find.text('Your code SALE10'), findsNothing); + final price = tester.widget( + find.byType(PersonalizationStoryPrice), + ); + expect(price.type, PersonalizationStoryPriceType.promoCode); + expect(price.price, '100 ₽'); + expect(price.oldPrice, isNull); + expect(price.promoCode, 'SALE10'); + + // A tap copies the code, toasts and counts the click, as a product promo. + await tester.tap(find.text('SALE10')); + await tester.pump(); + expect(clipboard, 'SALE10'); + expect(find.text('Copied'), findsOneWidget); + expect(api.clicks, ['9/90/block']); + expect(find.text('Product 9'), findsOneWidget, reason: 'still open'); + // Let the toast leave before the test ends. + await _wait(tester, const Duration(seconds: 3)); + }); + testWidgets('the cross closes the viewer also with the sheet open', ( tester, ) async { diff --git a/test/ui/stories_mapping_test.dart b/test/ui/stories_mapping_test.dart index a1dd25d..080b286 100644 --- a/test/ui/stories_mapping_test.dart +++ b/test/ui/stories_mapping_test.dart @@ -75,6 +75,80 @@ void main() { }); }); + group('text block promo on a product slide', () { + /// A product slide whose text blocks carry [codes] (`null` — a block without one). + StorySlide promoSlide(List codes) => _slide( + background: '', + elements: [ + for (final code in codes) + StoryTextBlockElement(text: 'Use the code', promocode: code), + StoryProductElement(item: _product()), + ], + ); + + test('a product without a promo takes the text block code', () { + final slide = promoSlide([null, ' SALE10 ', 'LATER']); + final code = storySlidePromocode(slide); + expect(code, 'SALE10', reason: 'the first non-blank code, trimmed'); + final price = storyPriceOf( + _product(withPromo: '1 000 000 ₽', withPromoNumber: 1000000), + slidePromo: code, + ); + expect(price.type, PersonalizationStoryPriceType.promoCode); + expect(price.price, '1 190 900 ₽', reason: 'the regular price, big'); + expect(price.oldPrice, isNull, reason: 'no old price, nothing crossed'); + expect(price.promoCode, 'SALE10'); + // Promo beats discount, as for a product promo. + final discounted = storyPriceOf( + _product(discountPercent: 15), + slidePromo: code, + ); + expect(discounted.type, PersonalizationStoryPriceType.promoCode); + expect(discounted.discount, isNull); + }); + + test('the product promo wins over the text block one', () { + final price = storyPriceOf( + _product(promocode: 'OWN', withPromo: '1 000 000 ₽'), + slidePromo: storySlidePromocode(promoSlide(['SALE10'])), + ); + expect(price.promoCode, 'OWN'); + expect(price.price, '1 000 000 ₽'); + expect(price.oldPrice, '1 190 900 ₽'); + }); + + test('a "null" or blank text block code is no promo', () { + final slide = promoSlide(['null', ' ', '']); + expect(storySlidePromocode(slide), isNull); + final price = storyPriceOf( + _product(discountPercent: 10), + slidePromo: storySlidePromocode(slide), + ); + expect(price.type, PersonalizationStoryPriceType.discount); + expect(price.promoCode, isNull); + expect( + storyPriceOf(_product(), slidePromo: '').type, + PersonalizationStoryPriceType.price, + ); + }); + + test('only an old price above the regular one is crossed out', () { + for (final oldPrice in [1190900, 245000]) { + final price = storyPriceOf( + _product(oldPrice: oldPrice), + slidePromo: 'SALE10', + ); + expect(price.oldPrice, isNull, reason: 'oldprice $oldPrice ≤ price'); + } + final greater = storyPriceOf( + _product(oldPrice: 2000000), + slidePromo: 'SALE10', + ); + expect(greater.oldPrice, '2000000 ₽'); + expect(greater.price, '1 190 900 ₽'); + }); + }); + group('slide', () { test('media is a non-empty background, not the slide type', () { expect(storyMediaOf(_slide()), StoryMedia.image); From 17936b4deac00d84078c0479179a141b598cdbdc Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Wed, 7 Oct 2026 15:30:25 +0400 Subject: [PATCH 77/79] fix(ui): stories v2 product picture no longer opens the product, taps on it page the story --- .../widgets/personalization_story_viewer.dart | 8 +- lib/src/ui/widgets/stories_slide_view.dart | 28 +++---- test/ui/personalization_stories_test.dart | 80 +++++++++++++++++++ 3 files changed, 98 insertions(+), 18 deletions(-) diff --git a/lib/src/ui/widgets/personalization_story_viewer.dart b/lib/src/ui/widgets/personalization_story_viewer.dart index c7e0709..7e8483f 100644 --- a/lib/src/ui/widgets/personalization_story_viewer.dart +++ b/lib/src/ui/widgets/personalization_story_viewer.dart @@ -52,12 +52,12 @@ import 'stories_support.dart'; /// кадр. С картинками хоста ([imageProvider]) GIF рисует хост, слайд — время админки. /// /// Трекинг через [sdk] с кодом [code]: `view` — на каждый слайд, ставший текущим на -/// осевшей странице; `click` — кнопка, товар, карусель, копирование промокода. Id, которые +/// осевшей странице; `click` — кнопка, товар карусели, копирование промокода. Id, которые /// не целые положительные числа (`39_0`), не трекаются. Просмотренные слайды с [sdk] /// запоминаются на устройстве по магазину ([StoriesSeenStore]); хосту о показе слайда /// сообщает [onSlideShown]. /// -/// Кнопки, товары и карусель сначала закрывают просмотр, потом зовут [onLinkClick] / +/// Кнопки и товары карусели сначала закрывают просмотр, потом зовут [onLinkClick] / /// [onProductClick]; не заданы — ссылку открывает система через SDK. Кнопка без ссылки /// на медиа-слайде ничего не открывает и просмотр не закрывает — только `click`. /// @@ -122,8 +122,8 @@ class PersonalizationStoryViewer extends StatefulWidget { /// Ссылка кнопки; не задан — ссылку открывает система. final ValueChanged? onLinkClick; - /// Нажатие на товар (карточка товарного слайда или карусель); не задан — открывается - /// ссылка товара. + /// Товар: кнопка товарного слайда без своей ссылки (или [productButtonText]) или + /// карусель; картинка товара не нажимается. Не задан — открывается ссылка товара. final ValueChanged? onProductClick; /// Промокод скопирован. diff --git a/lib/src/ui/widgets/stories_slide_view.dart b/lib/src/ui/widgets/stories_slide_view.dart index 6563d2f..a105698 100644 --- a/lib/src/ui/widgets/stories_slide_view.dart +++ b/lib/src/ui/widgets/stories_slide_view.dart @@ -426,7 +426,8 @@ class StorySlideView extends StatelessWidget { /// Товарный слайд: шапка (бренд SemiBold 20, название SemiBold 16, межстрочный 140%, /// шаг 8), белая карточка картинки (скругление 12, поля 16, квадрат по ширине — на /// низком экране ужимается), цена, кнопки слайда; без своих кнопок — одна - /// [PersonalizationStoryViewer.productButtonText], ведёт к товару. + /// [PersonalizationStoryViewer.productButtonText], ведёт к товару. Товар открывают + /// только кнопки: шапка и картинка не нажимаются, касание по ним листает, как по слайду. Widget _productContent( BuildContext context, StorySlide slide, @@ -476,22 +477,21 @@ class StorySlideView extends StatelessWidget { Expanded( child: Padding( padding: const EdgeInsets.symmetric(vertical: 16), + // Картинка не нажимается: касание по ней — касание слайда (листает по + // третям, удержание — пауза). child: Center( child: AspectRatio( aspectRatio: 1, - child: GestureDetector( - onTap: live ? () => onProduct?.call(product) : null, - child: DecoratedBox( - decoration: BoxDecoration( - color: const Color(0xFFFFFFFF), - borderRadius: BorderRadius.circular(12), - ), - child: Padding( - padding: const EdgeInsets.all(16), - child: image == null - ? null - : Image(image: image, fit: BoxFit.contain), - ), + child: DecoratedBox( + decoration: BoxDecoration( + color: const Color(0xFFFFFFFF), + borderRadius: BorderRadius.circular(12), + ), + child: Padding( + padding: const EdgeInsets.all(16), + child: image == null + ? null + : Image(image: image, fit: BoxFit.contain), ), ), ), diff --git a/test/ui/personalization_stories_test.dart b/test/ui/personalization_stories_test.dart index 9c15679..6752b6e 100644 --- a/test/ui/personalization_stories_test.dart +++ b/test/ui/personalization_stories_test.dart @@ -212,6 +212,7 @@ void main() { List? stories, VoidCallback? onClose, ValueChanged? onLink, + ValueChanged? onProduct, void Function(Story story, int slideIndex)? onSlideShown, }) async { final api = _FakeHostApi(null); @@ -224,6 +225,7 @@ void main() { imageProvider: _offline, onClose: onClose ?? () {}, onLinkClick: onLink, + onProductClick: onProduct, onSlideShown: onSlideShown, ), ), @@ -487,6 +489,84 @@ void main() { await _wait(tester, const Duration(seconds: 3)); }); + testWidgets('the product picture pages like the slide and opens nothing', ( + tester, + ) async { + // A phone-like portrait screen: the picture spans all three tap zones. + tester.view + ..physicalSize = const Size(400, 800) + ..devicePixelRatio = 1; + addTearDown(tester.view.reset); + final semantics = tester.ensureSemantics(); + final cards = Story.fromJson({ + 'id': 1, + 'name': 'Cards', + 'avatar': '', + 'slides': >[ + {..._productSlide(10, 1), 'duration': 5}, + {..._productSlide(11, 2), 'duration': 5}, + ], + }); + var closed = 0; + final products = []; + final api = await open( + tester, + stories: [cards], + onClose: () => closed++, + onProduct: (product) => products.add(product.id), + ); + expect(find.text('Product 1'), findsOneWidget); + + final picture = find.byType(AspectRatio); + expect(picture, findsOneWidget); + final width = tester + .getSize(find.byType(PersonalizationStoryViewer)) + .width; + final rect = tester.getRect(picture); + final left = Offset(rect.left + 8, rect.center.dy); + final right = Offset(rect.right - 8, rect.center.dy); + expect(left.dx, lessThan(width / 3), reason: 'the left third'); + expect(right.dx, greaterThan(width * 2 / 3), reason: 'the right third'); + + // No node of its own: the picture is no button, and the only tap under it is the + // whole slide's (the tap zones), not one sized to the picture. + final node = tester.getSemantics( + find.descendant(of: picture, matching: find.byType(Image)), + ); + expect(node.flagsCollection.isButton, isFalse); + expect(node.rect.size, Size(width, 800), reason: 'the slide surface'); + + // The centre third does nothing, the right third pages on, the left one back. + await tester.tapAt(rect.center); + await tester.pump(); + expect(find.text('Product 1'), findsOneWidget, reason: 'the centre'); + await tester.tapAt(right); + await tester.pump(); + expect(find.text('Product 2'), findsOneWidget); + await tester.tapAt(left); + await tester.pump(); + expect(find.text('Product 1'), findsOneWidget); + + // A hold on the picture pauses and never moves. + final hold = await tester.startGesture(right); + await tester.pump(const Duration(milliseconds: 300)); + await _wait(tester, const Duration(seconds: 6)); + await hold.up(); + await tester.pump(); + expect(find.text('Product 1'), findsOneWidget, reason: 'held, released'); + + expect(products, isEmpty, reason: 'the picture opens no product'); + expect(api.clicks, isEmpty); + expect(closed, 0); + + // The product opens only from the slide's button. + await tester.tap(find.text('More info')); + await tester.pump(); + expect(products, ['p1']); + expect(api.clicks, ['1/10/block']); + semantics.dispose(); + }); + testWidgets('the cross closes the viewer also with the sheet open', ( tester, ) async { From 32c51349b42313e3c839f966b40c5cae68fd9c05 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Thu, 8 Oct 2026 13:34:59 +0400 Subject: [PATCH 78/79] feat(example): stories v2 sample product slide carries a text block promo --- example/lib/ui_kit_pane.dart | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/example/lib/ui_kit_pane.dart b/example/lib/ui_kit_pane.dart index c3753ce..c903a10 100644 --- a/example/lib/ui_kit_pane.dart +++ b/example/lib/ui_kit_pane.dart @@ -761,7 +761,7 @@ List<_Exhibit> _storyExhibits(String shopId) => [ ), _Exhibit( 'Story Viewer — sample block, offline: price, promo code, discount, a product ' - 'video with buttons, carousel and sound, a fitted photo on its letterbox, ' + 'with the promo code of its text block (SOUND10), a product video with buttons, carousel and sound, a fitted photo on its letterbox, ' 'text blocks with a promo code, a failed photo with Retry, and a GIF: an 8 s ' 'dial on a 5 s slide plays its whole loop and stops while held, its cover ' 'stays on the first frame', @@ -1126,12 +1126,14 @@ class _FirstFrameAsset extends ImageProvider<_FirstFrameAsset> { Map _sampleProductSlide( String id, - Map product, -) => { + Map product, { + Map? textBlock, +}) => { 'id': id, 'duration': 6, 'type': '', 'elements': [ + ?textBlock, {'type': 'button', 'title': 'More info', 'link': 'https://example.com'}, {'type': 'product', 'item': product}, ], @@ -1184,6 +1186,27 @@ List _sampleStories(_SampleUrl url) => StoriesBlock.fromJson({ 'discount_percent': 12.5, 'url': 'https://example.com/pegasus', }), + // The product has no promo code of its own: the card shows the code of the + // slide's text block, and the text block itself is not drawn. + _sampleProductSlide( + 'text-promo', + { + 'id': 'g1', + 'brand': 'Ray-Ban', + 'name': 'Wayfarer sunglasses', + 'picture': url('sunglasses.jpg'), + 'price': 159, + 'price_formatted': r'159 $', + 'url': 'https://example.com/sunglasses', + }, + textBlock: { + 'type': 'text_block', + 'text_input': 'Your promo code SOUND10', + 'promocode': 'SOUND10', + 'font_size': 20, + 'y_offset': 10, + }, + ), // A product over a video: every slide button, the used products and the // sound toggle; the video streams once and then plays from the disk cache. { From a97de07befcd4f1c9e792104d64922bbfcfeb3f0 Mon Sep 17 00:00:00 2001 From: andreykropotov Date: Fri, 9 Oct 2026 12:45:55 +0400 Subject: [PATCH 79/79] fix(ui): stories seen slides read back over the bridge without a failing cast --- .../pigeon/PersonalizationApi.g.kt | 6 ++-- ios/Classes/Rees46FlutterSdkPlugin.swift | 4 +-- ios/Classes/pigeon/PersonalizationApi.g.swift | 10 ++++-- lib/src/personalization_sdk.dart | 9 ++++-- lib/src/pigeon/personalization_api.g.dart | 8 +++-- lib/src/ui/widgets/stories_seen_store.dart | 12 +++---- pigeons/personalization_api.dart | 6 ++-- test/stories/stories_response_test.dart | 31 ++++++++++++++++++- test/ui/stories_runtime_test.dart | 2 +- 9 files changed, 66 insertions(+), 22 deletions(-) diff --git a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt index a22c006..0b07ba6 100644 --- a/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt +++ b/android/src/main/kotlin/com/rees46/rees46_flutter_sdk/pigeon/PersonalizationApi.g.kt @@ -508,9 +508,11 @@ interface PersonalizationHostApi { /** * The slide ids seen per story id for [shop] — the plugin's own store * (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It - * survives app restarts. + * survives app restarts. The inner lists are untyped on purpose: the channel + * hands nested lists over as `List`, and a typed `List` here + * generates a lazy cast that throws on the first read. */ - fun getStoriesSeen(shop: String): Map> + fun getStoriesSeen(shop: String): Map> /** Records [slideId] of story [storyId] as seen for [shop]. */ fun setStorySlideSeen(shop: String, storyId: String, slideId: String) /** diff --git a/ios/Classes/Rees46FlutterSdkPlugin.swift b/ios/Classes/Rees46FlutterSdkPlugin.swift index 2b822c9..acb234e 100644 --- a/ios/Classes/Rees46FlutterSdkPlugin.swift +++ b/ios/Classes/Rees46FlutterSdkPlugin.swift @@ -766,8 +766,8 @@ final class PersonalizationHostApiImpl: PersonalizationHostApi { // MARK: - Stories viewer (UI kit) - func getStoriesSeen(shop: String) throws -> [String: [String]] { - return StoriesSeenStore.read(shop: shop) + func getStoriesSeen(shop: String) throws -> [String: [Any?]] { + return StoriesSeenStore.read(shop: shop).mapValues { $0 as [Any?] } } func setStorySlideSeen(shop: String, storyId: String, slideId: String) throws { diff --git a/ios/Classes/pigeon/PersonalizationApi.g.swift b/ios/Classes/pigeon/PersonalizationApi.g.swift index eb39c5a..ded6cea 100644 --- a/ios/Classes/pigeon/PersonalizationApi.g.swift +++ b/ios/Classes/pigeon/PersonalizationApi.g.swift @@ -540,8 +540,10 @@ protocol PersonalizationHostApi { func openUrl(url: String, completion: @escaping (Result) -> Void) /// The slide ids seen per story id for [shop] — the plugin's own store /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It - /// survives app restarts. - func getStoriesSeen(shop: String) throws -> [String: [String]] + /// survives app restarts. The inner lists are untyped on purpose: the channel + /// hands nested lists over as `List`, and a typed `List` here + /// generates a lazy cast that throws on the first read. + func getStoriesSeen(shop: String) throws -> [String: [Any?]] /// Records [slideId] of story [storyId] as seen for [shop]. func setStorySlideSeen(shop: String, storyId: String, slideId: String) throws /// The app's cache directory: Android `Context.cacheDir`, iOS `Library/Caches`. The @@ -1006,7 +1008,9 @@ class PersonalizationHostApiSetup { } /// The slide ids seen per story id for [shop] — the plugin's own store /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It - /// survives app restarts. + /// survives app restarts. The inner lists are untyped on purpose: the channel + /// hands nested lists over as `List`, and a typed `List` here + /// generates a lazy cast that throws on the first read. let getStoriesSeenChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getStoriesSeenChannel.setMessageHandler { message, reply in diff --git a/lib/src/personalization_sdk.dart b/lib/src/personalization_sdk.dart index 76a4043..02a1039 100644 --- a/lib/src/personalization_sdk.dart +++ b/lib/src/personalization_sdk.dart @@ -364,8 +364,13 @@ extension PersonalizationStoriesBridge on PersonalizationSdk { /// The stories slides seen on this device for [shop] (slide ids by story id), from the /// plugin's own persistent store. - Future>> getStoriesSeen(String shop) => - _api.getStoriesSeen(shop); + Future>> getStoriesSeen(String shop) async { + final stored = await _api.getStoriesSeen(shop); + return >{ + for (final entry in stored.entries) + entry.key: entry.value.whereType().toList(), + }; + } /// Records slide [slideId] of story [storyId] as seen for [shop]. Future setStorySlideSeen(String shop, String storyId, String slideId) => diff --git a/lib/src/pigeon/personalization_api.g.dart b/lib/src/pigeon/personalization_api.g.dart index 3fa46a6..3377c7c 100644 --- a/lib/src/pigeon/personalization_api.g.dart +++ b/lib/src/pigeon/personalization_api.g.dart @@ -1100,8 +1100,10 @@ class PersonalizationHostApi { /// The slide ids seen per story id for [shop] — the plugin's own store /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It - /// survives app restarts. - Future>> getStoriesSeen(String shop) async { + /// survives app restarts. The inner lists are untyped on purpose: the channel + /// hands nested lists over as `List`, and a typed `List` here + /// generates a lazy cast that throws on the first read. + Future>> getStoriesSeen(String shop) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen$pigeonVar_messageChannelSuffix'; final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, @@ -1125,7 +1127,7 @@ class PersonalizationHostApi { message: 'Host platform returned null value for non-null return value.', ); } else { - return (pigeonVar_replyList[0] as Map?)!.cast>(); + return (pigeonVar_replyList[0] as Map?)!.cast>(); } } diff --git a/lib/src/ui/widgets/stories_seen_store.dart b/lib/src/ui/widgets/stories_seen_store.dart index dab7131..5b720bb 100644 --- a/lib/src/ui/widgets/stories_seen_store.dart +++ b/lib/src/ui/widgets/stories_seen_store.dart @@ -34,16 +34,16 @@ class StoriesSeenStore { } Future _read(PersonalizationSdk sdk, String shop) async { - Map> stored = const >{}; + final current = _byShop.putIfAbsent(shop, () => >{}); + // Разбор тоже под try: кривые данные хранилища не должны ронять ленту. try { - stored = await sdk.getStoriesSeen(shop); + final stored = await sdk.getStoriesSeen(shop); + for (final entry in stored.entries) { + (current[entry.key] ??= {}).addAll(entry.value); + } } catch (error) { debugPrint('PersonalizationStories: seen slides unavailable — $error'); } - final current = _byShop.putIfAbsent(shop, () => >{}); - for (final entry in stored.entries) { - (current[entry.key] ??= {}).addAll(entry.value); - } } /// Что известно сейчас, без чтения с устройства. diff --git a/pigeons/personalization_api.dart b/pigeons/personalization_api.dart index 77804d8..34012be 100644 --- a/pigeons/personalization_api.dart +++ b/pigeons/personalization_api.dart @@ -264,8 +264,10 @@ abstract class PersonalizationHostApi { /// The slide ids seen per story id for [shop] — the plugin's own store /// (SharedPreferences on Android, UserDefaults on iOS), not the native SDK's. It - /// survives app restarts. - Map> getStoriesSeen(String shop); + /// survives app restarts. The inner lists are untyped on purpose: the channel + /// hands nested lists over as `List`, and a typed `List` here + /// generates a lazy cast that throws on the first read. + Map> getStoriesSeen(String shop); /// Records [slideId] of story [storyId] as seen for [shop]. void setStorySlideSeen(String shop, String storyId, String slideId); diff --git a/test/stories/stories_response_test.dart b/test/stories/stories_response_test.dart index 065f3ad..d0a0c65 100644 --- a/test/stories/stories_response_test.dart +++ b/test/stories/stories_response_test.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:rees46_sdk/rees46_sdk.dart'; import 'package:rees46_sdk/src/personalization_sdk.dart' @@ -151,7 +152,7 @@ class _FakeHostApi extends pigeon.PersonalizationHostApi { } @override - Future>> getStoriesSeen(String shop) async => + Future>> getStoriesSeen(String shop) async => seen[shop] ?? >{}; @override @@ -300,6 +301,34 @@ void main() { expect(await sdk.getStoriesSeen('shop-b'), isEmpty); }); + test('seen slides read over the real channel, whose lists arrive untyped', () async { + // The platform side answers through the standard codec: the inner lists decode + // as List, not List. A lazy cast of them threw on the first read + // once a slide had been seen ("List is not a subtype of List"). + const channel = + 'dev.flutter.pigeon.personalization_flutter_sdk.PersonalizationHostApi.getStoriesSeen'; + final messenger = + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger; + messenger.setMockMessageHandler( + channel, + (_) async => const StandardMessageCodec().encodeMessage([ + { + '40': ['36', '37'], + }, + ]), + ); + addTearDown(() => messenger.setMockMessageHandler(channel, null)); + + final sdk = PersonalizationSdk( + api: pigeon.PersonalizationHostApi(), + shopId: 'shop-a', + ); + + final seen = await sdk.getStoriesSeen('shop-a'); + expect(seen.keys, ['40']); + expect(seen['40'], ['36', '37']); + }); + test('numbers are read as decimals; the default duration is 10 s', () { final product = StoryProduct.fromJson(const { 'id': 1, diff --git a/test/ui/stories_runtime_test.dart b/test/ui/stories_runtime_test.dart index 6de8c99..8bf6bb8 100644 --- a/test/ui/stories_runtime_test.dart +++ b/test/ui/stories_runtime_test.dart @@ -14,7 +14,7 @@ class _FakeHostApi extends pigeon.PersonalizationHostApi { int reads = 0; @override - Future>> getStoriesSeen(String shop) async { + Future>> getStoriesSeen(String shop) async { reads++; return shop == 'shop-a' ? stored : >{}; }

7%-4|Mj};{%dr{@qIetQ}XOoy}IyU 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 CozH;) literal 0 HcmV?d00001 diff --git a/example/assets/uikit/loyalty_logo.png b/example/assets/uikit/loyalty_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b8a93dee5393fb9073e62064e118c2be1c6ed38a GIT binary patch literal 6945 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 literal 0 HcmV?d00001 diff --git a/example/assets/uikit/loyalty_stripe.jpg b/example/assets/uikit/loyalty_stripe.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5f500f7c3ad1250d78e696e77dc84fe55e7300e4 GIT binary patch literal 72376 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%0Agp6!IXKN7?m!KXq&ajmP^pSL1y&JN5OF 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