From 0edd0c7398417e7ae5087f622cd9dbdf6052911d Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 30 Sep 2026 22:22:08 +0400 Subject: [PATCH 01/31] feat(ui): stories v2 components Covers with the ring and its slide segments, previews and the bar, slide progress with the close button, the price plate with discount or a promo code that copies with a toast, the countdown timer, text blocks, the used-products row with its carousel sheet and sound button, and the product card of a slide. Tokens Neutral 100, Semantic/Info and Semantic/Neutral Subtle, speaker icons. --- .../ui/PersonalizationTheme.kt | 3 + .../ui/components/PersonalizationStoryCard.kt | 205 ++++++++++ .../components/PersonalizationStoryCover.kt | 364 ++++++++++++++++++ .../PersonalizationStoryNavigation.kt | 152 ++++++++ .../components/PersonalizationStoryPrice.kt | 270 +++++++++++++ .../components/PersonalizationStorySupport.kt | 168 ++++++++ .../PersonalizationStoryTextBlock.kt | 172 +++++++++ .../components/PersonalizationStoryTimer.kt | 187 +++++++++ .../PersonalizationStoryUsedProducts.kt | 156 ++++++++ .../drawable/personalization_ic_speaker.xml | 30 ++ .../personalization_ic_speaker_off.xml | 28 ++ .../values-night/personalization_colors.xml | 3 + .../main/res/values/personalization_attrs.xml | 3 + .../res/values/personalization_colors.xml | 5 + .../main/res/values/personalization_theme.xml | 3 + .../PersonalizationStoryComponentsTest.kt | 145 +++++++ 16 files changed, 1894 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt create mode 100644 personalization-sdk/src/main/res/drawable/personalization_ic_speaker.xml create mode 100644 personalization-sdk/src/main/res/drawable/personalization_ic_speaker_off.xml create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt index 44c2835f..b7707e4d 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt @@ -41,6 +41,9 @@ object PersonalizationTheme { R.color.personalization_neutral_50 to R.attr.personalizationColorNeutral50, R.color.personalization_semantic_warning to R.attr.personalizationColorSemanticWarning, R.color.personalization_semantic_danger to R.attr.personalizationColorSemanticDanger, + R.color.personalization_neutral_100 to R.attr.personalizationColorNeutral100, + R.color.personalization_semantic_info to R.attr.personalizationColorSemanticInfo, + R.color.personalization_semantic_neutral_subtle to R.attr.personalizationColorSemanticNeutralSubtle, R.color.personalization_background_generic to R.attr.personalizationColorBackgroundGeneric, R.color.personalization_background_card to R.attr.personalizationColorBackgroundCard, R.color.personalization_background_input to R.attr.personalizationColorBackgroundInput, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt new file mode 100644 index 00000000..49d34e0c --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt @@ -0,0 +1,205 @@ +package com.personalization.ui.components + +import android.content.Context +import android.graphics.drawable.GradientDrawable +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Содержимое товарного и акционного слайда. + * + * Источник: Figma, Card/Story (238:6890), виды Product / Promo / Discount / Action: + * колонка, разнесённая по высоте. Сверху бейдж ([badgeText], Badge LG) и шапка — + * [title] SemiBold 20 и [subtitle] SemiBold 16 с интерлиньяжем 140% и шагом 8. + * Посередине — белая квадратная карточка фото со скруглением 12 и отступом 16 + * ([showImage]); квадрат вписывается в свободную высоту. Снизу с шагом 16 — + * [price], [timer] и кнопка LG Primary ([buttonText]). + * + * Цвет текста шапки — Text/Primary контекста: на медиа-слайде он тёмный режим. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryCard @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + val badge = PersonalizationBadge(context) + val price = PersonalizationStoryPrice(context) + val timer = PersonalizationStoryTimer(context) + val button = PersonalizationButton(context) + + /** Фото товара — хост кладёт картинку своим загрузчиком. */ + val imageView: ImageView = AppCompatImageView(context) + + private val header = LinearLayout(context) + private val titleView = AppCompatTextView(context) + private val subtitleView = AppCompatTextView(context) + private val imageArea = FrameLayout(context) + private val imageCard = StorySquareFrame(context) + private val spacer = View(context) + private val bottom = LinearLayout(context) + + var badgeText: CharSequence? = null + set(value) { + field = value + badge.text = value + applyVisibility() + } + + var title: CharSequence? = null + set(value) { + field = value + titleView.text = value + applyVisibility() + } + + var subtitle: CharSequence? = null + set(value) { + field = value + subtitleView.text = value + applyVisibility() + } + + var showImage: Boolean = true + set(value) { + field = value + applyVisibility() + } + + var showPrice: Boolean = true + set(value) { + field = value + applyVisibility() + } + + var showTimer: Boolean = false + set(value) { + field = value + applyVisibility() + } + + /** Подпись кнопки; `null` — без кнопки. */ + var buttonText: CharSequence? = null + set(value) { + field = value + button.text = value + applyVisibility() + } + + var onButtonClick: (() -> Unit)? = null + + init { + orientation = VERTICAL + + badge.size = PersonalizationBadge.Size.LG + badge.badgeView = PersonalizationBadge.BadgeView.WARNING + addView(badge, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT).apply { + bottomMargin = dp(16) + }) + + header.orientation = VERTICAL + titleView.headerStyle(20f) + subtitleView.headerStyle(16f) + header.addView(titleView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + header.addView(subtitleView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { + topMargin = dp(8) + }) + addView(header, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + + imageCard.background = GradientDrawable().apply { + cornerRadius = dp(12).toFloat() + setColor(IMAGE_CARD_COLOR) + } + imageCard.setPadding(dp(16), dp(16), dp(16), dp(16)) + (imageView as AppCompatImageView).scaleType = ImageView.ScaleType.FIT_CENTER + imageCard.addView(imageView, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)) + imageArea.setPadding(0, dp(16), 0, dp(16)) + imageArea.addView( + imageCard, + FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.CENTER) + ) + addView(imageArea, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) + addView(spacer, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) + + bottom.orientation = VERTICAL + bottom.addView(price, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + bottom.addView(timer, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { + topMargin = dp(16) + }) + button.size = PersonalizationButton.Size.LG + button.buttonView = PersonalizationButton.ButtonView.PRIMARY + button.setOnClickListener { onButtonClick?.invoke() } + bottom.addView(button, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { + topMargin = dp(16) + }) + addView(bottom, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + + applyVisibility() + } + + private fun applyVisibility() { + badge.visibility = visibleIf(!badgeText.isNullOrEmpty()) + titleView.visibility = visibleIf(!title.isNullOrEmpty()) + subtitleView.visibility = visibleIf(!subtitle.isNullOrEmpty()) + (subtitleView.layoutParams as LayoutParams).topMargin = if (title.isNullOrEmpty()) 0 else dp(8) + header.visibility = visibleIf(!title.isNullOrEmpty() || !subtitle.isNullOrEmpty()) + imageArea.visibility = visibleIf(showImage) + spacer.visibility = visibleIf(!showImage) + price.visibility = visibleIf(showPrice) + timer.visibility = visibleIf(showTimer) + button.visibility = visibleIf(!buttonText.isNullOrEmpty()) + + // Шаг 16 только между видимыми элементами низа. + var first = true + for (child in listOf(price, timer, button)) { + if (child.visibility != View.VISIBLE) continue + (child.layoutParams as LayoutParams).topMargin = if (first) 0 else dp(16) + first = false + } + requestLayout() + } + + private fun AppCompatTextView.headerStyle(sizeSp: Float) { + includeFontPadding = false + typeface = PersonalizationTheme.typeface(context, emphasized = true) + setTextSize(TypedValue.COMPLEX_UNIT_SP, sizeSp) + setLineSpacing(0f, HEADER_LINE_HEIGHT) + setTextColor(PersonalizationTheme.color(context, R.color.personalization_text_primary)) + } + + private fun visibleIf(visible: Boolean) = if (visible) View.VISIBLE else View.GONE + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + /** Карточка фото в макете белая в обеих темах — фото товаров снимают на белом. */ + const val IMAGE_CARD_COLOR = 0xFFFFFFFF.toInt() + const val HEADER_LINE_HEIGHT = 1.4f + } +} + +/** Квадрат, вписанный в отведённое место: сторона — меньшая из ширины и высоты. */ +internal class StorySquareFrame(context: Context) : FrameLayout(context) { + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val width = MeasureSpec.getSize(widthMeasureSpec) + val height = MeasureSpec.getSize(heightMeasureSpec) + val side = when { + MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED -> width + MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED -> height + else -> minOf(width, height) + } + val exact = MeasureSpec.makeMeasureSpec(side, MeasureSpec.EXACTLY) + super.onMeasure(exact, exact) + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt new file mode 100644 index 00000000..0db60f2e --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt @@ -0,0 +1,364 @@ +package com.personalization.ui.components + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.graphics.drawable.GradientDrawable +import android.text.TextUtils +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import android.widget.HorizontalScrollView +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.widget.ImageViewCompat +import androidx.core.widget.TextViewCompat +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Обложка сторис в ленте: кольцо и круглая картинка. + * + * Источник: Figma Mobile SDK UI Kit, Story/Cover (393:17570) и Progress/Circular (391:17122): + * круг 88 с кольцом 4 внутрь, картинка 76 с зазором 2 от кольца. Состояния — [State]: + * закреплённая (кольцо Semantic/Warning и звезда Favorites справа внизу), обычная + * (Button/Primary), просмотренная (Semantic/Neutral Subtle) и скелетон загрузки. + * + * Кольцо делится на сегменты по числу слайдов ([segments]); уже просмотренные + * ([seenSegments]) — цветом Button/Primary Disabled, как в вариантах Progress/Circular. + * + * Картинку кладёт хост в [imageView] — кит ничего не качает. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryCover @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + enum class State { PINNED, DEFAULT, VIEWED, SKELETON } + + var state: State = State.DEFAULT + set(value) { + field = value + applyState() + } + + /** Сколько сегментов у кольца — обычно число слайдов. 1 — сплошное кольцо. */ + var segments: Int = 1 + set(value) { + field = value.coerceAtLeast(1) + invalidate() + } + + /** Сколько первых сегментов уже просмотрено. */ + var seenSegments: Int = 0 + set(value) { + field = value.coerceAtLeast(0) + invalidate() + } + + /** Диаметр обложки в пикселях; толщина кольца и зазор не масштабируются. */ + var coverSize: Int = dp(DEFAULT_SIZE_DP) + set(value) { + field = value + requestLayout() + } + + /** Круглая картинка обложки. */ + val imageView: ImageView = StoryCircleImageView(context) + + private val favorites = FrameLayout(context) + private val star = AppCompatImageView(context) + private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + style = Paint.Style.STROKE + strokeWidth = dp(RING_DP).toFloat() + } + private val ringBounds = RectF() + + init { + setWillNotDraw(false) + clipChildren = false + + addView(imageView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + + star.setImageResource(R.drawable.personalization_ic_star_fill) + ImageViewCompat.setImageTintList( + star, + PersonalizationTheme.colorStateList(context, R.color.personalization_text_light_primary) + ) + favorites.background = GradientDrawable().apply { + shape = GradientDrawable.OVAL + setColor(PersonalizationTheme.color(context, R.color.personalization_semantic_warning)) + } + favorites.addView(star, LayoutParams(dp(STAR_DP), dp(STAR_DP), Gravity.CENTER)) + addView(favorites, LayoutParams(dp(FAVORITES_DP), dp(FAVORITES_DP), Gravity.BOTTOM or Gravity.END)) + + applyState() + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val inset = dp(RING_DP + GAP_DP) + val image = MeasureSpec.makeMeasureSpec(coverSize - inset * 2, MeasureSpec.EXACTLY) + imageView.measure(image, image) + val badge = MeasureSpec.makeMeasureSpec(dp(FAVORITES_DP), MeasureSpec.EXACTLY) + favorites.measure(badge, badge) + setMeasuredDimension(coverSize, coverSize) + } + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + val inset = dp(RING_DP + GAP_DP) + imageView.layout(inset, inset, coverSize - inset, coverSize - inset) + // В макете звезда стоит в 62,62 при обложке 88 — прижата к правому нижнему углу + // с отступом 2 от края. + val badgeEnd = coverSize - dp(FAVORITES_INSET_DP) + favorites.layout(badgeEnd - dp(FAVORITES_DP), badgeEnd - dp(FAVORITES_DP), badgeEnd, badgeEnd) + } + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + val half = ringPaint.strokeWidth / 2f + ringBounds.set(half, half, width - half, height - half) + + if (state == State.SKELETON) { + ringPaint.shader = StorySupport.skeletonShader(context, width.toFloat(), height.toFloat()) + canvas.drawOval(ringBounds, ringPaint) + ringPaint.shader = null + return + } + + val main = PersonalizationTheme.color(context, ringColorRes()) + if (segments <= 1 || state == State.VIEWED) { + ringPaint.color = main + canvas.drawOval(ringBounds, ringPaint) + return + } + + val seen = PersonalizationTheme.color(context, R.color.personalization_button_primary_disabled) + val sweep = 360f / segments + val gap = SEGMENT_GAP_DEGREES.coerceAtMost(sweep / 3f) + for (index in 0 until segments) { + ringPaint.color = if (index < seenSegments) seen else main + canvas.drawArc(ringBounds, START_ANGLE + index * sweep + gap / 2f, sweep - gap, false, ringPaint) + } + } + + private fun ringColorRes(): Int = when (state) { + State.PINNED -> R.color.personalization_semantic_warning + State.VIEWED -> R.color.personalization_semantic_neutral_subtle + else -> R.color.personalization_button_primary + } + + private fun applyState() { + val skeleton = state == State.SKELETON + imageView.background = if (skeleton) StorySupport.skeletonDrawable(context, GradientDrawable.OVAL) else null + imageView.visibility = View.VISIBLE + if (skeleton) imageView.setImageDrawable(null) + favorites.visibility = if (state == State.PINNED) View.VISIBLE else View.GONE + invalidate() + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + const val DEFAULT_SIZE_DP = 88 + const val RING_DP = 4 + const val GAP_DP = 2 + const val FAVORITES_DP = 24 + const val FAVORITES_INSET_DP = 2 + const val STAR_DP = 16 + const val START_ANGLE = -90f + const val SEGMENT_GAP_DEGREES = 8f + } +} + +/** + * Превью сторис: обложка и подпись под ней. + * + * Источник: Figma, Story/Preview (391:17082): колонка шириной с обложку, шаг 8, + * подпись Regular 12/16 по центру цветом Text/Primary. У скелетона вместо подписи — + * полоска 64×8 со скруглением 5. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryPreview @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + val cover = PersonalizationStoryCover(context) + + private val label = AppCompatTextView(context) + private val skeletonLabel = View(context) + + var title: CharSequence? + get() = label.text + set(value) { + label.text = value + } + + var state: PersonalizationStoryCover.State + get() = cover.state + set(value) { + cover.state = value + applyState() + } + + init { + orientation = VERTICAL + gravity = Gravity.CENTER_HORIZONTAL + + addView(cover, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)) + + label.includeFontPadding = false + label.gravity = Gravity.CENTER + label.maxLines = 1 + label.ellipsize = TextUtils.TruncateAt.END + label.typeface = PersonalizationTheme.typeface(context, emphasized = false) + label.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.personalization_font_size_xs)) + TextViewCompat.setLineHeight(label, resources.getDimensionPixelSize(R.dimen.personalization_line_height_xs)) + label.setLetterSpacingCompat(LABEL_LETTER_SPACING_EM) + label.setTextColor(PersonalizationTheme.color(context, R.color.personalization_text_primary)) + addView( + label, + LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { + topMargin = resources.getDimensionPixelSize(R.dimen.personalization_spacing_md) + } + ) + + skeletonLabel.background = StorySupport.skeletonDrawable(context, GradientDrawable.RECTANGLE, dp(5).toFloat()) + addView( + skeletonLabel, + LayoutParams(dp(64), dp(8)).apply { + // Полоска 8 в строке 16: по 4 сверху и снизу. + topMargin = resources.getDimensionPixelSize(R.dimen.personalization_spacing_md) + dp(4) + bottomMargin = dp(4) + } + ) + applyState() + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + // Ширина превью — ширина обложки, подпись режется многоточием. + super.onMeasure(MeasureSpec.makeMeasureSpec(cover.coverSize, MeasureSpec.EXACTLY), heightMeasureSpec) + } + + private fun applyState() { + val skeleton = cover.state == PersonalizationStoryCover.State.SKELETON + label.visibility = if (skeleton) View.GONE else View.VISIBLE + skeletonLabel.visibility = if (skeleton) View.VISIBLE else View.GONE + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + /** Трекинг в макете 0.05 — в процентах кегля, то есть почти ноль; в em так же. */ + const val LABEL_LETTER_SPACING_EM = 0.0005f + } +} + +/** Сторис для ленты: всё, что нужно обложке и подписи. */ +@InternalPersonalizationUiApi +data class PersonalizationStoryItem( + val id: String, + val title: CharSequence, + val imageUrl: String? = null, + val state: PersonalizationStoryCover.State = PersonalizationStoryCover.State.DEFAULT, + val segments: Int = 1, + val seenSegments: Int = 0 +) + +/** + * Лента сторис — горизонтальный ряд превью. + * + * Источник: Figma, Card/Story View=Stories Block (238:6890): превью с шагом 16, + * отступы 16. Пока данных нет — [showSkeleton]. + */ +@InternalPersonalizationUiApi +class PersonalizationStoriesBar @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : HorizontalScrollView(context, attrs, defStyleAttr) { + + private val row = LinearLayout(context) + + var items: List = emptyList() + set(value) { + field = value + render() + } + + /** Хост кладёт обложку в `ImageView` своим загрузчиком. */ + var imageLoader: ((ImageView, String) -> Unit)? = null + set(value) { + field = value + render() + } + + var onItemClick: ((index: Int, item: PersonalizationStoryItem) -> Unit)? = null + + /** Диаметр обложек в пикселях. */ + var coverSize: Int = (88 * resources.displayMetrics.density).toInt() + set(value) { + field = value + render() + } + + private var skeletonCount = 0 + + init { + isHorizontalScrollBarEnabled = false + clipToPadding = false + val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + setPadding(padding, padding, padding, padding) + row.orientation = LinearLayout.HORIZONTAL + addView(row, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)) + } + + /** Скелетон загрузки: [count] пустых превью. Сбрасывается установкой [items]. */ + fun showSkeleton(count: Int = 4) { + skeletonCount = count + row.removeAllViews() + repeat(count) { index -> + row.addView( + PersonalizationStoryPreview(context).apply { + cover.coverSize = coverSize + state = PersonalizationStoryCover.State.SKELETON + }, + itemParams(index) + ) + } + } + + private fun render() { + skeletonCount = 0 + row.removeAllViews() + items.forEachIndexed { index, item -> + val preview = PersonalizationStoryPreview(context).apply { + cover.coverSize = coverSize + title = item.title + state = item.state + cover.segments = item.segments + cover.seenSegments = item.seenSegments + contentDescription = item.title + setOnClickListener { onItemClick?.invoke(index, item) } + } + item.imageUrl?.takeIf { it.isNotEmpty() }?.let { url -> + imageLoader?.invoke(preview.cover.imageView, url) + } + row.addView(preview, itemParams(index)) + } + } + + private fun itemParams(index: Int) = + LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { + if (index > 0) marginStart = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt new file mode 100644 index 00000000..cca74162 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt @@ -0,0 +1,152 @@ +package com.personalization.ui.components + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.util.AttributeSet +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.core.widget.ImageViewCompat +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Прогресс слайдов сторис: по полоске на слайд. + * + * Источник: Figma, Navigation/Story (10:863), рамка Progress: полоски высотой 2 + * с шагом 2 и скруглением 1 делят ширину поровну. Пройденное — Text/Secondary, + * дорожка — Line/Generic. Текущая полоска заполнена на [progress]. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryProgress @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + /** Число слайдов. */ + var count: Int = 1 + set(value) { + field = value.coerceAtLeast(1) + invalidate() + } + + /** Индекс текущего слайда: полоски до него заполнены целиком. */ + var current: Int = 0 + set(value) { + field = value + invalidate() + } + + /** Заполнение текущей полоски, 0…1. */ + var progress: Float = 0f + set(value) { + field = value.coerceIn(0f, 1f) + invalidate() + } + + private val paint = Paint(Paint.ANTI_ALIAS_FLAG) + private val rect = RectF() + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + setMeasuredDimension( + MeasureSpec.getSize(widthMeasureSpec), + resolveSize(dp(HEIGHT_DP), heightMeasureSpec) + ) + } + + override fun onDraw(canvas: Canvas) { + val gap = dp(GAP_DP).toFloat() + val radius = dp(RADIUS_DP).toFloat() + val segment = (width - gap * (count - 1)) / count + val filled = PersonalizationTheme.color(context, R.color.personalization_text_secondary) + val track = PersonalizationTheme.color(context, R.color.personalization_line_generic) + + for (index in 0 until count) { + val left = index * (segment + gap) + rect.set(left, 0f, left + segment, height.toFloat()) + paint.color = track + canvas.drawRoundRect(rect, radius, radius, paint) + + val fraction = when { + index < current -> 1f + index == current -> progress + else -> 0f + } + if (fraction > 0f) { + rect.set(left, 0f, left + segment * fraction, height.toFloat()) + paint.color = filled + canvas.drawRoundRect(rect, radius, radius, paint) + } + } + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + const val HEIGHT_DP = 2 + const val GAP_DP = 2 + const val RADIUS_DP = 1 + } +} + +/** + * Шапка сторис: прогресс слайдов и крестик. + * + * Источник: Figma, Navigation/Story (10:863): колонка с шагом 12 — прогресс и строка + * высотой 32 с крестиком справа (cross 32, глиф Text/Secondary, прозрачность 65%). + * Аватар и заголовок в символе есть, но во всех экранах сторис скрыты. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryNavigation @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + val progress = PersonalizationStoryProgress(context) + + private val close = AppCompatImageView(context) + + var onClose: (() -> Unit)? = null + + var closeContentDescription: CharSequence? = "Close" + set(value) { + field = value + close.contentDescription = value + } + + init { + orientation = VERTICAL + addView(progress, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + + val row = FrameLayout(context) + close.setImageResource(R.drawable.personalization_ic_cross) + ImageViewCompat.setImageTintList( + close, + PersonalizationTheme.colorStateList(context, R.color.personalization_text_secondary) + ) + close.alpha = CLOSE_ALPHA + close.contentDescription = closeContentDescription + close.setOnClickListener { onClose?.invoke() } + row.addView(close, FrameLayout.LayoutParams(dp(CLOSE_DP), dp(CLOSE_DP), Gravity.END or Gravity.CENTER_VERTICAL)) + addView( + row, + LayoutParams(LayoutParams.MATCH_PARENT, dp(CLOSE_DP)).apply { + topMargin = resources.getDimensionPixelSize(R.dimen.personalization_spacing_lg) + } + ) + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + const val CLOSE_DP = 32 + const val CLOSE_ALPHA = 0.65f + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt new file mode 100644 index 00000000..85b76124 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt @@ -0,0 +1,270 @@ +package com.personalization.ui.components + +import android.annotation.SuppressLint +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.graphics.drawable.GradientDrawable +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import android.view.MotionEvent +import android.view.View +import android.widget.FrameLayout +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.widget.ImageViewCompat +import androidx.core.widget.TextViewCompat +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Плашка цены товара в сторис. + * + * Источник: Figma, Card/Story/Price (10:875): скругление 12, заливка #F2F2F2 95% + * (в макете сырой цвет, одинаковый в обеих темах — поэтому текст всегда Text/Dark). + * Слева колонка с отступами 12/16: старая цена (SemiBold 14, зачёркнута, группа + * прозрачна на 50%) и цена (SemiBold 24); валюта у обеих — Regular 14. + * + * Справа, по [type]: + * - [Type.DISCOUNT] — блок Brand/Primary со скидкой SemiBold 36 (`10%`); + * - [Type.PROMO_CODE] — чёрный блок с подписью «Promo code» и кодом SemiBold 24, + * иконка copy в углу. Нажатие копирует код в буфер, показывает тост [copiedText] + * (в задаче на странице Stories: «по умолчанию Copied») и зовёт [onPromoCopied]; + * блок при нажатии чуть увеличивается — кадр Tap Zoom Effect. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryPrice @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + enum class Type { PRICE, DISCOUNT, PROMO_CODE } + + var type: Type = Type.PRICE + set(value) { + field = value + render() + } + + /** Цена в формате сервера — `"1 190 900 ₽"`; валюта отделяется сама. */ + var price: CharSequence? = null + set(value) { + field = value + render() + } + + /** Старая цена; `null` — строки нет. */ + var oldPrice: CharSequence? = null + set(value) { + field = value + render() + } + + /** Текст скидки для [Type.DISCOUNT] — `"10%"`. */ + var discount: CharSequence? = null + set(value) { + field = value + render() + } + + /** Промокод для [Type.PROMO_CODE]. */ + var promoCode: String? = null + set(value) { + field = value + render() + } + + var promoCaption: CharSequence = "Promo code" + set(value) { + field = value + render() + } + + /** Текст тоста после копирования. */ + var copiedText: CharSequence = "Copied" + + /** Где показывать тост: в макете два варианта — над плашкой и сверху экрана. */ + var toastPosition: PersonalizationToast.Position = PersonalizationToast.Position.TOP + + /** Код скопирован в буфер. */ + var onPromoCopied: ((String) -> Unit)? = null + + private val priceColumn = LinearLayout(context) + private val oldPriceView = AppCompatTextView(context) + private val priceView = AppCompatTextView(context) + private val discountView = AppCompatTextView(context) + private val promoBox = FrameLayout(context) + private val promoCaptionView = AppCompatTextView(context) + private val promoCodeView = AppCompatTextView(context) + private val copyIcon = AppCompatImageView(context) + + private val radius = dp(RADIUS_DP).toFloat() + private val measurePaint = android.text.TextPaint(android.graphics.Paint.ANTI_ALIAS_FLAG) + + init { + orientation = HORIZONTAL + background = GradientDrawable().apply { + cornerRadius = radius + setColor(BOX_COLOR) + } + + priceColumn.orientation = VERTICAL + priceColumn.gravity = Gravity.CENTER_VERTICAL + priceColumn.setPadding(dp(16), dp(12), dp(16), dp(12)) + oldPriceView.style(sizeSp = 14f, emphasized = true, colorRes = R.color.personalization_text_dark_secondary) + oldPriceView.alpha = OLD_PRICE_ALPHA + priceView.style(sizeSp = 24f, emphasized = true, colorRes = R.color.personalization_text_dark_primary) + priceColumn.addView(oldPriceView, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)) + priceColumn.addView(priceView, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)) + + discountView.style(sizeSp = 36f, emphasized = true, colorRes = R.color.personalization_text_light_primary) + discountView.gravity = Gravity.CENTER + discountView.setPadding(dp(16), 0, dp(16), 0) + discountView.background = endRounded(PersonalizationTheme.color(context, R.color.personalization_brand_primary)) + + val promoColumn = LinearLayout(context).apply { + orientation = VERTICAL + gravity = Gravity.CENTER + setPadding(dp(16), dp(12), dp(16), dp(12)) + } + promoCaptionView.style(sizeSp = 14f, emphasized = true, colorRes = R.color.personalization_text_light_secondary) + promoCaptionView.gravity = Gravity.CENTER + promoCodeView.style(sizeSp = 24f, emphasized = true, colorRes = R.color.personalization_text_light_primary) + promoCodeView.gravity = Gravity.CENTER + promoCodeView.maxLines = 1 + // Длинный код ужимается, а не режется: его надо прочитать целиком. + TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration( + promoCodeView, 14, 24, 1, TypedValue.COMPLEX_UNIT_SP + ) + promoColumn.addView(promoCaptionView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + promoColumn.addView(promoCodeView, LayoutParams(LayoutParams.MATCH_PARENT, dp(PROMO_CODE_HEIGHT_DP))) + promoBox.addView( + promoColumn, + FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.CENTER) + ) + copyIcon.setImageResource(R.drawable.personalization_ic_copy) + ImageViewCompat.setImageTintList( + copyIcon, + PersonalizationTheme.colorStateList(context, R.color.personalization_text_light_hint) + ) + promoBox.addView( + copyIcon, + FrameLayout.LayoutParams(dp(COPY_DP), dp(COPY_DP), Gravity.TOP or Gravity.END).apply { + topMargin = dp(4) + marginEnd = dp(4) + } + ) + promoBox.background = endRounded(PersonalizationTheme.color(context, R.color.personalization_text_dark_primary)) + promoBox.isClickable = true + promoBox.contentDescription = promoCaption + setupPromoPress() + + addView(priceColumn, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)) + addView(discountView, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)) + addView(promoBox, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)) + render() + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + // Промокод делит ширину поровну с ценой, но длинный код берёт сколько нужно — + // не больше [MAX_PROMO_SHARE] ряда, дальше код ужимается автоподбором кегля. + if (promoBox.visibility == View.VISIBLE && MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED) { + val total = MeasureSpec.getSize(widthMeasureSpec) + measurePaint.typeface = promoCodeView.typeface + measurePaint.textSize = spPx(24f).toFloat() + val needed = measurePaint.measureText(promoCode.orEmpty()) + dp(16) * 2 + val width = needed.toInt().coerceIn(total / 2, (total * MAX_PROMO_SHARE).toInt()) + val params = promoBox.layoutParams as LayoutParams + if (params.width != width) params.width = width + } + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + } + + private fun render() { + val currencyPx = spPx(14f) + val old = oldPrice?.takeIf { it.isNotEmpty() } + oldPriceView.visibility = if (old != null) View.VISIBLE else View.GONE + oldPriceView.text = old?.let { + PersonalizationStoryAmount.parse(it).toSpannable(currencyPx, strikethrough = true) + } + priceView.text = price?.let { PersonalizationStoryAmount.parse(it).toSpannable(currencyPx) } + + val showDiscount = type == Type.DISCOUNT && !discount.isNullOrEmpty() + val showPromo = type == Type.PROMO_CODE && !promoCode.isNullOrEmpty() + discountView.visibility = if (showDiscount) View.VISIBLE else View.GONE + discountView.text = discount + promoBox.visibility = if (showPromo) View.VISIBLE else View.GONE + promoCaptionView.text = promoCaption + promoCodeView.text = promoCode + promoBox.contentDescription = promoCaption + + // Колонка цены тянется, когда справа скидка; с промокодом делит ряд поровну. + (priceColumn.layoutParams as LayoutParams).apply { + width = if (showDiscount || showPromo) 0 else LayoutParams.WRAP_CONTENT + weight = if (showDiscount || showPromo) 1f else 0f + } + (promoBox.layoutParams as LayoutParams).weight = 0f + requestLayout() + } + + @SuppressLint("ClickableViewAccessibility") + private fun setupPromoPress() { + promoBox.setOnTouchListener { view, event -> + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> + view.animate().scaleX(PRESS_SCALE).scaleY(PRESS_SCALE).setDuration(PRESS_MS).start() + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> + view.animate().scaleX(1f).scaleY(1f).setDuration(PRESS_MS).start() + } + false + } + promoBox.setOnClickListener { copyPromo() } + } + + private fun copyPromo() { + val code = promoCode?.takeIf { it.isNotEmpty() } ?: return + val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager + clipboard?.setPrimaryClip(ClipData.newPlainText(promoCaption, code)) + PersonalizationToast.show(this, copiedText, toastPosition) + onPromoCopied?.invoke(code) + } + + /** Правый блок повторяет скругление плашки только справа. */ + private fun endRounded(color: Int) = GradientDrawable().apply { + setColor(color) + val rtl = layoutDirection == View.LAYOUT_DIRECTION_RTL + cornerRadii = if (rtl) { + floatArrayOf(radius, radius, 0f, 0f, 0f, 0f, radius, radius) + } else { + floatArrayOf(0f, 0f, radius, radius, radius, radius, 0f, 0f) + } + } + + private fun AppCompatTextView.style(sizeSp: Float, emphasized: Boolean, colorRes: Int) { + includeFontPadding = false + typeface = PersonalizationTheme.typeface(context, emphasized) + setTextSize(TypedValue.COMPLEX_UNIT_SP, sizeSp) + setTextColor(PersonalizationTheme.color(context, colorRes)) + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private fun spPx(sp: Float): Int = + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics).toInt() + + private companion object { + /** #F2F2F2 с прозрачностью 95% — как в макете, без переменной. */ + const val BOX_COLOR = 0xF2F2F2F2.toInt() + const val RADIUS_DP = 12 + const val OLD_PRICE_ALPHA = 0.5f + const val COPY_DP = 24 + const val PROMO_CODE_HEIGHT_DP = 29 + const val MAX_PROMO_SHARE = 0.65f + const val PRESS_SCALE = 1.03f + const val PRESS_MS = 120L + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt new file mode 100644 index 00000000..06379633 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt @@ -0,0 +1,168 @@ +package com.personalization.ui.components + +import android.content.Context +import android.content.res.Configuration +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Path +import android.graphics.Shader +import android.graphics.Typeface +import android.text.TextPaint +import android.text.style.MetricAffectingSpan +import android.graphics.drawable.GradientDrawable +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.text.style.AbsoluteSizeSpan +import android.text.style.ForegroundColorSpan +import android.text.style.StrikethroughSpan +import android.util.AttributeSet +import androidx.appcompat.view.ContextThemeWrapper +import androidx.appcompat.widget.AppCompatImageView +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Общие куски сторис: разбор цены на сумму и валюту, скелетон, круглая картинка, + * принудительно тёмный контекст для медиа-слайдов. + */ +internal object StorySupport { + + /** + * Скелетон в макете — градиент чёрного 5% → 30% → 5%. Цвет берётся из Text/Primary, + * чтобы в тёмной теме полоса была белой: чёрная на тёмном фоне не видна. + */ + fun skeletonColors(context: Context): IntArray { + val base = PersonalizationTheme.color(context, R.color.personalization_text_primary) + fun alpha(value: Int) = Color.argb(value, Color.red(base), Color.green(base), Color.blue(base)) + return intArrayOf(alpha(13), alpha(77), alpha(13)) + } + + fun skeletonShader(context: Context, width: Float, height: Float): Shader = + LinearGradient(0f, 0f, width, height, skeletonColors(context), null, Shader.TileMode.CLAMP) + + fun skeletonDrawable(context: Context, shape: Int, radius: Float = 0f): GradientDrawable = + GradientDrawable(GradientDrawable.Orientation.TL_BR, skeletonColors(context)).apply { + this.shape = shape + if (shape == GradientDrawable.RECTANGLE) cornerRadius = radius + } + + /** + * Контекст с тёмными токенами для поддерева: медиа-слайды сторис в макете + * всегда в режиме Dark — белые прогресс, крестик и текст, тёмная шторка товаров. + * + * Тема хоста сохраняется (брендовые цвета остаются), а ресурсы берутся из + * `values-night`: [PersonalizationTheme] резолвит атрибут в id ресурса и читает + * значение уже через ресурсы этого контекста. + */ + fun darkContext(base: Context): Context { + val configuration = Configuration(base.resources.configuration).apply { + uiMode = (uiMode and Configuration.UI_MODE_NIGHT_MASK.inv()) or + Configuration.UI_MODE_NIGHT_YES + } + return ContextThemeWrapper(base, base.theme).apply { + applyOverrideConfiguration(configuration) + } + } +} + +/** + * Цена, как её отдаёт сервер (`"1 190 900 ₽"`), разбитая на сумму и валюту: + * в макете валюта набрана мельче и обычным начертанием. + */ +@InternalPersonalizationUiApi +data class PersonalizationStoryAmount(val amount: String, val currency: String?) { + + companion object { + /** + * Валюта — последний токен через пробел, если в нём нет цифр + * (`"19 990 ₽"` → `19 990` + `₽`). Иначе строка остаётся целиком. + */ + fun parse(formatted: CharSequence): PersonalizationStoryAmount { + val text = formatted.toString().trim() + val space = text.lastIndexOf(' ') + if (space <= 0) return PersonalizationStoryAmount(text, null) + val tail = text.substring(space + 1) + if (tail.isEmpty() || tail.any { it.isDigit() }) return PersonalizationStoryAmount(text, null) + return PersonalizationStoryAmount(text.substring(0, space).trimEnd(), tail) + } + } + + /** + * Сумма крупным кеглем, валюта — [currencySizePx] после пробела. Пробел тоже + * мелкий: в макете между ними 4. + */ + fun toSpannable( + currencySizePx: Int, + currencyColor: Int? = null, + strikethrough: Boolean = false + ): CharSequence { + val builder = SpannableStringBuilder(amount) + if (strikethrough) { + builder.setSpan(StrikethroughSpan(), 0, amount.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + if (currency != null) { + val start = builder.length + builder.append(' ').append(currency) + builder.setSpan( + AbsoluteSizeSpan(currencySizePx), + start, + builder.length, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) + if (currencyColor != null) { + builder.setSpan( + ForegroundColorSpan(currencyColor), + start, + builder.length, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } + } + return builder + } +} + +/** + * Картинка, обрезанная кругом. `clipToOutline` есть только с API 21, а SDK держит + * minSdk 19 — поэтому клип по пути, он работает везде. + */ +internal class StoryCircleImageView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null +) : AppCompatImageView(context, attrs) { + + private val clip = Path() + + init { + scaleType = ScaleType.CENTER_CROP + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + clip.reset() + clip.addCircle(w / 2f, h / 2f, minOf(w, h) / 2f, Path.Direction.CW) + } + + override fun onDraw(canvas: Canvas) { + val save = canvas.save() + canvas.clipPath(clip) + super.onDraw(canvas) + canvas.restoreToCount(save) + } +} + +/** + * Начертание для части строки. `TypefaceSpan(Typeface)` есть только с API 28, + * а число и единица таймера набраны разными начертаниями в одной строке. + */ +internal class StoryTypefaceSpan(private val typeface: Typeface) : MetricAffectingSpan() { + override fun updateDrawState(paint: TextPaint) { + paint.typeface = typeface + } + + override fun updateMeasureState(paint: TextPaint) { + paint.typeface = typeface + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt new file mode 100644 index 00000000..949c28cb --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt @@ -0,0 +1,172 @@ +package com.personalization.ui.components + +import android.content.Context +import android.graphics.Typeface +import android.graphics.drawable.GradientDrawable +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import androidx.annotation.ColorInt +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.widget.TextViewCompat +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Текстовый блок слайда. + * + * Источник: Figma, Text block (370:16189) и задача «Текстовый блок» на странице Stories: + * блок с фоном ([blockColor] не `null`) — скругление 12 и отступы по горизонтали 16, + * по вертикали 12 у крупного текста и 8 у остальных; блок без фона — без отступов. + * Размеры из макета — [Size]: 48/48, 30/36, 20/24, Regular. Текст по умолчанию — + * Text/Light Primary на фоне и Text/Primary без него. + * + * Кегль, цвет, выравнивание и начертание сторис задаёт админка — всё это свойства, + * пресеты [Size] только стартовые значения. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryTextBlock @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + enum class Size(val textSp: Float, val lineHeightSp: Float) { + LARGE(48f, 48f), + MEDIUM(30f, 36f), + SMALL(20f, 24f) + } + + enum class Align { START, CENTER, END } + + /** Пресет кегля и интерлиньяжа. */ + var size: Size = Size.SMALL + set(value) { + field = value + textSizeSp = value.textSp + lineHeightSp = value.lineHeightSp + } + + var textSizeSp: Float = Size.SMALL.textSp + set(value) { + field = value + applyStyle() + } + + /** Интерлиньяж; `null` — по шрифту. */ + var lineHeightSp: Float? = Size.SMALL.lineHeightSp + set(value) { + field = value + applyStyle() + } + + /** Цвет подложки; `null` — блок без фона. */ + @ColorInt + var blockColor: Int? = null + set(value) { + field = value + applyStyle() + } + + /** Цвет текста; `null` — токен по виду блока. */ + @ColorInt + var textColorOverride: Int? = null + set(value) { + field = value + applyStyle() + } + + var align: Align = Align.START + set(value) { + field = value + applyStyle() + } + + var bold: Boolean = false + set(value) { + field = value + applyStyle() + } + + var italic: Boolean = false + set(value) { + field = value + applyStyle() + } + + /** Семейство от админки (`serif`, `monospaced`); `null` — шрифт кита. */ + var fontFamily: String? = null + set(value) { + field = value + applyStyle() + } + + init { + includeFontPadding = false + applyStyle() + } + + /** Отступы блока с фоном: по вертикали 12 у текста крупнее Medium, 8 у остального. */ + internal fun solidPadding(): Pair { + val vertical = if (textSizeSp > MEDIUM_TEXT_SP) 12 else 8 + return dp(16) to dp(vertical) + } + + private fun applyStyle() { + setTextSize(TypedValue.COMPLEX_UNIT_SP, textSizeSp) + lineHeightSp?.let { TextViewCompat.setLineHeight(this, spPx(it)) } + val base = when (fontFamily) { + "serif" -> Typeface.SERIF + "monospaced", "monospace" -> Typeface.MONOSPACE + else -> PersonalizationTheme.typeface(context, emphasized = false) + } + val style = when { + bold && italic -> Typeface.BOLD_ITALIC + bold -> Typeface.BOLD + italic -> Typeface.ITALIC + else -> Typeface.NORMAL + } + setTypeface(base, style) + gravity = Gravity.CENTER_VERTICAL or when (align) { + Align.START -> Gravity.START + Align.CENTER -> Gravity.CENTER_HORIZONTAL + Align.END -> Gravity.END + } + textAlignment = when (align) { + Align.START -> TEXT_ALIGNMENT_VIEW_START + Align.CENTER -> TEXT_ALIGNMENT_CENTER + Align.END -> TEXT_ALIGNMENT_VIEW_END + } + + val solid = blockColor + if (solid != null) { + val (horizontal, vertical) = solidPadding() + setPadding(horizontal, vertical, horizontal, vertical) + background = GradientDrawable().apply { + cornerRadius = dp(12).toFloat() + setColor(solid) + } + } else { + setPadding(0, 0, 0, 0) + background = null + } + setTextColor( + textColorOverride ?: PersonalizationTheme.color( + context, + if (solid != null) R.color.personalization_text_light_primary + else R.color.personalization_text_primary + ) + ) + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private fun spPx(sp: Float): Int = + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics).toInt() + + private companion object { + /** Кегль Medium (30): всё крупнее получает отступы Large. */ + const val MEDIUM_TEXT_SP = 30f + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt new file mode 100644 index 00000000..1a78357a --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt @@ -0,0 +1,187 @@ +package com.personalization.ui.components + +import android.content.Context +import android.graphics.drawable.GradientDrawable +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.text.style.AbsoluteSizeSpan +import android.text.style.ForegroundColorSpan +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatTextView +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Обратный отсчёт акции в сторис. + * + * Источник: Figma, Card/Story/Timer (345:14226), два вида: + * - [Style.MERGED] — одна плашка со скруглением 12, отступами 8/12 и шагом 12; + * - [Style.SEPARATE] — четыре плашки со скруглением 8 и шагом 8, делят ширину поровну. + * Заливка Neutral/Neutral 100. Число — SemiBold 36 Text/Primary, единица — Regular 20 + * Text/Secondary через 2, по базовой линии. + * + * В ответе сторис таймера нет — компонент для хоста: он задаёт [endTimeMillis]. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryTimer @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + enum class Style { MERGED, SEPARATE } + + var style: Style = Style.MERGED + set(value) { + field = value + build() + } + + /** Момент окончания, `System.currentTimeMillis()`-время. */ + var endTimeMillis: Long = 0L + set(value) { + field = value + tick() + } + + /** Подписи дней, часов, минут и секунд. */ + var labels: List = listOf("d", "h", "m", "s") + set(value) { + require(value.size == UNITS) { "Timer needs $UNITS labels: days, hours, minutes, seconds" } + field = value + render() + } + + /** Отсчёт дошёл до нуля. */ + var onFinished: (() -> Unit)? = null + + /** Источник времени — подменяется в тестах. */ + internal var clock: () -> Long = System::currentTimeMillis + + private val units = List(UNITS) { AppCompatTextView(context) } + private var parts = PersonalizationStoryTimerParts(0, 0, 0, 0) + private var finished = false + private val ticker = Runnable { tick() } + + init { + orientation = HORIZONTAL + gravity = Gravity.CENTER + units.forEach { unit -> + unit.includeFontPadding = false + unit.gravity = Gravity.CENTER + unit.maxLines = 1 + } + build() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + tick() + } + + override fun onDetachedFromWindow() { + removeCallbacks(ticker) + super.onDetachedFromWindow() + } + + private fun build() { + removeAllViews() + val merged = style == Style.MERGED + background = if (merged) box(dp(12).toFloat()) else null + if (merged) setPadding(dp(12), dp(8), dp(12), dp(8)) else setPadding(0, 0, 0, 0) + units.forEachIndexed { index, unit -> + unit.background = if (merged) null else box(dp(8).toFloat()) + if (merged) unit.setPadding(0, 0, 0, 0) else unit.setPadding(dp(12), dp(8), dp(12), dp(8)) + val params = if (merged) { + LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT) + } else { + LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f) + } + if (index > 0) params.marginStart = dp(if (merged) 12 else 8) + addView(unit, params) + } + render() + } + + private fun tick() { + removeCallbacks(ticker) + val remaining = endTimeMillis - clock() + parts = PersonalizationStoryTimerParts.of(remaining) + render() + if (remaining > 0) { + finished = false + // До следующей целой секунды, чтобы цифры не отставали. + val delay = (remaining % SECOND).takeIf { it > 0 } ?: SECOND + if (isAttachedToWindow) postDelayed(ticker, delay) + } else if (!finished && endTimeMillis > 0) { + finished = true + onFinished?.invoke() + } + } + + private fun render() { + val values = listOf(parts.days, parts.hours, parts.minutes, parts.seconds) + val numberColor = PersonalizationTheme.color(context, R.color.personalization_text_primary) + val labelColor = PersonalizationTheme.color(context, R.color.personalization_text_secondary) + val numberSize = spPx(36f) + val labelSize = spPx(20f) + units.forEachIndexed { index, unit -> + // Дни как есть, часы, минуты и секунды — всегда две цифры: ширина не прыгает. + val number = if (index == 0) values[index].toString() else values[index].toString().padStart(2, '0') + val text = SpannableStringBuilder(number) + text.setSpan(AbsoluteSizeSpan(numberSize), 0, number.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + text.setSpan(ForegroundColorSpan(numberColor), 0, number.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + PersonalizationTheme.typeface(context, emphasized = true)?.let { + text.setSpan(StoryTypefaceSpan(it), 0, number.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + val start = text.length + // Зазор 2 между числом и единицей — узкий пробел мелким кеглем. + text.append(' ').append(labels[index]) + text.setSpan(AbsoluteSizeSpan(labelSize), start, text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + text.setSpan(ForegroundColorSpan(labelColor), start, text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + unit.typeface = PersonalizationTheme.typeface(context, emphasized = false) + unit.text = text + } + } + + private fun box(radius: Float) = GradientDrawable().apply { + cornerRadius = radius + setColor(PersonalizationTheme.color(context, R.color.personalization_neutral_100)) + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private fun spPx(sp: Float): Int = + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics).toInt() + + private companion object { + const val UNITS = 4 + const val SECOND = 1000L + } +} + +/** Остаток времени по единицам таймера. Отрицательный остаток — нули. */ +@InternalPersonalizationUiApi +data class PersonalizationStoryTimerParts( + val days: Long, + val hours: Long, + val minutes: Long, + val seconds: Long +) { + companion object { + fun of(remainingMillis: Long): PersonalizationStoryTimerParts { + // Округление вверх: пока идёт последняя секунда, на экране 1, а не 0. + val total = if (remainingMillis <= 0) 0L else (remainingMillis + 999) / 1000 + return PersonalizationStoryTimerParts( + days = total / 86_400, + hours = total % 86_400 / 3_600, + minutes = total % 3_600 / 60, + seconds = total % 60 + ) + } + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt new file mode 100644 index 00000000..92102da0 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt @@ -0,0 +1,156 @@ +package com.personalization.ui.components + +import android.content.Context +import android.util.AttributeSet +import android.view.Gravity +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.core.widget.ImageViewCompat +import com.personalization.R +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme + +/** + * Низ слайда с товарами из кадра: кнопка «Используемые товары» и шторка с каруселью. + * + * Источник: Figma, Card/Used Products (238:7108) и Button/Used Products (345:14578). + * Свёрнуто — строка высотой 64 с отступами 16: по центру кнопка SM Secondary со + * скруглением Rounded и стрелкой вверх ([showText]). Развёрнуто — подложка + * Background/Card: карусель карточек (отступы 16/0/16/16, шаг 16) и та же строка + * с кнопкой [hideText] и стрелкой вниз. + * + * В начале строки — кнопка звука видео-слайда ([showSoundButton], [muted]): + * в макете она живёт здесь же. + */ +@InternalPersonalizationUiApi +class PersonalizationStoryUsedProducts @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + val carousel = PersonalizationProductsCarousel(context) + + private val row = FrameLayout(context) + private val toggle = PersonalizationButton(context) + private val sound = AppCompatImageView(context) + + var products: List + get() = carousel.products + set(value) { + carousel.products = value + applyState() + } + + var imageLoader: ((ImageView, PersonalizationProduct) -> Unit)? + get() = carousel.imageLoader + set(value) { + carousel.imageLoader = value + } + + var onProductClick: ((PersonalizationProduct) -> Unit)? + get() = carousel.onProductClick + set(value) { + carousel.onProductClick = value + } + + var showText: CharSequence = "Used products" + set(value) { + field = value + applyState() + } + + var hideText: CharSequence = "Hide products" + set(value) { + field = value + applyState() + } + + var expanded: Boolean = false + set(value) { + if (field == value) return + field = value + applyState() + onExpandedChange?.invoke(value) + } + + var onExpandedChange: ((Boolean) -> Unit)? = null + + var showSoundButton: Boolean = false + set(value) { + field = value + applyState() + } + + var muted: Boolean = false + set(value) { + field = value + applyState() + } + + var onSoundClick: (() -> Unit)? = null + + var soundOnDescription: CharSequence = "Mute" + var soundOffDescription: CharSequence = "Unmute" + + init { + orientation = VERTICAL + + carousel.setPadding(dp(16), dp(16), 0, dp(16)) + carousel.clipToPadding = false + addView(carousel, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + + toggle.size = PersonalizationButton.Size.SM + toggle.buttonView = PersonalizationButton.ButtonView.SECONDARY + toggle.rounded = true + toggle.setOnClickListener { expanded = !expanded } + row.addView( + toggle, + FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.CENTER) + ) + + ImageViewCompat.setImageTintList( + sound, + PersonalizationTheme.colorStateList(context, R.color.personalization_text_secondary) + ) + sound.setOnClickListener { onSoundClick?.invoke() } + row.addView( + sound, + FrameLayout.LayoutParams(dp(SOUND_DP), dp(SOUND_DP), Gravity.START or Gravity.CENTER_VERTICAL) + ) + row.setPadding(dp(16), dp(16), dp(16), dp(16)) + addView(row, LayoutParams(LayoutParams.MATCH_PARENT, dp(ROW_DP))) + + applyState() + } + + private fun applyState() { + val hasProducts = carousel.products.isNotEmpty() + val open = expanded && hasProducts + carousel.visibility = if (open) View.VISIBLE else View.GONE + setBackgroundColor( + if (open) PersonalizationTheme.color(context, R.color.personalization_background_card) else 0 + ) + + toggle.visibility = if (hasProducts) View.VISIBLE else View.GONE + toggle.text = if (open) hideText else showText + toggle.iconEnd = if (open) R.drawable.personalization_ic_angle_down else R.drawable.personalization_ic_angle_up + + sound.visibility = if (showSoundButton) View.VISIBLE else View.GONE + sound.setImageResource(if (muted) R.drawable.personalization_ic_speaker_off else R.drawable.personalization_ic_speaker) + // В макете выключенный звук — иконка на 65%, включённый — непрозрачная. + sound.alpha = if (muted) MUTED_ALPHA else 1f + sound.contentDescription = if (muted) soundOffDescription else soundOnDescription + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() + + private companion object { + const val ROW_DP = 64 + const val SOUND_DP = 32 + const val MUTED_ALPHA = 0.65f + } +} diff --git a/personalization-sdk/src/main/res/drawable/personalization_ic_speaker.xml b/personalization-sdk/src/main/res/drawable/personalization_ic_speaker.xml new file mode 100644 index 00000000..afc2c637 --- /dev/null +++ b/personalization-sdk/src/main/res/drawable/personalization_ic_speaker.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/personalization-sdk/src/main/res/drawable/personalization_ic_speaker_off.xml b/personalization-sdk/src/main/res/drawable/personalization_ic_speaker_off.xml new file mode 100644 index 00000000..160da80d --- /dev/null +++ b/personalization-sdk/src/main/res/drawable/personalization_ic_speaker_off.xml @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/personalization-sdk/src/main/res/values-night/personalization_colors.xml b/personalization-sdk/src/main/res/values-night/personalization_colors.xml index 637ac9bb..be4a3819 100644 --- a/personalization-sdk/src/main/res/values-night/personalization_colors.xml +++ b/personalization-sdk/src/main/res/values-night/personalization_colors.xml @@ -14,10 +14,13 @@ #0DFFFFFF + #1AFFFFFF #FFE51919 #FFF37A17 + #FF0087E8 + #FF262626 #FF0D0D0D diff --git a/personalization-sdk/src/main/res/values/personalization_attrs.xml b/personalization-sdk/src/main/res/values/personalization_attrs.xml index 47034a5b..dae6212b 100644 --- a/personalization-sdk/src/main/res/values/personalization_attrs.xml +++ b/personalization-sdk/src/main/res/values/personalization_attrs.xml @@ -16,6 +16,9 @@ + + + diff --git a/personalization-sdk/src/main/res/values/personalization_colors.xml b/personalization-sdk/src/main/res/values/personalization_colors.xml index 1091c741..bcaba043 100644 --- a/personalization-sdk/src/main/res/values/personalization_colors.xml +++ b/personalization-sdk/src/main/res/values/personalization_colors.xml @@ -14,10 +14,15 @@ #0D000000 + + #1A000000 #FFF37A17 #FFE51919 + #FF0087E8 + + #FFCCCCCC #FFF2F2F2 diff --git a/personalization-sdk/src/main/res/values/personalization_theme.xml b/personalization-sdk/src/main/res/values/personalization_theme.xml index 4939fc30..f6e6d871 100644 --- a/personalization-sdk/src/main/res/values/personalization_theme.xml +++ b/personalization-sdk/src/main/res/values/personalization_theme.xml @@ -14,6 +14,9 @@ @color/personalization_neutral_50 @color/personalization_semantic_warning @color/personalization_semantic_danger + @color/personalization_neutral_100 + @color/personalization_semantic_info + @color/personalization_semantic_neutral_subtle @color/personalization_background_generic @color/personalization_background_card @color/personalization_background_input diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt new file mode 100644 index 00000000..993c1ac3 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt @@ -0,0 +1,145 @@ +package com.personalization.ui.components + +import android.app.Activity +import android.content.ClipboardManager +import android.content.Context +import android.graphics.Color +import android.view.View +import android.view.ViewGroup +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +/** Stories V2 building blocks: price text, countdown, text block frame, promo copy. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class PersonalizationStoryComponentsTest { + + private val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + + @Test + fun `the currency is split off a formatted price`() { + assertEquals(PersonalizationStoryAmount("1 190 900", "₽"), PersonalizationStoryAmount.parse("1 190 900 ₽")) + assertEquals(PersonalizationStoryAmount("19 990", "₸"), PersonalizationStoryAmount.parse(" 19 990 ₸ ")) + // A trailing token with digits is not a currency. + assertEquals(PersonalizationStoryAmount("1 190 900", null), PersonalizationStoryAmount.parse("1 190 900")) + assertEquals(PersonalizationStoryAmount("$99", null), PersonalizationStoryAmount.parse("$99")) + } + + @Test + fun `the countdown is split into days, hours, minutes and seconds`() { + val remaining = ((2 * 24 + 18) * 3600L + 33 * 60 + 24) * 1000 + assertEquals(PersonalizationStoryTimerParts(2, 18, 33, 24), PersonalizationStoryTimerParts.of(remaining)) + // The last second still shows 1, not 0. + assertEquals(PersonalizationStoryTimerParts(0, 0, 0, 1), PersonalizationStoryTimerParts.of(400)) + assertEquals(PersonalizationStoryTimerParts(0, 0, 0, 0), PersonalizationStoryTimerParts.of(-5000)) + } + + @Test + fun `the timer shows the remaining time and reports the end`() { + var now = 1_000_000L + var finished = 0 + val timer = PersonalizationStoryTimer(activity).apply { + clock = { now } + onFinished = { finished++ } + endTimeMillis = now + 65_000 + } + assertEquals("0 d", unitText(timer, 0)) + assertEquals("00 h", unitText(timer, 1)) + assertEquals("01 m", unitText(timer, 2)) + assertEquals("05 s", unitText(timer, 3)) + + now += 70_000 + timer.endTimeMillis = timer.endTimeMillis + assertEquals("00 s", unitText(timer, 3)) + assertEquals(1, finished) + } + + @Test + fun `a solid text block gets the kit frame, a transparent one none`() { + val block = PersonalizationStoryTextBlock(activity).apply { + size = PersonalizationStoryTextBlock.Size.LARGE + blockColor = Color.BLUE + } + assertEquals(dp(16), block.paddingLeft) + assertEquals(dp(12), block.paddingTop) + + // Medium (30) keeps the small padding: only text bigger than Medium gets 12. + block.size = PersonalizationStoryTextBlock.Size.MEDIUM + assertEquals(dp(8), block.paddingTop) + block.textSizeSp = 36f + assertEquals(dp(12), block.paddingTop) + + block.blockColor = null + assertEquals(0, block.paddingLeft) + assertNull(block.background) + } + + @Test + fun `the price shows only the block of its type`() { + val price = PersonalizationStoryPrice(activity).apply { + price = "1 190 900 ₽" + oldPrice = "245 000 ₽" + discount = "10%" + promoCode = "PROMO" + } + val (discount, promo) = rightBlocks(price) + + price.type = PersonalizationStoryPrice.Type.PRICE + assertEquals(View.GONE, discount.visibility) + assertEquals(View.GONE, promo.visibility) + + price.type = PersonalizationStoryPrice.Type.DISCOUNT + assertEquals(View.VISIBLE, discount.visibility) + assertEquals(View.GONE, promo.visibility) + + price.type = PersonalizationStoryPrice.Type.PROMO_CODE + assertEquals(View.GONE, discount.visibility) + assertEquals(View.VISIBLE, promo.visibility) + } + + @Test + fun `tapping the promo code copies it and reports`() { + val content: ViewGroup = activity.findViewById(android.R.id.content) + var copied: String? = null + val price = PersonalizationStoryPrice(activity).apply { + type = PersonalizationStoryPrice.Type.PROMO_CODE + this.price = "990 ₽" + promoCode = "YAGODA-MALINA" + onPromoCopied = { copied = it } + } + content.addView(price) + + rightBlocks(price).second.performClick() + + assertEquals("YAGODA-MALINA", copied) + val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + assertEquals("YAGODA-MALINA", clipboard.primaryClip?.getItemAt(0)?.text?.toString()) + assertTrue((0 until content.childCount).any { content.getChildAt(it) is PersonalizationToast }) + } + + @Test + fun `a pinned cover shows the star, others do not`() { + val cover = PersonalizationStoryCover(activity) + val star = cover.getChildAt(1) + + cover.state = PersonalizationStoryCover.State.PINNED + assertEquals(View.VISIBLE, star.visibility) + + cover.state = PersonalizationStoryCover.State.VIEWED + assertEquals(View.GONE, star.visibility) + } + + private fun rightBlocks(price: PersonalizationStoryPrice): Pair = + price.getChildAt(1) to price.getChildAt(2) + + private fun unitText(timer: PersonalizationStoryTimer, index: Int): String = + (timer.getChildAt(index) as android.widget.TextView).text.toString().replace(' ', ' ') + + private fun dp(value: Int): Int = (value * activity.resources.displayMetrics.density).toInt() +} From 4eaceb2b9466c1622af433b4acb49661d1cb1bef Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 30 Sep 2026 22:22:08 +0400 Subject: [PATCH 02/31] feat(ui): stories v2 viewer and widget PersonalizationStories loads a stories block by code through the SDK, shows the bar and opens a fullscreen viewer built from the kit: product slides, media slides with dark tokens, text blocks at their offset, buttons, used products and video with a mute toggle. Slides are tracked like the legacy stories; the legacy StoriesView is left as it is. --- .../ui/widgets/PersonalizationStories.kt | 157 ++++ .../widgets/PersonalizationStoriesViewer.kt | 735 ++++++++++++++++++ .../ui/widgets/StoriesSupport.kt | 123 +++ .../main/res/values/personalization_attrs.xml | 5 + .../ui/widgets/StoriesMappingTest.kt | 129 +++ 5 files changed, 1149 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt new file mode 100644 index 00000000..97f0bc53 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -0,0 +1,157 @@ +package com.personalization.ui.widgets + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import com.personalization.Cancellable +import com.personalization.Product +import com.personalization.R +import com.personalization.SDK +import com.personalization.Rees46 +import com.personalization.stories.models.Story +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.components.PersonalizationStoriesBar + +/** + * Сторис (V2) с данными SDK: лента обложек и полноэкранный просмотр на компонентах кита. + * + * Паттерн Stories из Figma (страница 1:32): «сторис-бар + фулскрин-вьюер, + * источник — сторис-блок по code». Блок грузится тем же запросом, что у старого + * `StoriesView` (`stories/{code}`), — старый виджет остаётся как есть. + * + * Инстанс SDK: [shopId] (атрибут `app:shop_id`) выбирает магазин при нескольких + * зарегистрированных; без него берётся единственный. Резолв — при показе через + * [Rees46.awaitInstance]; явный инстанс можно передать в [attach]. + * + * Пока блок грузится — скелетон; пустой блок прячет виджет целиком. + */ +@InternalPersonalizationUiApi +class PersonalizationStories @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + /** Лента — доступна для тонкой настройки (размер обложек, отступы). */ + val bar = PersonalizationStoriesBar(context) + + /** Код сторис-блока. Менять до показа или вызвать [reload]. */ + var code: String? = null + + /** Магазин; `null` — единственный зарегистрированный. Менять до показа. */ + var shopId: String? = null + + /** Загрузчик картинок; `null` — Glide из SDK. */ + var imageLoader: ((ImageView, String) -> Unit)? = null + + /** Переход по ссылке; `true` — хост обработал сам. См. [PersonalizationStoriesViewer.onLinkClick]. */ + var onLinkClick: ((String) -> Boolean)? = null + + var onProductClick: ((Product) -> Unit)? = null + var onError: ((code: Int, message: String?) -> Unit)? = null + + var promoCaption: CharSequence = "Promo code" + var promoCopiedText: CharSequence = "Copied" + + /** Загруженные сторис — в порядке сервера. */ + var stories: List = emptyList() + private set + + private var sdk: SDK? = null + private var instanceHandle: Cancellable? = null + private var viewer: PersonalizationStoriesViewer? = null + private var requestSeq = 0 + + init { + attrs?.let { + val array = context.obtainStyledAttributes(it, R.styleable.PersonalizationStories) + code = array.getString(R.styleable.PersonalizationStories_code) + shopId = array.getString(R.styleable.PersonalizationStories_shop_id) + array.recycle() + } + addView(bar, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + bar.onItemClick = { index, _ -> open(index) } + bar.showSkeleton() + } + + /** Явный инстанс SDK; блок загружается сразу. */ + fun attach(sdk: SDK) { + instanceHandle?.cancel() + instanceHandle = null + this.sdk = sdk + reload() + } + + /** Перезагрузить блок [code]. */ + fun reload() { + val sdk = sdk ?: return + val blockCode = code?.takeIf { it.isNotEmpty() } ?: run { + SDK.error("PersonalizationStories: code is not set") + return + } + val seq = ++requestSeq + if (stories.isEmpty()) bar.showSkeleton() + sdk.storiesManager.loadStories(blockCode) { loaded -> + MainThread.run { + if (seq != requestSeq) return@run + stories = loaded + render() + } + } + } + + /** Открыть просмотр с сторис [index]. */ + fun open(index: Int) { + if (index !in stories.indices) return + viewer?.dismiss() + viewer = PersonalizationStoriesViewer(context, stories, index).also { viewer -> + viewer.code = code + viewer.sdk = sdk + viewer.imageLoader = imageLoader + viewer.onLinkClick = onLinkClick + viewer.onProductClick = onProductClick + viewer.promoCaption = promoCaption + viewer.promoCopiedText = promoCopiedText + viewer.onStoryProgress = { render() } + viewer.setOnDismissListener { + if (this.viewer === viewer) this.viewer = null + render() + } + viewer.show() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (sdk != null) return + instanceHandle = try { + Rees46.awaitInstance(shopId) { resolved -> MainThread.run { attach(resolved) } } + } catch (throwable: Throwable) { + SDK.error( + "PersonalizationStories: cannot resolve an SDK for shopId=$shopId — " + + "set app:shop_id to pick a shop when several are registered.", + throwable + ) + null + } + } + + override fun onDetachedFromWindow() { + instanceHandle?.cancel() + instanceHandle = null + viewer?.dismiss() + viewer = null + super.onDetachedFromWindow() + } + + private fun render() { + visibility = if (stories.isEmpty()) View.GONE else View.VISIBLE + bar.imageLoader = { view, url -> + val loader = imageLoader + if (loader != null) loader(view, url) else SearchImages.load(view, url) + } + bar.items = stories.map(StoriesMapping::item) + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt new file mode 100644 index 00000000..710e6a2f --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -0,0 +1,735 @@ +package com.personalization.ui.widgets + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.annotation.SuppressLint +import android.app.Dialog +import android.content.ActivityNotFoundException +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.GradientDrawable +import android.net.Uri +import android.os.Bundle +import android.view.GestureDetector +import android.view.Gravity +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.ViewGroup +import android.view.animation.LinearInterpolator +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.media3.common.MediaItem +import androidx.media3.common.PlaybackException +import androidx.media3.common.Player +import androidx.media3.common.util.UnstableApi +import androidx.media3.exoplayer.ExoPlayer +import androidx.media3.ui.AspectRatioFrameLayout +import androidx.media3.ui.PlayerView +import androidx.recyclerview.widget.RecyclerView +import androidx.viewpager2.widget.ViewPager2 +import com.bumptech.glide.Glide +import com.personalization.Product +import com.personalization.R +import com.personalization.SDK +import com.personalization.stories.models.Slide +import com.personalization.stories.models.Story +import com.personalization.stories.models.elements.ButtonElement +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.PersonalizationTheme +import com.personalization.ui.components.PersonalizationButton +import com.personalization.ui.components.PersonalizationStoryCard +import com.personalization.ui.components.PersonalizationStoryNavigation +import com.personalization.ui.components.PersonalizationStoryTextBlock +import com.personalization.ui.components.PersonalizationStoryUsedProducts +import com.personalization.ui.components.StorySupport +import kotlin.math.abs + +/** + * Полноэкранный просмотр сторис (V2) — на компонентах кита. + * + * Паттерн Stories из Figma (страница 1:32): слайд 402×874 с отступом 16 и шагом 16, + * сверху [PersonalizationStoryNavigation], дальше по содержимому: + * - слайд с товаром — [PersonalizationStoryCard] (бренд, название, фото, цена, кнопка); + * - медиа-слайд — фон-картинка или видео, текстовые блоки на своей высоте + * (`y_offset` в процентах), кнопки внизу и [PersonalizationStoryUsedProducts]. + * Медиа-слайды рисуются тёмными токенами, как в макете; слайд без фона — в теме хоста. + * + * Поведение: слайд идёт [Slide.duration], тап слева — назад, справа — вперёд, + * удержание — пауза, свайп вниз — закрыть, свайп вбок — соседняя сторис. + * Показ слайда трекается `view`, нажатие на кнопку, товар или промокод — `click`. + * + * Модели — те же, что у старого `StoriesView`: V2 его не трогает. + */ +@InternalPersonalizationUiApi +class PersonalizationStoriesViewer( + context: Context, + private val stories: List, + private val startStory: Int = 0 +) : Dialog(context, android.R.style.Theme_Translucent_NoTitleBar) { + + /** Контекст хоста: вьюхи строятся в его теме, чтобы работал брендинг кита. */ + private val hostContext = context + + /** Код блока — для трекинга. */ + var code: String? = null + + /** Инстанс SDK — трекинг `view` / `click`. Без него сторис просто показываются. */ + var sdk: SDK? = null + + /** Загрузчик картинок; `null` — Glide из SDK. */ + var imageLoader: ((ImageView, String) -> Unit)? = null + + /** + * Переход по ссылке кнопки или товара. Вернуть `true`, если хост обработал сам; + * иначе ссылка открывается системой. После перехода просмотр закрывается. + */ + var onLinkClick: ((String) -> Boolean)? = null + + /** Нажатие на товар (карточка слайда или карусель). */ + var onProductClick: ((Product) -> Unit)? = null + + /** Сторис досмотрена или просмотр закрыт на её середине — лента обновляет кольцо. */ + var onStoryProgress: ((story: Story) -> Unit)? = null + + var promoCaption: CharSequence = "Promo code" + + /** Кнопка товарного слайда, если своей кнопки у слайда нет, — открывает товар. */ + var productButtonText: CharSequence = "More info" + var promoCopiedText: CharSequence = "Copied" + var usedProductsShowText: CharSequence = "Used products" + var usedProductsHideText: CharSequence = "Hide products" + + private lateinit var pager: ViewPager2 + private lateinit var root: StoryDismissLayout + private val pages = HashMap() + private var currentStory = -1 + /** Звук выключен, пока его не включат, — как у старых сторис. */ + private var muted = true + private var player: ExoPlayer? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window?.let { window -> + window.setBackgroundDrawable(ColorDrawable(Color.BLACK)) + window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + } + + root = StoryDismissLayout(hostContext).apply { + onDismissDrag = { dragging -> if (dragging) currentPage()?.pause() else currentPage()?.resume() } + onDismiss = { dismiss() } + } + pager = ViewPager2(hostContext).apply { + adapter = StoriesAdapter() + offscreenPageLimit = 1 + registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) = selectStory(position) + }) + } + root.addView(pager, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)) + ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets -> + val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) + view.setPadding(0, 0, 0, bars.bottom) + insets + } + setContentView(root) + pager.setCurrentItem(startStory.coerceIn(0, (stories.size - 1).coerceAtLeast(0)), false) + // Для нулевой страницы пейджер onPageSelected может не прислать. + selectStory(pager.currentItem) + } + + override fun onStart() { + super.onStart() + currentPage()?.resume() + } + + override fun onStop() { + currentPage()?.pause() + super.onStop() + } + + override fun dismiss() { + currentPage()?.leave() + pages.values.forEach { it.release() } + pages.clear() + player?.release() + player = null + super.dismiss() + } + + private fun currentPage(): StoryPage? = pages[currentStory] + + private fun selectStory(position: Int) { + if (position == currentStory) return + pages[currentStory]?.leave() + currentStory = position + pages[position]?.enter() + } + + private fun nextStory() { + if (currentStory + 1 < stories.size) pager.currentItem = currentStory + 1 else dismiss() + } + + private fun previousStory() { + if (currentStory > 0) pager.currentItem = currentStory - 1 else currentPage()?.restart() + } + + private fun obtainPlayer(): ExoPlayer = + player ?: ExoPlayer.Builder(hostContext).build().also { + it.repeatMode = Player.REPEAT_MODE_ONE + it.volume = if (muted) 0f else 1f + player = it + } + + private fun loadImage(view: ImageView, url: String) { + val loader = imageLoader + if (loader != null) loader(view, url) else Glide.with(view).load(url).into(view) + } + + private fun track(event: String, story: Story, slide: Slide) { + val blockCode = code ?: return + runCatching { sdk?.storiesManager?.trackStory(event, blockCode, story.id, slide.id) } + } + + private fun openLink(link: String) { + if (link.isEmpty()) return + val handled = onLinkClick?.invoke(link) ?: false + if (!handled) { + try { + hostContext.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } catch (_: ActivityNotFoundException) { + SDK.error("PersonalizationStoriesViewer: no app can open $link") + } + } + dismiss() + } + + private inner class StoriesAdapter : RecyclerView.Adapter() { + override fun getItemCount(): Int = stories.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + val page = StoryPage(hostContext) + page.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + return object : RecyclerView.ViewHolder(page) {} + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + val page = holder.itemView as StoryPage + pages.entries.removeAll { it.value === page } + pages[position] = page + page.bind(position) + if (position == currentStory) page.enter() + } + + override fun onViewRecycled(holder: RecyclerView.ViewHolder) { + val page = holder.itemView as StoryPage + page.release() + pages.entries.removeAll { it.value === page } + } + } + + /** + * Одна сторис: слайды по очереди, таймер слайда, видео. Слайд каждый раз + * собирается заново — в своём контексте (тёмном для медиа). + */ + @SuppressLint("ViewConstructor") + private inner class StoryPage(context: Context) : FrameLayout(context) { + + private var storyIndex = -1 + private val story: Story get() = stories[storyIndex] + private var slideIndex = 0 + private var slideView: StorySlideView? = null + private var animator: ValueAnimator? = null + private var entered = false + private var fingerHold = false + private var sheetOpen = false + private val held get() = fingerHold || sheetOpen + private var waitingForVideo = false + + /** Плеер у просмотра один: останавливать его может только страница, которая его заняла. */ + private var ownsVideo = false + + fun bind(index: Int) { + release() + storyIndex = index + slideIndex = StoriesMapping.startSlide(story) + showSlide(start = false) + } + + fun enter() { + // Страницу входят и из привязки адаптера, и из смены страницы пейджера — + // второй вход перезапустил бы слайд и оборвал бы подготовку видео. + if (storyIndex < 0 || entered) return + entered = true + showSlide(start = true) + } + + fun leave() { + if (!entered) return + entered = false + stopTimer() + detachVideo() + // Недосмотренная сторис откроется с того же слайда. + if (!story.isViewed) story.startPosition = slideIndex + onStoryProgress?.invoke(story) + } + + fun release() { + stopTimer() + detachVideo() + entered = false + } + + fun pause() { + animator?.pause() + if (ownsVideo) player?.pause() + } + + fun resume() { + if (!entered || held) return + if (ownsVideo) player?.play() + // Пока видео не готово, время слайда стоит — таймер запустит сам плеер. + if (waitingForVideo) return + animator?.resume() ?: startTimer() + } + + fun restart() { + slideIndex = 0 + showSlide(start = entered) + } + + fun next() { + if (slideIndex + 1 < story.slidesCount) { + slideIndex++ + showSlide(start = true) + } else { + story.isViewed = true + story.startPosition = 0 + onStoryProgress?.invoke(story) + nextStory() + } + } + + fun previous() { + if (slideIndex > 0) { + slideIndex-- + showSlide(start = true) + } else { + previousStory() + } + } + + private fun showSlide(start: Boolean) { + stopTimer() + detachVideo() + removeAllViews() + if (story.slidesCount == 0) return + val slide = story.getSlide(slideIndex) + val view = StorySlideView(this@StoryPage.context, story, slide, this) + slideView = view + addView(view, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + view.navigation.progress.count = story.slidesCount + view.navigation.progress.current = slideIndex + view.navigation.progress.progress = 0f + preloadNext() + if (start && entered) { + track("view", story, slide) + if (StoriesMapping.isVideo(slide)) attachVideo(view, slide) else startTimer() + } + } + + private fun preloadNext() { + val next = slideIndex + 1 + if (next >= story.slidesCount) return + val slide = story.getSlide(next) + val url = if (StoriesMapping.isVideo(slide)) slide.preview else slide.background + if (url.isNotEmpty() && imageLoader == null) Glide.with(hostContext).load(url).preload() + } + + private fun startTimer() { + stopTimer() + val slide = story.getSlide(slideIndex) + val navigation = slideView?.navigation ?: return + animator = ValueAnimator.ofFloat(0f, 1f).apply { + duration = slide.duration.coerceAtLeast(MIN_DURATION_MS) + interpolator = LinearInterpolator() + addUpdateListener { navigation.progress.progress = it.animatedValue as Float } + addListener(object : AnimatorListenerAdapter() { + private var cancelled = false + override fun onAnimationCancel(animation: Animator) { + cancelled = true + } + + override fun onAnimationEnd(animation: Animator) { + if (!cancelled) next() + } + }) + start() + } + } + + private fun stopTimer() { + animator?.cancel() + animator = null + } + + private fun attachVideo(view: StorySlideView, slide: Slide) { + val exo = obtainPlayer() + ownsVideo = true + waitingForVideo = true + exo.addListener(videoListener) + view.playerView?.player = exo + exo.setMediaItem(MediaItem.fromUri(slide.background)) + exo.playWhenReady = !held + exo.prepare() + } + + private val videoListener = object : Player.Listener { + override fun onPlaybackStateChanged(playbackState: Int) { + // Время слайда идёт, только когда видео реально играет. + if (playbackState == Player.STATE_READY && waitingForVideo) { + waitingForVideo = false + slideView?.hidePoster() + if (entered && !held) startTimer() + } + } + + override fun onPlayerError(error: PlaybackException) { + // Видео не играет — слайд остаётся картинкой-превью и идёт по своему времени. + if (!waitingForVideo) return + waitingForVideo = false + SDK.error("PersonalizationStoriesViewer: video failed, showing the preview", error) + if (entered && !held) startTimer() + } + } + + private fun detachVideo() { + waitingForVideo = false + if (!ownsVideo) return + ownsVideo = false + player?.let { exo -> + exo.removeListener(videoListener) + exo.stop() + exo.clearMediaItems() + } + slideView?.playerView?.player = null + } + + // --- вызовы слайда --- + + fun onTap(x: Float) { + if (x < width * PREVIOUS_ZONE) previous() else next() + } + + fun onHold(hold: Boolean) { + // Смена слайда удаляет вьюху под пальцем, и она получает ACTION_CANCEL — + // без этой проверки «отпускание» запускало бы второй таймер. + if (fingerHold == hold) return + fingerHold = hold + if (held) pause() else resume() + } + + /** Открытая шторка товаров держит слайд, пока её не закроют. */ + fun onSheet(open: Boolean) { + sheetOpen = open + if (held) pause() else resume() + } + + fun onSoundToggle() { + muted = !muted + player?.volume = if (muted) 0f else 1f + slideView?.setMuted(muted) + } + + fun isMuted() = muted + + fun onButton(element: ButtonElement) { + track("click", story, story.getSlide(slideIndex)) + openLink(element.link) + } + + fun onProduct(product: Product) { + track("click", story, story.getSlide(slideIndex)) + val handler = onProductClick + if (handler != null) { + handler(product) + dismiss() + } else { + openLink(product.deeplink.ifEmpty { product.url }) + } + } + + fun onPromoCopied() { + track("click", story, story.getSlide(slideIndex)) + } + + fun onClose() = dismiss() + } + + /** + * Вёрстка одного слайда. Строится в [slideContext]: для медиа-слайда — тёмном. + */ + // resizeMode и цвет шаттера PlayerView в media3 помечены UnstableApi — это только вид. + @androidx.annotation.OptIn(markerClass = [UnstableApi::class]) + @SuppressLint("ViewConstructor", "ClickableViewAccessibility") + private inner class StorySlideView( + baseContext: Context, + story: Story, + slide: Slide, + private val page: StoryPage + ) : FrameLayout(if (StoriesMapping.isMedia(slide)) StorySupport.darkContext(baseContext) else baseContext) { + + val navigation: PersonalizationStoryNavigation + var playerView: PlayerView? = null + private set + private val poster = ImageView(context) + private var usedProducts: PersonalizationStoryUsedProducts? = null + + init { + val media = StoriesMapping.isMedia(slide) + val video = StoriesMapping.isVideo(slide) + val fallback = StoriesMapping.parseColor(slide.backgroundColor) + setBackgroundColor( + if (media) fallback ?: Color.BLACK + else PersonalizationTheme.color(context, R.color.personalization_background_card) + ) + + if (media) { + poster.scaleType = ImageView.ScaleType.CENTER_CROP + addView(poster, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + val posterUrl = if (video) slide.preview else slide.background + if (posterUrl.isNotEmpty()) loadImage(poster, posterUrl) + if (video) { + playerView = PlayerView(context).apply { + useController = false + resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM + setShutterBackgroundColor(Color.TRANSPARENT) + } + addView(playerView, 0, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + poster.bringToFront() + } + // Скрим сверху и снизу: у фото без текста чёрный 50%, у слайдов с товаром + // и текстом — 30% (Card/Story, виды Slide и Product/Text). + val strong = StoriesMapping.product(slide) == null && StoriesMapping.textBlocks(slide).isEmpty() + addView( + View(context).apply { background = scrim(if (strong) SCRIM_STRONG else SCRIM_LIGHT) }, + LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) + ) + } + + // Слой касаний: тап — листать, удержание — пауза. Кнопки лежат выше и забирают свои касания. + val detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { + override fun onDown(e: MotionEvent) = true + override fun onSingleTapUp(e: MotionEvent): Boolean { + page.onTap(e.x) + return true + } + + override fun onLongPress(e: MotionEvent) = page.onHold(true) + }) + addView(View(context).apply { + setOnTouchListener { _, event -> + detector.onTouchEvent(event) + if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) { + page.onHold(false) + } + true + } + }, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + + val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + val column = LinearLayout(context).apply { + orientation = LinearLayout.VERTICAL + setPadding(padding, padding, padding, 0) + } + navigation = PersonalizationStoryNavigation(context).apply { onClose = { page.onClose() } } + column.addView(navigation, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + + val product = StoriesMapping.product(slide)?.item + val buttons = StoriesMapping.buttons(slide) + val productsElement = StoriesMapping.products(slide) + + if (product != null) { + column.addView(productCard(product, buttons.firstOrNull()), LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f + ).apply { + topMargin = padding + bottomMargin = padding + }) + addView(column, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + } else { + // Текстовые блоки — на своей высоте поверх слайда, как их расставила админка. + val texts = FrameLayout(context) + column.addView(texts, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) + addView(column, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + StoriesMapping.textBlocks(slide).forEach { element -> + val block = PersonalizationStoryTextBlock(context).apply { + text = element.textInput + textSizeSp = element.fontSize.toFloat() + lineHeightSp = if (element.textLineSpacing > 0) element.fontSize * element.textLineSpacing.toFloat() else null + blockColor = StoriesMapping.textBlockColor(element) + textColorOverride = StoriesMapping.parseColor(element.textColor) + align = StoriesMapping.textAlign(element) + bold = element.isBold + italic = element.isItalic + fontFamily = element.fontType.takeIf { it.isNotEmpty() } + } + texts.addView(block, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + texts.post { block.y = texts.height * element.yOffset / 100f } + } + addBottom(productsElement, buttons, video, extraBottom = padding) + } + } + + /** Низ медиа-слайда: кнопки и строка товаров/звука. */ + private fun addBottom( + productsElement: com.personalization.stories.models.elements.ProductsElement?, + buttons: List, + video: Boolean, + extraBottom: Int + ) { + val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + val bottom = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL } + buttons.forEach { element -> + val button = PersonalizationButton(context).apply { + size = PersonalizationButton.Size.LG + buttonView = PersonalizationButton.ButtonView.PRIMARY + text = element.title + setOnClickListener { page.onButton(element) } + } + bottom.addView(button, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { + marginStart = padding + marginEnd = padding + topMargin = padding + }) + } + val products = productsElement?.getProducts().orEmpty() + if (products.isNotEmpty() || video) { + val used = PersonalizationStoryUsedProducts(context).apply { + this.products = products.map(StoriesMapping::cardProduct) + showText = productsElement?.labelShow?.takeIf { it.isNotEmpty() } ?: usedProductsShowText + hideText = productsElement?.labelHide?.takeIf { it.isNotEmpty() } ?: usedProductsHideText + imageLoader = { view, item -> item.imageUrl?.let { loadImage(view, it) } } + onProductClick = { item -> products.firstOrNull { it.id == item.id }?.let(page::onProduct) } + onExpandedChange = { open -> page.onSheet(open) } + showSoundButton = video + muted = page.isMuted() + onSoundClick = { page.onSoundToggle() } + } + usedProducts = used + bottom.addView(used, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + } else if (buttons.isNotEmpty()) { + bottom.setPadding(0, 0, 0, extraBottom) + } + addView(bottom, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM)) + } + + private fun productCard(product: Product, button: ButtonElement?): View { + val price = StoriesMapping.price(product) + return PersonalizationStoryCard(context).apply { + title = product.brand.takeIf { it.isNotEmpty() } + subtitle = product.name + if (product.image.isNotEmpty()) loadImage(imageView, product.image) + this.price.type = price.type + this.price.price = price.price + this.price.oldPrice = price.oldPrice + this.price.discount = price.discount + this.price.promoCode = price.promoCode + this.price.promoCaption = promoCaption + this.price.copiedText = promoCopiedText + this.price.onPromoCopied = { page.onPromoCopied() } + buttonText = button?.title ?: productButtonText + // Товар открывается кнопкой: фото занимает середину слайда, и тап по нему + // должен листать, как по любому другому месту. + onButtonClick = { if (button != null) page.onButton(button) else page.onProduct(product) } + } + } + + fun hidePoster() { + poster.visibility = View.GONE + } + + fun setMuted(muted: Boolean) { + usedProducts?.muted = muted + } + + private fun scrim(alpha: Int): GradientDrawable { + val dark = Color.argb(alpha, 0, 0, 0) + return GradientDrawable( + GradientDrawable.Orientation.TOP_BOTTOM, + intArrayOf(dark, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, dark) + ) + } + } + + private companion object { + const val MIN_DURATION_MS = 1000L + const val SCRIM_STRONG = 128 + const val SCRIM_LIGHT = 77 + const val PREVIOUS_ZONE = 0.3f + } +} + +/** + * Корень просмотра: свайп вниз утаскивает сторис и закрывает её, если протянуть + * дальше пятой части экрана. Горизонтальные жесты остаются пейджеру и карусели. + */ +@SuppressLint("ViewConstructor") +internal class StoryDismissLayout(context: Context) : FrameLayout(context) { + + var onDismissDrag: ((Boolean) -> Unit)? = null + var onDismiss: (() -> Unit)? = null + + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private var downX = 0f + private var downY = 0f + private var dragging = false + + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + downX = event.rawX + downY = event.rawY + dragging = false + } + MotionEvent.ACTION_MOVE -> { + val dy = event.rawY - downY + val dx = event.rawX - downX + if (dy > touchSlop && dy > abs(dx) * 1.5f) { + dragging = true + onDismissDrag?.invoke(true) + return true + } + } + } + return false + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + if (!dragging) return super.onTouchEvent(event) + when (event.actionMasked) { + MotionEvent.ACTION_MOVE -> translationY = (event.rawY - downY).coerceAtLeast(0f) + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { + dragging = false + if (translationY > height * DISMISS_FRACTION) { + animate().translationY(height.toFloat()).setDuration(ANIMATION_MS).withEndAction { onDismiss?.invoke() }.start() + } else { + animate().translationY(0f).setDuration(ANIMATION_MS).withEndAction { onDismissDrag?.invoke(false) }.start() + } + } + } + return true + } + + private companion object { + const val DISMISS_FRACTION = 0.2f + const val ANIMATION_MS = 200L + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt new file mode 100644 index 00000000..a9f3fddf --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -0,0 +1,123 @@ +package com.personalization.ui.widgets + +import android.graphics.Color +import com.personalization.Product +import com.personalization.stories.models.Slide +import com.personalization.stories.models.Story +import com.personalization.stories.models.elements.ButtonElement +import com.personalization.stories.models.elements.ProductElement +import com.personalization.stories.models.elements.ProductsElement +import com.personalization.stories.models.elements.TextBlockElement +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationStoryCover +import com.personalization.ui.components.PersonalizationStoryItem +import com.personalization.ui.components.PersonalizationStoryPrice +import com.personalization.ui.components.PersonalizationStoryTextBlock + +/** + * Перевод моделей сторис SDK (те же, что у старого `StoriesView`) в данные компонентов кита. + * Отдельно от вьюх — чтобы проверялось тестами без экрана. + */ +@InternalPersonalizationUiApi +internal object StoriesMapping { + + /** Цена товара на слайде: промокод важнее скидки, скидка важнее просто цены. */ + data class Price( + val type: PersonalizationStoryPrice.Type, + val price: String, + val oldPrice: String?, + val discount: String?, + val promoCode: String? + ) + + fun price(product: Product): Price { + val old = product.oldPrice.takeIf { it.isNotEmpty() && it != product.price } + val promo = product.promocode.takeIf { it.isNotEmpty() } + if (promo != null) { + val withPromo = product.priceWithPromocode.takeIf { it.isNotEmpty() } + // Без старой цены зачёркивается обычная: промокод снижает именно её. + val crossed = old ?: product.price.takeIf { withPromo != null && withPromo != it } + return Price(PersonalizationStoryPrice.Type.PROMO_CODE, withPromo ?: product.price, crossed, null, promo) + } + val percent = product.discountPercent.toDoubleOrNull()?.takeIf { it > 0 } + if (percent != null) { + val text = if (percent % 1.0 == 0.0) "${percent.toLong()}%" else "$percent%" + return Price(PersonalizationStoryPrice.Type.DISCOUNT, product.price, old, text, null) + } + return Price(PersonalizationStoryPrice.Type.PRICE, product.price, old, null, null) + } + + /** Товар карусели «Используемые товары» → карточка кита. */ + fun cardProduct(product: Product): PersonalizationProduct { + val old = product.oldPrice.takeIf { it.isNotEmpty() && it != product.price } + val discount = product.discount.takeIf { old != null && it.isNotEmpty() && it != "0" } + ?.let { if (it.endsWith("%")) it else "$it%" } + ?.let { if (it.startsWith("-")) it else "-$it" } + return PersonalizationProduct( + id = product.id, + name = product.name, + price = product.price, + imageUrl = product.image.takeIf { it.isNotEmpty() }, + brand = product.brand.takeIf { it.isNotEmpty() }, + oldPrice = old, + discount = discount + ) + } + + /** Состояние обложки: закреплённая остаётся закреплённой и после просмотра. */ + fun item(story: Story): PersonalizationStoryItem { + val state = when { + story.isPinned -> PersonalizationStoryCover.State.PINNED + story.isViewed -> PersonalizationStoryCover.State.VIEWED + else -> PersonalizationStoryCover.State.DEFAULT + } + return PersonalizationStoryItem( + id = story.id.toString(), + title = story.name, + imageUrl = story.avatar.takeIf { it.isNotEmpty() }, + state = state, + segments = story.slidesCount.coerceAtLeast(1), + seenSegments = if (story.isViewed) 0 else story.startPosition.coerceIn(0, story.slidesCount) + ) + } + + /** С какого слайда открыть: с места, где остановились, если сторис не досмотрена. */ + fun startSlide(story: Story): Int = + if (story.isViewed) 0 else story.startPosition.coerceIn(0, (story.slidesCount - 1).coerceAtLeast(0)) + + fun product(slide: Slide): ProductElement? = + slide.getElements().filterIsInstance().firstOrNull { it.item != null } + + fun products(slide: Slide): ProductsElement? = + slide.getElements().filterIsInstance().firstOrNull { it.getProducts().isNotEmpty() } + + fun buttons(slide: Slide): List = + slide.getElements().filterIsInstance().filter { it.title.isNotBlank() } + + fun textBlocks(slide: Slide): List = + slide.getElements().filterIsInstance().filter { it.textInput.isNotBlank() } + + /** Медиа-слайд — с картинкой или видео фоном: он рисуется тёмными токенами. */ + fun isMedia(slide: Slide): Boolean = slide.background.isNotEmpty() + + fun isVideo(slide: Slide): Boolean = slide.type == "video" && slide.background.isNotEmpty() + + /** Подложка текстового блока: цвет админки с её прозрачностью; 0% — блок без фона. */ + fun textBlockColor(element: TextBlockElement): Int? { + val opacity = element.textBackgroundColorOpacity.trim().removeSuffix("%").toIntOrNull() ?: 0 + if (opacity <= 0) return null + val color = parseColor(element.textBackgroundColor) ?: return null + val alpha = (opacity.coerceAtMost(100) * 255) / 100 + return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color)) + } + + fun textAlign(element: TextBlockElement): PersonalizationStoryTextBlock.Align = when (element.textAlign) { + "center" -> PersonalizationStoryTextBlock.Align.CENTER + "right", "end" -> PersonalizationStoryTextBlock.Align.END + else -> PersonalizationStoryTextBlock.Align.START + } + + fun parseColor(value: String?): Int? = + value?.takeIf { it.isNotBlank() }?.let { runCatching { Color.parseColor(it.trim()) }.getOrNull() } +} diff --git a/personalization-sdk/src/main/res/values/personalization_attrs.xml b/personalization-sdk/src/main/res/values/personalization_attrs.xml index dae6212b..aa6a1a68 100644 --- a/personalization-sdk/src/main/res/values/personalization_attrs.xml +++ b/personalization-sdk/src/main/res/values/personalization_attrs.xml @@ -86,5 +86,10 @@ + + + + + diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt new file mode 100644 index 00000000..ed63498f --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -0,0 +1,129 @@ +package com.personalization.ui.widgets + +import android.graphics.Color +import com.personalization.Product +import com.personalization.stories.models.Story +import com.personalization.stories.models.elements.TextBlockElement +import com.personalization.ui.components.PersonalizationStoryCover +import com.personalization.ui.components.PersonalizationStoryPrice +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +/** Stories block data → kit components, on the shapes the stories endpoint returns. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class StoriesMappingTest { + + @Test + fun `a promo code beats the discount and crosses out the regular price`() { + val price = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "discount_percent" to 10, + "promocode" to "PROMO", "price_with_promocode_formatted" to "900 ₽" + ) + ) + assertEquals(PersonalizationStoryPrice.Type.PROMO_CODE, price.type) + assertEquals("900 ₽", price.price) + assertEquals("1 000 ₽", price.oldPrice) + assertEquals("PROMO", price.promoCode) + } + + @Test + fun `a discount percent shows the discount block with the old price`() { + val price = StoriesMapping.price( + product( + "price" to 19990, "price_formatted" to "19 990 ₽", + "oldprice" to 27990, "oldprice_formatted" to "27 990 ₽", + "discount_percent" to 28 + ) + ) + assertEquals(PersonalizationStoryPrice.Type.DISCOUNT, price.type) + assertEquals("28%", price.discount) + assertEquals("27 990 ₽", price.oldPrice) + } + + @Test + fun `an old price equal to the price is not shown`() { + // The endpoint sends oldprice == price for goods without a markdown. + val price = StoriesMapping.price( + product( + "price" to 14990, "price_formatted" to "14 990 ₽", + "oldprice" to 14990, "oldprice_formatted" to "14 990 ₽" + ) + ) + assertEquals(PersonalizationStoryPrice.Type.PRICE, price.type) + assertNull(price.oldPrice) + } + + @Test + fun `a carousel product gets a signed discount only with a real markdown`() { + val card = StoriesMapping.cardProduct( + product( + "id" to "1", "name" to "Mouse", "price" to 100, "price_formatted" to "100 ₽", + "oldprice" to 150, "oldprice_formatted" to "150 ₽", "discount" to 33 + ) + ) + assertEquals("-33%", card.discount) + assertEquals("150 ₽", card.oldPrice) + } + + @Test + fun `the cover state follows pinned and viewed`() { + assertEquals(PersonalizationStoryCover.State.PINNED, StoriesMapping.item(story(pinned = true, viewed = true)).state) + assertEquals(PersonalizationStoryCover.State.VIEWED, StoriesMapping.item(story(viewed = true)).state) + val fresh = StoriesMapping.item(story(startPosition = 2, slides = 5)) + assertEquals(PersonalizationStoryCover.State.DEFAULT, fresh.state) + assertEquals(5, fresh.segments) + assertEquals(2, fresh.seenSegments) + } + + @Test + fun `an unfinished story resumes where it stopped, a viewed one from the start`() { + assertEquals(2, StoriesMapping.startSlide(story(startPosition = 2, slides = 5))) + assertEquals(0, StoriesMapping.startSlide(story(viewed = true, startPosition = 2, slides = 5))) + assertEquals(4, StoriesMapping.startSlide(story(startPosition = 9, slides = 5))) + } + + @Test + fun `a text block background takes its opacity, zero means no background`() { + val half = StoriesMapping.textBlockColor(textBlock("#0087E8", "50%"))!! + assertEquals(127, Color.alpha(half)) + assertEquals(0x87, Color.green(half)) + assertNull(StoriesMapping.textBlockColor(textBlock("#0087E8", "0%"))) + assertNull(StoriesMapping.textBlockColor(textBlock("not a colour", "100%"))) + } + + private fun product(vararg fields: Pair): Product = + Product(JSONObject().apply { fields.forEach { (key, value) -> put(key, value) } }) + + private fun story( + pinned: Boolean = false, + viewed: Boolean = false, + startPosition: Int = 0, + slides: Int = 3 + ): Story = Story( + JSONObject() + .put("id", 1) + .put("name", "Story") + .put("pinned", pinned) + .put("viewed", viewed) + .put("start_position", startPosition) + .put("slides", JSONArray().apply { + repeat(slides) { put(JSONObject().put("id", "s$it").put("elements", JSONArray())) } + }) + ) + + private fun textBlock(color: String, opacity: String) = TextBlockElement( + JSONObject() + .put("text_input", "Text") + .put("text_background_color", color) + .put("text_background_color_opacity", opacity) + ) +} From 077549fd5bb38e9e35e7c3c627704ced3ec2aa05 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 30 Sep 2026 22:22:08 +0400 Subject: [PATCH 03/31] feat(demo): stories v2 exhibits A Stories V2 tab in the UI Kit showcase: the demo shop's live block, an offline sample block with every slide kind, and each building block on its own. The tab row scrolls now that there are five tabs. --- .../src/main/assets/uikit/stories_sample.json | 330 ++++++++++++++++++ .../personalization/demo/StoriesV2Showcase.kt | 322 +++++++++++++++++ .../com/personalization/demo/UiKitPane.kt | 23 +- 3 files changed, 665 insertions(+), 10 deletions(-) create mode 100644 demo-app/src/main/assets/uikit/stories_sample.json create mode 100644 demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt diff --git a/demo-app/src/main/assets/uikit/stories_sample.json b/demo-app/src/main/assets/uikit/stories_sample.json new file mode 100644 index 00000000..bfbaaaa7 --- /dev/null +++ b/demo-app/src/main/assets/uikit/stories_sample.json @@ -0,0 +1,330 @@ +{ + "id": "sample", + "settings": {}, + "stories": [ + { + "id": 901, + "name": "Скидки", + "avatar": "file:///android_asset/uikit/sneakers.jpg", + "pinned": true, + "viewed": false, + "start_position": 0, + "slides": [ + { + "id": "901_0", + "type": "", + "duration": 6, + "background": "", + "elements": [ + { + "type": "product", + "title": " ", + "item": { + "id": "1", + "brand": "Pegasus", + "name": "Кроссовки беговые Pegasus 41, сетчатый верх", + "image_url": "file:///android_asset/uikit/sneakers.jpg", + "picture": "file:///android_asset/uikit/sneakers.jpg", + "price": 9990, + "price_formatted": "9 990 ₽", + "url": "https://example.com/p/1", + "oldprice": 12990, + "oldprice_formatted": "12 990 ₽", + "discount": 23, + "discount_percent": 23 + } + }, + { + "type": "button", + "title": "Купить", + "link": "https://example.com", + "link_android": "https://example.com", + "background": "#3b82f6", + "color": "#ffffff" + } + ] + }, + { + "id": "901_1", + "type": "", + "duration": 6, + "background": "", + "elements": [ + { + "type": "product", + "title": " ", + "item": { + "id": "2", + "brand": "Chrono", + "name": "Часы наручные Chrono Classic, сталь, 40 мм", + "image_url": "file:///android_asset/uikit/watch.jpg", + "picture": "file:///android_asset/uikit/watch.jpg", + "price": 24990, + "price_formatted": "24 990 ₽", + "url": "https://example.com/p/2", + "promocode": "YAGODA-MALINA", + "price_with_promocode_formatted": "19 990 ₽" + } + }, + { + "type": "button", + "title": "Купить", + "link": "https://example.com", + "link_android": "https://example.com", + "background": "#3b82f6", + "color": "#ffffff" + } + ] + }, + { + "id": "901_2", + "type": "", + "duration": 6, + "background": "", + "elements": [ + { + "type": "product", + "title": " ", + "item": { + "id": "3", + "brand": "Sonic", + "name": "Наушники беспроводные Sonic Pro с шумоподавлением", + "image_url": "file:///android_asset/uikit/headphones.jpg", + "picture": "file:///android_asset/uikit/headphones.jpg", + "price": 7490, + "price_formatted": "7 490 ₽", + "url": "https://example.com/p/3" + } + }, + { + "type": "button", + "title": "Купить", + "link": "https://example.com", + "link_android": "https://example.com", + "background": "#3b82f6", + "color": "#ffffff" + } + ] + } + ] + }, + { + "id": 902, + "name": "Образ", + "avatar": "file:///android_asset/uikit/jacket.jpg", + "pinned": false, + "viewed": false, + "start_position": 0, + "slides": [ + { + "id": "902_0", + "type": "image", + "duration": 8, + "background": "file:///android_asset/uikit/jacket.jpg", + "background_color": "#000000", + "elements": [ + { + "type": "button", + "title": "Смотреть образ", + "link": "https://example.com", + "link_android": "https://example.com", + "background": "#3b82f6", + "color": "#ffffff" + }, + { + "type": "products", + "labels": { + "show_carousel": "Используемые товары", + "hide_carousel": "Скрыть товары" + }, + "products": [ + { + "id": "4", + "brand": "Trail", + "name": "Рюкзак городской Trail 20 л", + "image_url": "file:///android_asset/uikit/backpack.jpg", + "picture": "file:///android_asset/uikit/backpack.jpg", + "price": 4990, + "price_formatted": "4 990 ₽", + "url": "https://example.com/p/4", + "oldprice": 5990, + "oldprice_formatted": "5 990 ₽", + "discount": 17 + }, + { + "id": "5", + "brand": "Sunny", + "name": "Очки солнцезащитные Sunny", + "image_url": "file:///android_asset/uikit/sunglasses.jpg", + "picture": "file:///android_asset/uikit/sunglasses.jpg", + "price": 2990, + "price_formatted": "2 990 ₽", + "url": "https://example.com/p/5" + }, + { + "id": "6", + "brand": "Aqua", + "name": "Бутылка для воды Aqua 0,75 л", + "image_url": "file:///android_asset/uikit/bottle.jpg", + "picture": "file:///android_asset/uikit/bottle.jpg", + "price": 990, + "price_formatted": "990 ₽", + "url": "https://example.com/p/6", + "oldprice": 1290, + "oldprice_formatted": "1 290 ₽", + "discount": 23 + } + ] + } + ] + }, + { + "id": "902_1", + "type": "image", + "duration": 6, + "background": "file:///android_asset/uikit/backpack.jpg", + "background_color": "#000000", + "elements": [] + } + ] + }, + { + "id": 903, + "name": "Текст", + "avatar": "file:///android_asset/uikit/bottle.jpg", + "pinned": false, + "viewed": false, + "start_position": 1, + "slides": [ + { + "id": "903_0", + "type": "image", + "duration": 6, + "background": "file:///android_asset/uikit/sunglasses.jpg", + "background_color": "#000000", + "elements": [ + { + "type": "text_block", + "text_input": "Первый слайд уже просмотрен — лента продолжила со второго", + "font_size": 20, + "y_offset": 40, + "text_align": "left", + "text_color": "#FFFFFF", + "text_background_color": "#0087E8", + "text_background_color_opacity": "100%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + } + ] + }, + { + "id": "903_1", + "type": "image", + "duration": 8, + "background": "file:///android_asset/uikit/bottle.jpg", + "background_color": "#000000", + "elements": [ + { + "type": "text_block", + "text_input": "Open eat dear winding belonging.", + "font_size": 48, + "y_offset": 0, + "text_align": "left", + "text_color": "#FFFFFF", + "text_background_color": "#1BAA1B", + "text_background_color_opacity": "100%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + }, + { + "type": "text_block", + "text_input": "Open eat dear winding belonging though differed stand left.", + "font_size": 30, + "y_offset": 27, + "text_align": "left", + "text_color": "#FFFFFF", + "text_background_color": "#F37A17", + "text_background_color_opacity": "100%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + }, + { + "type": "text_block", + "text_input": "Open eat dear winding belonging though differed stand left.", + "font_size": 20, + "y_offset": 45, + "text_align": "left", + "text_color": "#FFFFFF", + "text_background_color": "#0087E8", + "text_background_color_opacity": "100%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + }, + { + "type": "text_block", + "text_input": "Open eat dear winding belonging.", + "font_size": 48, + "y_offset": 56, + "text_align": "center", + "text_color": "#FFFFFF", + "text_background_color": "#0087E8", + "text_background_color_opacity": "0%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + }, + { + "type": "text_block", + "text_input": "Open eat dear winding belonging though differed stand left.", + "font_size": 20, + "y_offset": 80, + "text_align": "right", + "text_color": "#FFFFFF", + "text_background_color": "#0087E8", + "text_background_color_opacity": "0%", + "text_line_spacing": 1.0, + "bold": false, + "italic": false, + "font_type": "" + }, + { + "type": "button", + "title": "Подробнее", + "link": "https://example.com", + "link_android": "https://example.com", + "background": "#3b82f6", + "color": "#ffffff" + } + ] + } + ] + }, + { + "id": 904, + "name": "Просмотрено", + "avatar": "file:///android_asset/uikit/watch.jpg", + "pinned": false, + "viewed": true, + "start_position": 0, + "slides": [ + { + "id": "904_0", + "type": "image", + "duration": 5, + "background": "file:///android_asset/uikit/watch.jpg", + "background_color": "#000000", + "elements": [] + } + ] + } + ] +} \ No newline at end of file diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt new file mode 100644 index 00000000..4f69bc13 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -0,0 +1,322 @@ +package com.personalization.demo + +import android.content.Context +import android.content.res.Configuration +import android.graphics.Color +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.view.ContextThemeWrapper +import androidx.compose.runtime.Composable +import com.bumptech.glide.Glide +import com.personalization.stories.models.Story +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationStoriesBar +import com.personalization.ui.components.PersonalizationStoryCard +import com.personalization.ui.components.PersonalizationStoryCover +import com.personalization.ui.components.PersonalizationStoryItem +import com.personalization.ui.components.PersonalizationStoryNavigation +import com.personalization.ui.components.PersonalizationStoryPreview +import com.personalization.ui.components.PersonalizationStoryPrice +import com.personalization.ui.components.PersonalizationStoryTextBlock +import com.personalization.ui.components.PersonalizationStoryTimer +import com.personalization.ui.components.PersonalizationStoryUsedProducts +import com.personalization.ui.widgets.PersonalizationStories +import com.personalization.ui.widgets.PersonalizationStoriesViewer +import org.json.JSONObject + +/** + * "Stories V2" tab: the stories block drawn by the UI kit, next to the legacy one in "Stories". + * + * The first exhibit is the live block of the demo shop — it loads through the SDK like the legacy + * StoriesView. The second opens a bundled sample block (`assets/uikit/stories_sample.json`) that has + * every slide kind the kit draws — product with a discount, with a promo code, text blocks, used + * products — so the viewer can be checked without depending on what the shop's block holds today. + * The rest are the building blocks one by one. + */ +@Composable +internal fun StoriesV2Showcase(storiesCode: String, shopId: String) { + Showcase { + Exhibit("Stories V2 — live block of the demo shop") { ctx -> + PersonalizationStories(ctx).apply { + code = storiesCode + this.shopId = shopId + } + } + Exhibit("Stories V2 — sample block with every slide kind (offline)") { ctx -> ctx.sampleStories() } + Exhibit("Story Preview — pinned, default, viewed, skeleton") { ctx -> ctx.previews() } + Exhibit("Story Cover — ring split by slides, 2 of 5 seen") { ctx -> + ctx.row( + PersonalizationStoryCover(ctx).apply { + segments = 5 + seenSegments = 2 + ctx.loadAsset(imageView, "sneakers.jpg") + }, + PersonalizationStoryCover(ctx).apply { + segments = 3 + seenSegments = 1 + state = PersonalizationStoryCover.State.PINNED + ctx.loadAsset(imageView, "watch.jpg") + } + ) + } + Exhibit("Stories Bar — loading") { ctx -> PersonalizationStoriesBar(ctx).apply { showSkeleton() } } + Exhibit("Story Navigation — slide 2 of 5, over a photo (dark tokens)") { ctx -> + val dark = ctx.darkContext() + ctx.overPhoto( + "jacket.jpg", + PersonalizationStoryNavigation(dark).apply { + progress.count = 5 + progress.current = 1 + progress.progress = 0.5f + onClose = { ctx.toast("Close") } + }, + heightDp = 96 + ) + } + Exhibit("Story Price — price, discount, promo code (tap to copy), long code") { ctx -> ctx.prices() } + Exhibit("Story Timer — merged, separate") { ctx -> + val end = System.currentTimeMillis() + ((2 * 24 + 18) * 3600L + 33 * 60 + 24) * 1000 + ctx.column( + PersonalizationStoryTimer(ctx).apply { endTimeMillis = end }, + PersonalizationStoryTimer(ctx).apply { + style = PersonalizationStoryTimer.Style.SEPARATE + endTimeMillis = end + } + ) + } + Exhibit("Story Text Block — solid large / medium / small, transparent") { ctx -> ctx.textBlocks() } + Exhibit("Story Used Products — collapsed with sound, expanded (dark tokens)") { ctx -> ctx.usedProducts() } + Exhibit("Story Card — product with a discount, as on a slide") { ctx -> + ctx.slideFrame(ctx.storyCard(action = false), photo = null) + } + Exhibit("Story Card — action over a photo: badge, timer, no image (dark tokens)") { ctx -> + ctx.slideFrame(ctx.darkContext().storyCard(action = true), photo = "backpack.jpg") + } + } +} + +// --- Exhibits ----------------------------------------------------------------------------------- + +private fun Context.sampleStories(): View { + val json = assets.open("uikit/stories_sample.json").bufferedReader().use { it.readText() } + val array = JSONObject(json).getJSONArray("stories") + val stories = List(array.length()) { Story(array.getJSONObject(it)) } + val bar = PersonalizationStoriesBar(this) + fun render() { + bar.items = stories.map { story -> + PersonalizationStoryItem( + id = story.id.toString(), + title = story.name, + imageUrl = story.avatar, + state = when { + story.isPinned -> PersonalizationStoryCover.State.PINNED + story.isViewed -> PersonalizationStoryCover.State.VIEWED + else -> PersonalizationStoryCover.State.DEFAULT + }, + segments = story.slidesCount, + seenSegments = if (story.isViewed) 0 else story.startPosition + ) + } + } + bar.imageLoader = { view, url -> Glide.with(view).load(url).into(view) } + bar.onItemClick = { index, _ -> + PersonalizationStoriesViewer(this, stories, index).apply { + onLinkClick = { link -> + toast("Link: $link") + true + } + onStoryProgress = { render() } + setOnDismissListener { render() } + show() + } + } + render() + return bar +} + +private fun Context.previews(): View { + fun preview(title: String, state: PersonalizationStoryCover.State, asset: String?) = + PersonalizationStoryPreview(this).apply { + this.title = title + this.state = state + asset?.let { loadAsset(cover.imageView, it) } + } + return hscrollRow( + preview("Pinned", PersonalizationStoryCover.State.PINNED, "sneakers.jpg"), + preview("Default", PersonalizationStoryCover.State.DEFAULT, "jacket.jpg"), + preview("Viewed", PersonalizationStoryCover.State.VIEWED, "watch.jpg"), + preview("", PersonalizationStoryCover.State.SKELETON, null) + ) +} + +private fun Context.prices(): View { + fun price(type: PersonalizationStoryPrice.Type, promo: String? = null) = PersonalizationStoryPrice(this).apply { + this.type = type + price = "1 190 900 ₽" + oldPrice = "245 000 ₽" + discount = "10%" + promoCode = promo + onPromoCopied = { toast("Copied: $it") } + } + return column( + price(PersonalizationStoryPrice.Type.PRICE).apply { oldPrice = null }, + price(PersonalizationStoryPrice.Type.PRICE), + price(PersonalizationStoryPrice.Type.DISCOUNT), + price(PersonalizationStoryPrice.Type.PROMO_CODE, "PROMO"), + price(PersonalizationStoryPrice.Type.PROMO_CODE, "YAGODA-MALINA") + ) +} + +private fun Context.textBlocks(): View { + val dark = darkContext() + fun block(size: PersonalizationStoryTextBlock.Size, color: Int?, align: PersonalizationStoryTextBlock.Align = PersonalizationStoryTextBlock.Align.START) = + PersonalizationStoryTextBlock(dark).apply { + text = "Open eat dear winding belonging." + this.size = size + blockColor = color + this.align = align + } + val stack = LinearLayout(dark).apply { + orientation = LinearLayout.VERTICAL + setPadding(dp(16), dp(16), dp(16), dp(16)) + listOf( + block(PersonalizationStoryTextBlock.Size.LARGE, Color.parseColor("#1BAA1B")), + block(PersonalizationStoryTextBlock.Size.MEDIUM, Color.parseColor("#F37A17")), + block(PersonalizationStoryTextBlock.Size.SMALL, Color.parseColor("#0087E8")), + block(PersonalizationStoryTextBlock.Size.LARGE, null), + block(PersonalizationStoryTextBlock.Size.MEDIUM, null, PersonalizationStoryTextBlock.Align.CENTER), + block(PersonalizationStoryTextBlock.Size.SMALL, null, PersonalizationStoryTextBlock.Align.END) + ).forEachIndexed { index, view -> + addView(view, LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + if (index > 0) topMargin = dp(16) + }) + } + } + return overPhoto("bottle.jpg", stack, heightDp = null) +} + +private fun Context.usedProducts(): View { + val dark = darkContext() + val products = listOf( + PersonalizationProduct("4", "Рюкзак городской Trail 20 л", "4 990 ₽", "file:///android_asset/uikit/backpack.jpg", "Trail", oldPrice = "5 990 ₽", discount = "-17%"), + PersonalizationProduct("5", "Очки солнцезащитные Sunny", "2 990 ₽", "file:///android_asset/uikit/sunglasses.jpg", "Sunny"), + PersonalizationProduct("6", "Бутылка для воды Aqua 0,75 л", "990 ₽", "file:///android_asset/uikit/bottle.jpg", "Aqua") + ) + fun used(expanded: Boolean) = PersonalizationStoryUsedProducts(dark).apply { + this.products = products + showText = "Используемые товары" + hideText = "Скрыть товары" + imageLoader = { view, product -> product.imageUrl?.let { Glide.with(view).load(it).into(view) } } + onProductClick = { toast(it.name.toString()) } + showSoundButton = true + onSoundClick = { muted = !muted } + this.expanded = expanded + } + return column( + overPhoto("jacket.jpg", used(expanded = false), heightDp = null), + overPhoto("jacket.jpg", used(expanded = true), heightDp = null) + ) +} + +private fun Context.storyCard(action: Boolean): PersonalizationStoryCard = PersonalizationStoryCard(this).apply { + if (action) { + badgeText = "Sale!" + title = "Скидки до 10%!" + subtitle = "На рюкзаки и сумки до конца недели" + showImage = false + showTimer = true + timer.endTimeMillis = System.currentTimeMillis() + 3 * 24 * 3600 * 1000L + price.type = PersonalizationStoryPrice.Type.DISCOUNT + price.discount = "10%" + } else { + title = "Pegasus" + subtitle = "Кроссовки беговые Pegasus 41, сетчатый верх" + loadAsset(imageView, "sneakers.jpg") + price.type = PersonalizationStoryPrice.Type.DISCOUNT + price.discount = "23%" + } + price.price = "9 990 ₽" + price.oldPrice = "12 990 ₽" + buttonText = "More info" + onButtonClick = { toast("More info") } +} + +// --- Helpers ------------------------------------------------------------------------------------ + +/** + * The kit draws media slides with its dark tokens; the SDK keeps its helper internal, so the demo + * forces night resources on a subtree the same way to show those exhibits as they appear in a story. + */ +private fun Context.darkContext(): Context { + val configuration = Configuration(resources.configuration).apply { + uiMode = (uiMode and Configuration.UI_MODE_NIGHT_MASK.inv()) or Configuration.UI_MODE_NIGHT_YES + } + return ContextThemeWrapper(this, theme).apply { applyOverrideConfiguration(configuration) } +} + +/** Decoded straight from the APK — Glide in a Compose-hosted view may never get its pre-draw. */ +private fun Context.loadAsset(view: ImageView, name: String) { + view.setImageBitmap(assetBitmap("uikit/$name")) +} + +/** An exhibit over a photo, the way the component sits on a media slide. */ +private fun Context.overPhoto(asset: String, content: View, heightDp: Int?): View = fixedHeight(heightDp, FrameLayout(this).apply { + addView(ImageView(context).apply { + scaleType = ImageView.ScaleType.CENTER_CROP + loadAsset(this, asset) + }, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + addView(View(context).apply { setBackgroundColor(Color.argb(77, 0, 0, 0)) }, + FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + addView(content, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + if (heightDp != null) setMargins(dp(16), dp(16), dp(16), dp(16)) + }) +}) + +/** A card at a phone-slide size, on the kit background or over a photo. */ +private fun Context.slideFrame(card: View, photo: String?): View = fixedHeight(SLIDE_HEIGHT_DP, FrameLayout(this).apply { + if (photo != null) { + addView(ImageView(context).apply { + scaleType = ImageView.ScaleType.CENTER_CROP + loadAsset(this, photo) + }, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + addView(View(context).apply { setBackgroundColor(Color.argb(77, 0, 0, 0)) }, + FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + } else { + setBackgroundColor(com.personalization.ui.PersonalizationTheme.color(context, com.personalization.R.color.personalization_background_card)) + } + setPadding(dp(16), dp(16), dp(16), dp(16)) + addView(card, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) +}) + +/** + * Wraps [content] at a fixed height: AndroidView owns the layout params of the view it hosts, so the + * height has to live on a child of it. + */ +private fun Context.fixedHeight(heightDp: Int?, content: View): View { + if (heightDp == null) return content + return FrameLayout(this).apply { + addView(content, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp(heightDp))) + } +} + +/** A slide of the design is 402×874; the exhibit keeps the card at a phone-like height. */ +private const val SLIDE_HEIGHT_DP = 620 + +private fun Context.hscrollRow(vararg children: View): View = + android.widget.HorizontalScrollView(this).apply { + isHorizontalScrollBarEnabled = false + addView(LinearLayout(context).apply { + orientation = LinearLayout.HORIZONTAL + children.forEachIndexed { index, child -> + addView(child, LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + if (index > 0) marginStart = dp(16) + }) + } + }) + } + +private fun Context.toast(message: String) = + android.widget.Toast.makeText(this, message, android.widget.Toast.LENGTH_SHORT).show() diff --git a/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt b/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt index 66398640..d6d19e8d 100644 --- a/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt +++ b/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt @@ -26,7 +26,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.MaterialTheme import androidx.compose.material.Tab -import androidx.compose.material.TabRow +import androidx.compose.material.ScrollableTabRow import androidx.compose.material.Text import androidx.compose.material.TextButton import androidx.compose.runtime.Composable @@ -84,6 +84,7 @@ import com.personalization.ui.widgets.PersonalizationSearchResultsScreen * 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. "Stories" keeps * the stories block through the SDK's Compose wrapper, the counterpart of the "Legacy UI" tab. + * "Stories V2" is the same block drawn by the kit (see [StoriesV2Showcase]). * * The kit is classic Views, so each exhibit is an [AndroidView] built from a small factory. Product * data is static: the kit does not fetch or format anything itself, and images are loaded by the @@ -92,7 +93,7 @@ import com.personalization.ui.widgets.PersonalizationSearchResultsScreen @Composable fun UiKitPane(storiesCode: String, shopId: String) { var tab by rememberSaveable { mutableStateOf(0) } - val tabs = listOf("Components", "Blocks", "Search", "Stories") + val tabs = listOf("Components", "Blocks", "Search", "Stories", "Stories V2") Column(modifier = Modifier.fillMaxSize()) { Row( @@ -101,7 +102,8 @@ fun UiKitPane(storiesCode: String, shopId: String) { ) { AppearanceSwitch() } - TabRow( + // Five tabs do not fit a fixed row on a phone: the labels would break mid-word. + ScrollableTabRow( selectedTabIndex = tab, backgroundColor = MaterialTheme.colors.surface, contentColor = MaterialTheme.colors.primary @@ -114,7 +116,8 @@ fun UiKitPane(storiesCode: String, shopId: String) { 0 -> ComponentsShowcase() 1 -> BlocksShowcase() 2 -> SearchShowcase(shopId = shopId) - else -> ComposeStoriesPane(code = storiesCode, shopId = shopId) + 3 -> ComposeStoriesPane(code = storiesCode, shopId = shopId) + else -> StoriesV2Showcase(storiesCode = storiesCode, shopId = shopId) } } } @@ -409,7 +412,7 @@ private fun Context.loyaltyCard(stamps: Int, brand: Int? = null): View { } /** Decoded straight from the APK: Glide waits for a pre-draw that Compose-hosted views may never get. */ -private fun Context.assetBitmap(path: String): Bitmap = assets.open(path).use(BitmapFactory::decodeStream) +internal fun Context.assetBitmap(path: String): Bitmap = assets.open(path).use(BitmapFactory::decodeStream) /** * The popup as the SDK will hand it over: the host loads the image and wires the two callbacks. @@ -517,7 +520,7 @@ private fun Context.toast(message: String) = Toast.makeText(this, message, Toast // --- Compose scaffolding ------------------------------------------------------------------------ @Composable -private fun Showcase(content: @Composable () -> Unit) { +internal fun Showcase(content: @Composable () -> Unit) { Column( modifier = Modifier .fillMaxSize() @@ -529,7 +532,7 @@ private fun Showcase(content: @Composable () -> Unit) { } @Composable -private fun Exhibit(title: String, build: (Context) -> View) { +internal fun Exhibit(title: String, build: (Context) -> View) { Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( text = title, @@ -542,9 +545,9 @@ private fun Exhibit(title: String, build: (Context) -> View) { // --- View factories ----------------------------------------------------------------------------- -private fun Context.dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() +internal fun Context.dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() -private fun Context.row(vararg children: View): LinearLayout = LinearLayout(this).apply { +internal fun Context.row(vararg children: View): LinearLayout = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL gravity = Gravity.CENTER_VERTICAL children.forEachIndexed { index, child -> @@ -555,7 +558,7 @@ private fun Context.row(vararg children: View): LinearLayout = LinearLayout(this } } -private fun Context.column(vararg children: View): LinearLayout = LinearLayout(this).apply { +internal fun Context.column(vararg children: View): LinearLayout = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL children.forEachIndexed { index, child -> val params = (child.layoutParams as? LinearLayout.LayoutParams) From bc1feaff5bca9edcd0f87348aeb38bfd3140926d Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 30 Sep 2026 22:34:55 +0400 Subject: [PATCH 04/31] fix(ui): the stories viewer scrims every slide Card/Story darkens the top and bottom of product slides on a plain background too, not only photos and video. --- .../ui/widgets/PersonalizationStoriesViewer.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 710e6a2f..15126974 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -514,14 +514,14 @@ class PersonalizationStoriesViewer( addView(playerView, 0, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) poster.bringToFront() } - // Скрим сверху и снизу: у фото без текста чёрный 50%, у слайдов с товаром - // и текстом — 30% (Card/Story, виды Slide и Product/Text). - val strong = StoriesMapping.product(slide) == null && StoriesMapping.textBlocks(slide).isEmpty() - addView( - View(context).apply { background = scrim(if (strong) SCRIM_STRONG else SCRIM_LIGHT) }, - LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) - ) } + // Скрим сверху и снизу — у всех видов Card/Story, и на белом фоне тоже: + // у фото без текста чёрный 50%, у слайдов с товаром и текстом — 30%. + val strong = media && StoriesMapping.product(slide) == null && StoriesMapping.textBlocks(slide).isEmpty() + addView( + View(context).apply { background = scrim(if (strong) SCRIM_STRONG else SCRIM_LIGHT) }, + LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) + ) // Слой касаний: тап — листать, удержание — пауза. Кнопки лежат выше и забирают свои касания. val detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { From f20549743cb3f22ca4267936f52f4444579de436 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:19:47 +0400 Subject: [PATCH 05/31] feat(ui): stories v2 mapping rules and per-shop seen store Price compares decimals and keeps fractional discounts, the ring lights seen slides by index, a story opens at its first unseen slide, only positive integer ids are tracked, slides default to 10 s, two-line cover labels, text blocks fall back to the preset line height of their size. --- .../personalization/demo/StoriesV2Showcase.kt | 6 +- .../kotlin/com/personalization/Product.kt | 13 + .../personalization/stories/models/Slide.kt | 6 + .../components/PersonalizationStoryCover.kt | 25 +- .../PersonalizationStoryTextBlock.kt | 18 +- .../ui/widgets/PersonalizationStories.kt | 2 +- .../widgets/PersonalizationStoriesViewer.kt | 2 +- .../ui/widgets/StoriesSupport.kt | 271 +++++++++++++++-- .../ui/widgets/StoriesMappingTest.kt | 274 ++++++++++++++++-- 9 files changed, 557 insertions(+), 60 deletions(-) diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt index 4f69bc13..b657ac22 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -51,12 +51,12 @@ internal fun StoriesV2Showcase(storiesCode: String, shopId: String) { ctx.row( PersonalizationStoryCover(ctx).apply { segments = 5 - seenSegments = 2 + seenSegments = setOf(0, 1) ctx.loadAsset(imageView, "sneakers.jpg") }, PersonalizationStoryCover(ctx).apply { segments = 3 - seenSegments = 1 + seenSegments = setOf(0) state = PersonalizationStoryCover.State.PINNED ctx.loadAsset(imageView, "watch.jpg") } @@ -117,7 +117,7 @@ private fun Context.sampleStories(): View { else -> PersonalizationStoryCover.State.DEFAULT }, segments = story.slidesCount, - seenSegments = if (story.isViewed) 0 else story.startPosition + seenSegments = if (story.isViewed) emptySet() else (0 until story.startPosition).toSet() ) } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/Product.kt b/personalization-sdk/src/main/kotlin/com/personalization/Product.kt index e644bd4c..69252d94 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/Product.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/Product.kt @@ -1,5 +1,6 @@ package com.personalization +import java.math.BigDecimal import org.json.JSONObject class Product(json: JSONObject) { @@ -16,6 +17,15 @@ class Product(json: JSONObject) { val priceWithPromocode: String = json.optString("price_with_promocode_formatted", "") val discountPercent: String = json.optString("discount_percent", "") + /** + * Raw numeric prices, for comparing them (Stories V2 shows an old price only when it is greater + * than the price). `null` when the field is absent or not a number. Read as decimals: a price may + * have kopecks/cents, and an Int would silently drop them. + */ + internal val priceDecimal: BigDecimal? = json.decimal("price") + internal val oldPriceDecimal: BigDecimal? = json.decimal("oldprice") + internal val priceWithPromocodeDecimal: BigDecimal? = json.decimal("price_with_promocode") + init { val oldPriceValue = json.optDouble("oldprice", 0.0) oldPrice = if (oldPriceValue > 0) { @@ -31,3 +41,6 @@ class Product(json: JSONObject) { } } } + +private fun JSONObject.decimal(name: String): BigDecimal? = + opt(name)?.takeIf { it != JSONObject.NULL }?.toString()?.trim()?.toBigDecimalOrNull() diff --git a/personalization-sdk/src/main/kotlin/com/personalization/stories/models/Slide.kt b/personalization-sdk/src/main/kotlin/com/personalization/stories/models/Slide.kt index a8254f65..2272fbf9 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/stories/models/Slide.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/stories/models/Slide.kt @@ -17,6 +17,12 @@ class Slide(json: JSONObject) : Serializable { val preview: String = json.optString("preview", "") val type: String = json.optString("type", "") var duration: Long = json.optLong("duration", DEFAULT_DURATION_SECONDS.toLong()) * 1000L + + /** + * The admin duration in seconds as sent, 0 when absent. [duration] already folds a default in, + * so Stories V2 reads this one to apply its own default. + */ + internal val adminDurationSeconds: Long = json.optLong("duration", 0L) private val elements: MutableList = ArrayList() var isPrepared: Boolean = false diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt index 0db60f2e..671a1029 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCover.kt @@ -30,8 +30,9 @@ import com.personalization.ui.PersonalizationTheme * закреплённая (кольцо Semantic/Warning и звезда Favorites справа внизу), обычная * (Button/Primary), просмотренная (Semantic/Neutral Subtle) и скелетон загрузки. * - * Кольцо делится на сегменты по числу слайдов ([segments]); уже просмотренные - * ([seenSegments]) — цветом Button/Primary Disabled, как в вариантах Progress/Circular. + * Кольцо делится на сегменты по числу слайдов ([segments]); просмотренные слайды + * ([seenSegments], по индексу) — цветом Button/Primary Disabled, как в вариантах + * Progress/Circular. * * Картинку кладёт хост в [imageView] — кит ничего не качает. */ @@ -57,10 +58,10 @@ class PersonalizationStoryCover @JvmOverloads constructor( invalidate() } - /** Сколько первых сегментов уже просмотрено. */ - var seenSegments: Int = 0 + /** Индексы просмотренных сегментов: сегмент i отмечен, если виден слайд i. */ + var seenSegments: Set = emptySet() set(value) { - field = value.coerceAtLeast(0) + field = value invalidate() } @@ -144,7 +145,7 @@ class PersonalizationStoryCover @JvmOverloads constructor( val sweep = 360f / segments val gap = SEGMENT_GAP_DEGREES.coerceAtMost(sweep / 3f) for (index in 0 until segments) { - ringPaint.color = if (index < seenSegments) seen else main + ringPaint.color = if (index in seenSegments) seen else main canvas.drawArc(ringBounds, START_ANGLE + index * sweep + gap / 2f, sweep - gap, false, ringPaint) } } @@ -182,8 +183,8 @@ class PersonalizationStoryCover @JvmOverloads constructor( * Превью сторис: обложка и подпись под ней. * * Источник: Figma, Story/Preview (391:17082): колонка шириной с обложку, шаг 8, - * подпись Regular 12/16 по центру цветом Text/Primary. У скелетона вместо подписи — - * полоска 64×8 со скруглением 5. + * подпись Regular 12/16 по центру цветом Text/Primary — до двух строк с многоточием + * в конце, как у старых сторис. У скелетона вместо подписи — полоска 64×8 со скруглением 5. */ @InternalPersonalizationUiApi class PersonalizationStoryPreview @JvmOverloads constructor( @@ -218,7 +219,7 @@ class PersonalizationStoryPreview @JvmOverloads constructor( label.includeFontPadding = false label.gravity = Gravity.CENTER - label.maxLines = 1 + label.maxLines = LABEL_MAX_LINES label.ellipsize = TextUtils.TruncateAt.END label.typeface = PersonalizationTheme.typeface(context, emphasized = false) label.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.personalization_font_size_xs)) @@ -245,7 +246,7 @@ class PersonalizationStoryPreview @JvmOverloads constructor( } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { - // Ширина превью — ширина обложки, подпись режется многоточием. + // Ширина превью — ширина обложки, длинная подпись режется многоточием на второй строке. super.onMeasure(MeasureSpec.makeMeasureSpec(cover.coverSize, MeasureSpec.EXACTLY), heightMeasureSpec) } @@ -260,6 +261,7 @@ class PersonalizationStoryPreview @JvmOverloads constructor( private companion object { /** Трекинг в макете 0.05 — в процентах кегля, то есть почти ноль; в em так же. */ const val LABEL_LETTER_SPACING_EM = 0.0005f + const val LABEL_MAX_LINES = 2 } } @@ -271,7 +273,8 @@ data class PersonalizationStoryItem( val imageUrl: String? = null, val state: PersonalizationStoryCover.State = PersonalizationStoryCover.State.DEFAULT, val segments: Int = 1, - val seenSegments: Int = 0 + /** Индексы просмотренных слайдов — отмечаются на кольце. */ + val seenSegments: Set = emptySet() ) /** diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt index 949c28cb..bb27af55 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt @@ -23,7 +23,8 @@ import com.personalization.ui.PersonalizationTheme * Text/Light Primary на фоне и Text/Primary без него. * * Кегль, цвет, выравнивание и начертание сторис задаёт админка — всё это свойства, - * пресеты [Size] только стартовые значения. + * пресеты [Size] только стартовые значения. Без своего интерлиньяжа ([lineHeightSp] = `null`) + * берётся высота строки ближайшего по кеглю пресета. */ @InternalPersonalizationUiApi class PersonalizationStoryTextBlock @JvmOverloads constructor( @@ -35,7 +36,15 @@ class PersonalizationStoryTextBlock @JvmOverloads constructor( enum class Size(val textSp: Float, val lineHeightSp: Float) { LARGE(48f, 48f), MEDIUM(30f, 36f), - SMALL(20f, 24f) + SMALL(20f, 24f); + + internal companion object { + /** Пресет, ближайший к кеглю [textSp]. */ + fun nearest(textSp: Float): Size = values().minByOrNull { kotlin.math.abs(it.textSp - textSp) } ?: SMALL + + /** Высота строки пресета, пересчитанная на кегль: 48/48 → 1.0, 30/36 и 20/24 → 1.2. */ + fun lineHeightFor(textSp: Float): Float = nearest(textSp).let { textSp * it.lineHeightSp / it.textSp } + } } enum class Align { START, CENTER, END } @@ -54,7 +63,7 @@ class PersonalizationStoryTextBlock @JvmOverloads constructor( applyStyle() } - /** Интерлиньяж; `null` — по шрифту. */ + /** Интерлиньяж; `null` — высота строки пресета для этого кегля. */ var lineHeightSp: Float? = Size.SMALL.lineHeightSp set(value) { field = value @@ -115,7 +124,8 @@ class PersonalizationStoryTextBlock @JvmOverloads constructor( private fun applyStyle() { setTextSize(TypedValue.COMPLEX_UNIT_SP, textSizeSp) - lineHeightSp?.let { TextViewCompat.setLineHeight(this, spPx(it)) } + // Без своего интерлиньяжа — пресет для кегля: иначе осталась бы высота прошлого кегля. + TextViewCompat.setLineHeight(this, spPx(lineHeightSp ?: Size.lineHeightFor(textSizeSp))) val base = when (fontFamily) { "serif" -> Typeface.SERIF "monospaced", "monospace" -> Typeface.MONOSPACE diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt index 97f0bc53..abcdefc3 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -152,6 +152,6 @@ class PersonalizationStories @JvmOverloads constructor( val loader = imageLoader if (loader != null) loader(view, url) else SearchImages.load(view, url) } - bar.items = stories.map(StoriesMapping::item) + bar.items = stories.map { StoriesMapping.item(it, emptySet()) } } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 15126974..93e44332 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -258,7 +258,7 @@ class PersonalizationStoriesViewer( fun bind(index: Int) { release() storyIndex = index - slideIndex = StoriesMapping.startSlide(story) + slideIndex = StoriesMapping.startSlide(story, emptySet()) showSlide(start = false) } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index a9f3fddf..d4aaddea 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -1,7 +1,12 @@ package com.personalization.ui.widgets +import android.content.Context +import android.content.SharedPreferences import android.graphics.Color +import com.personalization.PreferencesPartition import com.personalization.Product +import com.personalization.SDK +import com.personalization.api.OnApiCallbackListener import com.personalization.stories.models.Slide import com.personalization.stories.models.Story import com.personalization.stories.models.elements.ButtonElement @@ -14,6 +19,8 @@ import com.personalization.ui.components.PersonalizationStoryCover import com.personalization.ui.components.PersonalizationStoryItem import com.personalization.ui.components.PersonalizationStoryPrice import com.personalization.ui.components.PersonalizationStoryTextBlock +import java.math.BigDecimal +import org.json.JSONObject /** * Перевод моделей сторис SDK (те же, что у старого `StoriesView`) в данные компонентов кита. @@ -22,6 +29,13 @@ import com.personalization.ui.components.PersonalizationStoryTextBlock @InternalPersonalizationUiApi internal object StoriesMapping { + /** Длительность слайда, когда админка её не задала или задала 0 (A7). */ + const val DEFAULT_DURATION_MS = 10_000L + + /** Скрим медиа-слайда без текста и товара — 50%, всех остальных — 30% (C3). */ + const val SCRIM_STRONG = 128 + const val SCRIM_LIGHT = 77 + /** Цена товара на слайде: промокод важнее скидки, скидка важнее просто цены. */ data class Price( val type: PersonalizationStoryPrice.Type, @@ -31,26 +45,45 @@ internal object StoriesMapping { val promoCode: String? ) + /** + * Цена товарного слайда (C10). С промокодом крупно — цена по промокоду, зачёркнута + * старая цена, а без неё — обычная, если она отличается. Скидка — процент как есть, + * с дробной частью. Зачёркнутая цена показывается, только если она численно больше. + */ fun price(product: Product): Price { - val old = product.oldPrice.takeIf { it.isNotEmpty() && it != product.price } - val promo = product.promocode.takeIf { it.isNotEmpty() } + val regular = product.priceDecimal ?: Decimals.parse(product.price) + val old = product.oldPrice.takeIf { it.isNotEmpty() } + val oldValue = product.oldPriceDecimal ?: Decimals.parse(product.oldPrice) + val promo = product.promocode.trim().takeIf { it.isNotEmpty() && it != "null" } if (promo != null) { val withPromo = product.priceWithPromocode.takeIf { it.isNotEmpty() } - // Без старой цены зачёркивается обычная: промокод снижает именно её. - val crossed = old ?: product.price.takeIf { withPromo != null && withPromo != it } + val shownValue = if (withPromo != null) { + product.priceWithPromocodeDecimal ?: Decimals.parse(withPromo) + } else { + regular + } + val crossed = when { + old != null && Decimals.greater(oldValue, shownValue) -> old + withPromo != null && Decimals.greater(regular, shownValue) -> product.price + else -> null + } return Price(PersonalizationStoryPrice.Type.PROMO_CODE, withPromo ?: product.price, crossed, null, promo) } - val percent = product.discountPercent.toDoubleOrNull()?.takeIf { it > 0 } + val crossed = old?.takeIf { Decimals.greater(oldValue, regular) } + val percent = Decimals.parse(product.discountPercent)?.takeIf { it.signum() > 0 } if (percent != null) { - val text = if (percent % 1.0 == 0.0) "${percent.toLong()}%" else "$percent%" - return Price(PersonalizationStoryPrice.Type.DISCOUNT, product.price, old, text, null) + val text = percent.stripTrailingZeros().toPlainString() + "%" + return Price(PersonalizationStoryPrice.Type.DISCOUNT, product.price, crossed, text, null) } - return Price(PersonalizationStoryPrice.Type.PRICE, product.price, old, null, null) + return Price(PersonalizationStoryPrice.Type.PRICE, product.price, crossed, null, null) } /** Товар карусели «Используемые товары» → карточка кита. */ fun cardProduct(product: Product): PersonalizationProduct { - val old = product.oldPrice.takeIf { it.isNotEmpty() && it != product.price } + val regular = product.priceDecimal ?: Decimals.parse(product.price) + val old = product.oldPrice.takeIf { + it.isNotEmpty() && Decimals.greater(product.oldPriceDecimal ?: Decimals.parse(it), regular) + } val discount = product.discount.takeIf { old != null && it.isNotEmpty() && it != "0" } ?.let { if (it.endsWith("%")) it else "$it%" } ?.let { if (it.startsWith("-")) it else "-$it" } @@ -65,26 +98,65 @@ internal object StoriesMapping { ) } - /** Состояние обложки: закреплённая остаётся закреплённой и после просмотра. */ - fun item(story: Story): PersonalizationStoryItem { + fun slideIds(story: Story): List = List(story.slidesCount) { story.getSlide(it).id } + + /** Сторис просмотрена: так сказал сервер или видны все её слайды (A3). */ + fun isViewed(story: Story, seen: Set): Boolean = isViewed(slideIds(story), seen, story.isViewed) + + fun isViewed(slideIds: List, seen: Set, serverViewed: Boolean): Boolean = + serverViewed || (slideIds.isNotEmpty() && slideIds.all { it in seen }) + + /** + * С какого слайда открыть сторис (A4): часть слайдов видна — с первого невиденного; + * не видно ничего — с `start_position` сервера; просмотрена — с начала. + */ + fun startSlide(slideIds: List, seen: Set, serverViewed: Boolean, startPosition: Int): Int { + if (slideIds.isEmpty()) return 0 + if (isViewed(slideIds, seen, serverViewed)) return 0 + val firstUnseen = slideIds.indexOfFirst { it !in seen } + if (slideIds.any { it in seen }) return firstUnseen + return startPosition.coerceIn(0, slideIds.lastIndex) + } + + fun startSlide(story: Story, seen: Set): Int = + startSlide(slideIds(story), seen, story.isViewed, story.startPosition) + + /** + * Обложка в ленте (A5). Закреплённая — всегда кольцо Semantic/Warning со звездой; + * просмотренная — сплошное кольцо без сегментов (у закреплённой — сплошное + * предупреждающее). Частично просмотренная — сегмент i отмечен, если виден слайд i. + */ + fun item(story: Story, seen: Set): PersonalizationStoryItem { + val viewed = isViewed(story, seen) val state = when { story.isPinned -> PersonalizationStoryCover.State.PINNED - story.isViewed -> PersonalizationStoryCover.State.VIEWED + viewed -> PersonalizationStoryCover.State.VIEWED else -> PersonalizationStoryCover.State.DEFAULT } + val ids = slideIds(story) return PersonalizationStoryItem( id = story.id.toString(), title = story.name, imageUrl = story.avatar.takeIf { it.isNotEmpty() }, state = state, - segments = story.slidesCount.coerceAtLeast(1), - seenSegments = if (story.isViewed) 0 else story.startPosition.coerceIn(0, story.slidesCount) + segments = if (viewed) 1 else ids.size.coerceAtLeast(1), + seenSegments = if (viewed) emptySet() else ids.indices.filterTo(HashSet()) { ids[it] in seen } ) } - /** С какого слайда открыть: с места, где остановились, если сторис не досмотрена. */ - fun startSlide(story: Story): Int = - if (story.isViewed) 0 else story.startPosition.coerceIn(0, (story.slidesCount - 1).coerceAtLeast(0)) + /** Время слайда из админки; нет или 0 — 10 с (A7). Видео идёт по своей длине (C4). */ + fun durationMs(slide: Slide): Long = + if (slide.adminDurationSeconds > 0) slide.adminDurationSeconds * 1000L else DEFAULT_DURATION_MS + + /** + * Трекаются только целые положительные id (A6): динамические товарные слайды + * приходят с id вида `39_0`, и сервер их не принимает. + */ + fun isTrackable(storyId: Int, slideId: String): Boolean { + if (storyId <= 0) return false + val number = slideId.toLongOrNull() ?: return false + return number > 0 && number.toString() == slideId + } fun product(slide: Slide): ProductElement? = slide.getElements().filterIsInstance().firstOrNull { it.item != null } @@ -95,6 +167,7 @@ internal object StoriesMapping { fun buttons(slide: Slide): List = slide.getElements().filterIsInstance().filter { it.title.isNotBlank() } + /** Пустые текстовые блоки пропускаются (C15). */ fun textBlocks(slide: Slide): List = slide.getElements().filterIsInstance().filter { it.textInput.isNotBlank() } @@ -103,6 +176,37 @@ internal object StoriesMapping { fun isVideo(slide: Slide): Boolean = slide.type == "video" && slide.background.isNotEmpty() + /** Скрим сверху и снизу есть у каждого слайда; 50% — только у голого медиа (C3). */ + fun scrimAlpha(slide: Slide): Int { + val bare = isMedia(slide) && product(slide) == null && textBlocks(slide).isEmpty() + return if (bare) SCRIM_STRONG else SCRIM_LIGHT + } + + /** Поля вокруг вписанного медиа: цвет слайда, без него чёрный (C1). */ + fun letterboxColor(slide: Slide): Int = parseColor(slide.backgroundColor) ?: Color.BLACK + + /** Ссылка товара: сначала диплинк платформы, потом сайт. */ + fun productLink(product: Product): String = product.deeplink.ifEmpty { product.url } + + /** + * Куда ведёт кнопка (C11): своя ссылка (`link_android`, затем `link` — так её уже + * собирает модель), без неё — товар слайда. + */ + fun buttonLink(button: ButtonElement, product: Product?): String = + button.link.ifEmpty { product?.let(::productLink).orEmpty() } + + /** Подпись над промокодом (C9): `title` элемента товара, без него — текст хоста. */ + fun promoCaption(element: ProductElement, fallback: CharSequence): CharSequence = + element.title.trim().ifEmpty { fallback } + + /** Промокод текстового блока (C12); модель отдаёт `"null"` для явного null. */ + fun textPromocode(element: TextBlockElement): String? = + element.promocode?.trim()?.takeIf { it.isNotEmpty() && it != "null" } + + /** Интерлиньяж из админки; без него — `null`, и блок берёт высоту строки пресета. */ + fun lineHeightSp(element: TextBlockElement): Float? = + if (element.textLineSpacing > 0) (element.fontSize * element.textLineSpacing).toFloat() else null + /** Подложка текстового блока: цвет админки с её прозрачностью; 0% — блок без фона. */ fun textBlockColor(element: TextBlockElement): Int? { val opacity = element.textBackgroundColorOpacity.trim().removeSuffix("%").toIntOrNull() ?: 0 @@ -112,7 +216,7 @@ internal object StoriesMapping { return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color)) } - fun textAlign(element: TextBlockElement): PersonalizationStoryTextBlock.Align = when (element.textAlign) { + fun textAlign(element: TextBlockElement): PersonalizationStoryTextBlock.Align = when (element.textAlign.trim().lowercase()) { "center" -> PersonalizationStoryTextBlock.Align.CENTER "right", "end" -> PersonalizationStoryTextBlock.Align.END else -> PersonalizationStoryTextBlock.Align.START @@ -121,3 +225,134 @@ internal object StoriesMapping { fun parseColor(value: String?): Int? = value?.takeIf { it.isNotBlank() }?.let { runCatching { Color.parseColor(it.trim()) }.getOrNull() } } + +/** + * Числа из ответа сервера. Сырые поля (`price`, `oldprice`) — десятичные; если их нет, + * число достаётся из отформатированной строки (`"1 190 900 ₽"`, `"19,99 €"`, + * `"1,190.50 $"`): последний разделитель с одной-двумя цифрами после него — дробный. + */ +internal object Decimals { + + fun greater(left: BigDecimal?, right: BigDecimal?): Boolean = + left != null && right != null && left > right + + fun parse(text: String?): BigDecimal? { + val raw = text?.trim().orEmpty() + if (raw.isEmpty()) return null + raw.toBigDecimalOrNull()?.let { return it } + val kept = raw.filter { it.isDigit() || it == '.' || it == ',' } + if (kept.none { it.isDigit() }) return null + val lastDot = kept.lastIndexOf('.') + val lastComma = kept.lastIndexOf(',') + val separator = when { + lastDot >= 0 && lastComma >= 0 -> maxOf(lastDot, lastComma) + lastDot >= 0 -> lastDot.takeIf { kept.count { it == '.' } == 1 && kept.length - lastDot - 1 in 1..2 } + lastComma >= 0 -> lastComma.takeIf { kept.count { it == ',' } == 1 && kept.length - lastComma - 1 in 1..2 } + else -> null + } + val normalized = buildString { + kept.forEachIndexed { index, char -> + when { + char.isDigit() -> append(char) + index == separator -> append('.') + } + } + } + return normalized.toBigDecimalOrNull() + } +} + +/** Просмотренные слайды: id сторис → id слайдов. */ +internal interface SeenSlides { + fun seen(storyId: Int): Set + fun markSeen(storyId: Int, slideId: String) +} + +/** + * Просмотренные слайды магазина (A2): переживают перезапуск приложения. Свой файл + * SharedPreferences рядом с файлом магазина — то же разбиение, что у SDK + * ([PreferencesPartition.keyFor]); ключ — id сторис, значение — набор id слайдов. + * Лента и просмотр одного магазина делят один экземпляр. + */ +internal class StoriesSeenStore internal constructor(private val preferences: SharedPreferences?) : SeenSlides { + + private val memory = HashMap>() + + @Synchronized + override fun seen(storyId: Int): Set = HashSet(slides(storyId)) + + @Synchronized + override fun markSeen(storyId: Int, slideId: String) { + val slides = slides(storyId) + if (!slides.add(slideId)) return + preferences?.edit()?.putStringSet(key(storyId), HashSet(slides))?.apply() + } + + private fun slides(storyId: Int): MutableSet = memory.getOrPut(storyId) { + HashSet(preferences?.getStringSet(key(storyId), null).orEmpty()) + } + + private fun key(storyId: Int) = "$KEY_PREFIX$storyId" + + companion object { + private const val FILE_SUFFIX = "_stories" + private const val KEY_PREFIX = "seen." + private val stores = HashMap() + + /** Хранилище только в памяти — для просмотра без SDK (витрина, тесты). */ + val local: StoriesSeenStore by lazy { StoriesSeenStore(null) } + + fun forShop(context: Context, shopKey: String): StoriesSeenStore = synchronized(stores) { + stores.getOrPut(shopKey) { + StoriesSeenStore( + context.applicationContext.getSharedPreferences( + PreferencesPartition.keyFor(shopKey) + FILE_SUFFIX, + Context.MODE_PRIVATE + ) + ) + } + } + + fun forSdk(context: Context, sdk: SDK?, requestedShopId: String?): StoriesSeenStore = + if (sdk == null) local else forShop(context, storageKey(sdk, requestedShopId)) + } +} + +/** + * Загрузка сторис-блока для V2. Тот же запрос, что у старого `StoriesView`, но с ошибкой: + * её надо показать хосту, а не крутить скелетон вечно. Ответ — на главном потоке. + */ +internal object StoriesLoader { + + fun load(sdk: SDK, code: String, onLoaded: (List) -> Unit, onFailed: (Int, String?) -> Unit) { + val listener = object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + val stories = try { + parse(response) + } catch (throwable: Throwable) { + MainThread.run { onFailed(ERROR_CODE, "stories/$code: ${throwable.message}") } + return + } + MainThread.run { onLoaded(stories) } + } + + override fun onError(code: Int, msg: String?) { + MainThread.run { onFailed(code, msg) } + } + } + try { + sdk.storiesManager.requestStories(code, listener) + } catch (throwable: Throwable) { + MainThread.run { onFailed(ERROR_CODE, throwable.message) } + } + } + + /** Сторис без слайдов выбрасываются (C16): их нечего показывать. */ + fun parse(response: JSONObject?): List { + val array = response?.optJSONArray("stories") ?: return emptyList() + return List(array.length()) { Story(array.getJSONObject(it)) }.filter { it.slidesCount > 0 } + } + + /** Код ошибки, которая случилась до сервера или без кода HTTP. */ + const val ERROR_CODE = -1 +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt index ed63498f..b3c62843 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -1,15 +1,24 @@ package com.personalization.ui.widgets +import android.content.Context import android.graphics.Color +import androidx.test.core.app.ApplicationProvider import com.personalization.Product +import com.personalization.stories.models.Slide import com.personalization.stories.models.Story +import com.personalization.stories.models.elements.ButtonElement +import com.personalization.stories.models.elements.ProductElement import com.personalization.stories.models.elements.TextBlockElement import com.personalization.ui.components.PersonalizationStoryCover import com.personalization.ui.components.PersonalizationStoryPrice +import com.personalization.ui.components.PersonalizationStoryTextBlock +import java.math.BigDecimal import org.json.JSONArray import org.json.JSONObject import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -20,6 +29,8 @@ import org.robolectric.annotation.Config @Config(sdk = [28]) class StoriesMappingTest { + // --- Price (C10) ---------------------------------------------------------------------------- + @Test fun `a promo code beats the discount and crosses out the regular price`() { val price = StoriesMapping.price( @@ -35,6 +46,27 @@ class StoriesMappingTest { assertEquals("PROMO", price.promoCode) } + @Test + fun `a promo code crosses out the old price when there is one`() { + val price = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "oldprice" to 1500, "oldprice_formatted" to "1 500 ₽", + "promocode" to "PROMO", "price_with_promocode_formatted" to "900 ₽" + ) + ) + assertEquals("1 500 ₽", price.oldPrice) + } + + @Test + fun `a promo code without a promo price shows the regular price and crosses nothing`() { + val price = StoriesMapping.price( + product("price" to 1000, "price_formatted" to "1 000 ₽", "promocode" to "PROMO") + ) + assertEquals("1 000 ₽", price.price) + assertNull(price.oldPrice) + } + @Test fun `a discount percent shows the discount block with the old price`() { val price = StoriesMapping.price( @@ -49,6 +81,12 @@ class StoriesMappingTest { assertEquals("27 990 ₽", price.oldPrice) } + @Test + fun `a fractional discount keeps its fraction`() { + val price = StoriesMapping.price(product("price" to 100, "price_formatted" to "100 ₽", "discount_percent" to 12.5)) + assertEquals("12.5%", price.discount) + } + @Test fun `an old price equal to the price is not shown`() { // The endpoint sends oldprice == price for goods without a markdown. @@ -62,6 +100,35 @@ class StoriesMappingTest { assertNull(price.oldPrice) } + @Test + fun `an old price lower than the price is not shown, compared as decimals`() { + val lower = StoriesMapping.price( + product( + "price" to 99.99, "price_formatted" to "99,99 €", + "oldprice" to 99.5, "oldprice_formatted" to "99,50 €" + ) + ) + assertNull(lower.oldPrice) + // 99.99 > 99.5 only as a decimal: as Ints both are 99. + val higher = StoriesMapping.price( + product( + "price" to 99.5, "price_formatted" to "99,50 €", + "oldprice" to 99.99, "oldprice_formatted" to "99,99 €" + ) + ) + assertEquals("99,99 €", higher.oldPrice) + } + + @Test + fun `formatted prices parse as decimals`() { + assertEquals(BigDecimal("1190900"), Decimals.parse("1 190 900 ₽")) + assertEquals(BigDecimal("19.99"), Decimals.parse("19,99 €")) + assertEquals(BigDecimal("1190.50"), Decimals.parse("$1,190.50")) + assertEquals(BigDecimal("1190"), Decimals.parse("1,190 ₸")) + assertNull(Decimals.parse("₽")) + assertNull(Decimals.parse("")) + } + @Test fun `a carousel product gets a signed discount only with a real markdown`() { val card = StoriesMapping.cardProduct( @@ -72,25 +139,145 @@ class StoriesMappingTest { ) assertEquals("-33%", card.discount) assertEquals("150 ₽", card.oldPrice) + + val same = StoriesMapping.cardProduct( + product("price" to 100, "price_formatted" to "100 ₽", "oldprice" to 100, "oldprice_formatted" to "100 ₽") + ) + assertNull(same.oldPrice) + } + + // --- Seen, start slide and ring (A3, A4, A5) ------------------------------------------------ + + @Test + fun `a story is viewed when the server says so or every slide is seen`() { + val story = story(slides = 2) + assertFalse(StoriesMapping.isViewed(story, setOf("s0"))) + assertTrue(StoriesMapping.isViewed(story, setOf("s0", "s1"))) + assertTrue(StoriesMapping.isViewed(story(viewed = true), emptySet())) + } + + @Test + fun `the start slide is the first unseen, the server position, or the start`() { + assertEquals(2, StoriesMapping.startSlide(story(startPosition = 2, slides = 5), emptySet())) + assertEquals(1, StoriesMapping.startSlide(story(startPosition = 3, slides = 5), setOf("s0", "s2"))) + assertEquals(0, StoriesMapping.startSlide(story(viewed = true, startPosition = 2, slides = 5), emptySet())) + assertEquals(0, StoriesMapping.startSlide(story(slides = 2), setOf("s0", "s1"))) + assertEquals(4, StoriesMapping.startSlide(story(startPosition = 9, slides = 5), emptySet())) + } + + @Test + fun `the ring lights seen slides by index`() { + val item = StoriesMapping.item(story(startPosition = 2, slides = 5), setOf("s1", "s3")) + assertEquals(PersonalizationStoryCover.State.DEFAULT, item.state) + assertEquals(5, item.segments) + assertEquals(setOf(1, 3), item.seenSegments) + } + + @Test + fun `a viewed story has a plain ring, a pinned one stays pinned`() { + val viewed = StoriesMapping.item(story(slides = 3), setOf("s0", "s1", "s2")) + assertEquals(PersonalizationStoryCover.State.VIEWED, viewed.state) + assertEquals(1, viewed.segments) + assertTrue(viewed.seenSegments.isEmpty()) + + val pinnedViewed = StoriesMapping.item(story(pinned = true, viewed = true, slides = 3), emptySet()) + assertEquals(PersonalizationStoryCover.State.PINNED, pinnedViewed.state) + assertEquals(1, pinnedViewed.segments) + assertTrue(pinnedViewed.seenSegments.isEmpty()) + + val pinnedPartly = StoriesMapping.item(story(pinned = true, slides = 3), setOf("s2")) + assertEquals(PersonalizationStoryCover.State.PINNED, pinnedPartly.state) + assertEquals(setOf(2), pinnedPartly.seenSegments) + } + + @Test + fun `seen slides persist per shop`() { + val context = ApplicationProvider.getApplicationContext() + val preferences = context.getSharedPreferences("stories_seen_test", Context.MODE_PRIVATE) + StoriesSeenStore(preferences).markSeen(7, "70") + assertEquals(setOf("70"), StoriesSeenStore(preferences).seen(7)) + assertTrue(StoriesSeenStore(preferences).seen(8).isEmpty()) + + val shopA = StoriesSeenStore.forShop(context, "shop-a") + shopA.markSeen(1, "10") + assertTrue(StoriesSeenStore.forShop(context, "shop-b").seen(1).isEmpty()) + assertEquals(setOf("10"), StoriesSeenStore.forShop(context, "shop-a").seen(1)) } + // --- Tracking, duration (A6, A7) ------------------------------------------------------------ + @Test - fun `the cover state follows pinned and viewed`() { - assertEquals(PersonalizationStoryCover.State.PINNED, StoriesMapping.item(story(pinned = true, viewed = true)).state) - assertEquals(PersonalizationStoryCover.State.VIEWED, StoriesMapping.item(story(viewed = true)).state) - val fresh = StoriesMapping.item(story(startPosition = 2, slides = 5)) - assertEquals(PersonalizationStoryCover.State.DEFAULT, fresh.state) - assertEquals(5, fresh.segments) - assertEquals(2, fresh.seenSegments) + fun `only positive integer ids are tracked`() { + assertTrue(StoriesMapping.isTrackable(40, "36")) + assertFalse(StoriesMapping.isTrackable(39, "39_0")) + assertFalse(StoriesMapping.isTrackable(39, "0")) + assertFalse(StoriesMapping.isTrackable(39, "-3")) + assertFalse(StoriesMapping.isTrackable(39, "036")) + assertFalse(StoriesMapping.isTrackable(0, "36")) } @Test - fun `an unfinished story resumes where it stopped, a viewed one from the start`() { - assertEquals(2, StoriesMapping.startSlide(story(startPosition = 2, slides = 5))) - assertEquals(0, StoriesMapping.startSlide(story(viewed = true, startPosition = 2, slides = 5))) - assertEquals(4, StoriesMapping.startSlide(story(startPosition = 9, slides = 5))) + fun `a slide without a duration runs 10 seconds`() { + assertEquals(10_000L, StoriesMapping.durationMs(slide())) + assertEquals(10_000L, StoriesMapping.durationMs(slide("duration" to 0))) + assertEquals(6_000L, StoriesMapping.durationMs(slide("duration" to 6))) } + // --- Slide look (C1, C3) -------------------------------------------------------------------- + + @Test + fun `only a bare media slide gets the strong scrim`() { + val photo = slide("type" to "image", "background" to "https://x/1.jpg") + assertEquals(StoriesMapping.SCRIM_STRONG, StoriesMapping.scrimAlpha(photo)) + val withText = slide( + "type" to "image", "background" to "https://x/1.jpg", + "elements" to JSONArray().put(JSONObject().put("type", "text_block").put("text_input", "Hi")) + ) + assertEquals(StoriesMapping.SCRIM_LIGHT, StoriesMapping.scrimAlpha(withText)) + val blankText = slide( + "type" to "image", "background" to "https://x/1.jpg", + "elements" to JSONArray().put(JSONObject().put("type", "text_block").put("text_input", " ")) + ) + assertEquals(StoriesMapping.SCRIM_STRONG, StoriesMapping.scrimAlpha(blankText)) + assertEquals(StoriesMapping.SCRIM_LIGHT, StoriesMapping.scrimAlpha(slide())) + } + + @Test + fun `the letterbox takes the slide colour, black without it`() { + assertEquals(Color.parseColor("#112233"), StoriesMapping.letterboxColor(slide("background_color" to "#112233"))) + assertEquals(Color.BLACK, StoriesMapping.letterboxColor(slide("background_color" to ""))) + } + + // --- Links and captions (C9, C11, C12) ------------------------------------------------------ + + @Test + fun `a button opens its own link, without one the product`() { + val product = product("url" to "https://shop/p/1", "deeplink_android" to "app://p/1") + val own = ButtonElement(JSONObject().put("title", "Buy").put("link", "https://web").put("link_android", "app://own")) + assertEquals("app://own", StoriesMapping.buttonLink(own, product)) + val bare = ButtonElement(JSONObject().put("title", "Buy")) + assertEquals("app://p/1", StoriesMapping.buttonLink(bare, product)) + assertEquals("https://shop/p/2", StoriesMapping.buttonLink(bare, product("url" to "https://shop/p/2"))) + assertEquals("", StoriesMapping.buttonLink(bare, null)) + } + + @Test + fun `the promo caption comes from the admin title, else the host text`() { + val titled = ProductElement(JSONObject().put("title", "Ваш код")) + assertEquals("Ваш код", StoriesMapping.promoCaption(titled, "Promo code")) + val blank = ProductElement(JSONObject().put("title", " ")) + assertEquals("Promo code", StoriesMapping.promoCaption(blank, "Promo code")) + } + + @Test + fun `a text block promocode is read, a null one is not`() { + assertEquals("SALE", StoriesMapping.textPromocode(TextBlockElement(JSONObject().put("promocode", " SALE ")))) + assertNull(StoriesMapping.textPromocode(TextBlockElement(JSONObject()))) + assertNull(StoriesMapping.textPromocode(TextBlockElement(JSONObject().put("promocode", JSONObject.NULL)))) + } + + // --- Text blocks (C15) ---------------------------------------------------------------------- + @Test fun `a text block background takes its opacity, zero means no background`() { val half = StoriesMapping.textBlockColor(textBlock("#0087E8", "50%"))!! @@ -100,25 +287,68 @@ class StoriesMappingTest { assertNull(StoriesMapping.textBlockColor(textBlock("not a colour", "100%"))) } + @Test + fun `text alignment maps start, centre and end`() { + fun align(value: String) = StoriesMapping.textAlign(TextBlockElement(JSONObject().put("text_align", value))) + assertEquals(PersonalizationStoryTextBlock.Align.START, align("left")) + assertEquals(PersonalizationStoryTextBlock.Align.START, align("start")) + assertEquals(PersonalizationStoryTextBlock.Align.CENTER, align("center")) + assertEquals(PersonalizationStoryTextBlock.Align.END, align("right")) + assertEquals(PersonalizationStoryTextBlock.Align.END, align("end")) + } + + @Test + fun `a missing line spacing falls back to the preset of that size`() { + assertNull(StoriesMapping.lineHeightSp(TextBlockElement(JSONObject().put("font_size", 20)))) + assertEquals(30f, StoriesMapping.lineHeightSp(TextBlockElement(JSONObject().put("font_size", 20).put("text_line_spacing", 1.5)))!!, 0.01f) + assertEquals(48f, PersonalizationStoryTextBlock.Size.lineHeightFor(48f), 0.01f) + assertEquals(36f, PersonalizationStoryTextBlock.Size.lineHeightFor(30f), 0.01f) + assertEquals(24f, PersonalizationStoryTextBlock.Size.lineHeightFor(20f), 0.01f) + assertEquals(16.8f, PersonalizationStoryTextBlock.Size.lineHeightFor(14f), 0.01f) + } + + // --- Loading (C16) -------------------------------------------------------------------------- + + @Test + fun `stories without slides are dropped`() { + val response = JSONObject().put( + "stories", + JSONArray() + .put(storyJson(id = 1, slides = 2)) + .put(storyJson(id = 2, slides = 0)) + ) + assertEquals(listOf(1), StoriesLoader.parse(response).map { it.id }) + assertTrue(StoriesLoader.parse(null).isEmpty()) + } + private fun product(vararg fields: Pair): Product = Product(JSONObject().apply { fields.forEach { (key, value) -> put(key, value) } }) + private fun slide(vararg fields: Pair): Slide = + Slide(JSONObject().put("id", "1").apply { fields.forEach { (key, value) -> put(key, value) } }) + private fun story( pinned: Boolean = false, viewed: Boolean = false, startPosition: Int = 0, slides: Int = 3 - ): Story = Story( - JSONObject() - .put("id", 1) - .put("name", "Story") - .put("pinned", pinned) - .put("viewed", viewed) - .put("start_position", startPosition) - .put("slides", JSONArray().apply { - repeat(slides) { put(JSONObject().put("id", "s$it").put("elements", JSONArray())) } - }) - ) + ): Story = Story(storyJson(1, slides, pinned, viewed, startPosition)) + + private fun storyJson( + id: Int, + slides: Int, + pinned: Boolean = false, + viewed: Boolean = false, + startPosition: Int = 0 + ): JSONObject = JSONObject() + .put("id", id) + .put("name", "Story") + .put("pinned", pinned) + .put("viewed", viewed) + .put("start_position", startPosition) + .put("slides", JSONArray().apply { + repeat(slides) { put(JSONObject().put("id", "s$it").put("elements", JSONArray())) } + }) private fun textBlock(color: String, opacity: String) = TextBlockElement( JSONObject() From fbfb2ef444a6333000db704ca5385195d4352284 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:19:47 +0400 Subject: [PATCH 06/31] feat(ui): stories v2 viewer state machine Navigation, start slide, pause reasons and the products sheet live in a view-free class covered by unit tests. --- .../ui/widgets/StoriesViewerState.kt | 335 ++++++++++++++++++ .../ui/widgets/StoriesViewerStateTest.kt | 240 +++++++++++++ 2 files changed, 575 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt new file mode 100644 index 00000000..e5fa1007 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt @@ -0,0 +1,335 @@ +package com.personalization.ui.widgets + +/** + * Логика полноэкранного просмотра сторис без вьюх (E1): где мы (сторис и слайд), с какого + * слайда открыть сторис, почему слайд на паузе, сколько он уже идёт, открыта ли шторка. + * + * Вьюер только рисует и передаёт сюда события — касания, тики часов, готовность медиа, + * уход в фон — и выполняет возвращённый [Move]. Сторис, на которую переходим, становится + * текущей, когда пейджер на неё встал ([selectStory]), а начинает идти — когда он + * остановился ([enter]): подсмотренная наполовину страница не считается показанной (A1). + */ +internal class StoriesViewerState( + private val stories: List, + private val seen: SeenSlides, + startStory: Int = 0 +) { + + /** Сторис глазами просмотра. */ + data class StoryShape( + val id: Int, + val slides: List, + val serverViewed: Boolean = false, + val startPosition: Int = 0 + ) + + /** Слайд: id и время из админки (уже с умолчанием A7). */ + data class SlideShape(val id: String, val durationMs: Long) + + /** + * Почему слайд стоит. Часы идут, только когда причин нет; плеер играет и при + * [LOADING] (иначе видео не догрузится), и не играет при остальных. + */ + enum class Pause { + /** Палец держит слайд (B2). */ + HOLD, + + /** Слайд тянут — вниз, чтобы закрыть, или вбок, к соседней сторис (B4). */ + DRAG, + + /** Открыта шторка товаров (B5). */ + SHEET, + + /** Приложение в фоне, окно без фокуса, экран погас (B6). */ + BACKGROUND, + + /** Пауза хоста — `pause()` виджета (B8). */ + HOST, + + /** Медиа ещё не готово или видео подгружается (C4, C5). */ + LOADING, + + /** Медиа не загрузилось — на слайде кнопка «Повторить» (C5). */ + ERROR + } + + /** Зона тапа (B1). */ + enum class Zone { PREVIOUS, CENTER, NEXT } + + /** Откуда идёт время слайда. */ + enum class Clock { + /** Таймер: время из админки. */ + TIMER, + + /** Позиция видео: длина ролика известна (C4). */ + PLAYER + } + + /** Что сделать вьюеру после события. */ + sealed class Move { + /** Ничего не меняется. */ + object None : Move() + + /** Текущий слайд сменился внутри сторис — перерисовать и запустить его. */ + object Slide : Move() + + /** Перейти к сторис [index]: пейджер листает, потом зовёт [selectStory] и [enter]. */ + data class Story(val index: Int) : Move() + + /** Начать текущий слайд сначала — прогресс и видео с нуля (B3). */ + object Restart : Move() + + /** Закрыть шторку товаров, никуда не листая (B5). */ + object CloseSheet : Move() + + /** Закрыть просмотр. */ + object Close : Move() + } + + var storyIndex: Int = startStory.coerceIn(0, (stories.size - 1).coerceAtLeast(0)) + private set + + var slideIndex: Int = 0 + private set + + /** Сторис идёт: пейджер на ней остановился. */ + var entered: Boolean = false + private set + + var sheetOpen: Boolean = false + private set + + private val pauses = HashSet() + + var clock: Clock = Clock.TIMER + private set + + /** Сколько слайд уже идёт, мс. */ + var elapsedMs: Long = 0 + private set + + /** Длина текущего слайда, мс. */ + var durationMs: Long = 0 + private set + + init { + slideIndex = startSlideOf(storyIndex) + resetSlide() + } + + val storyCount: Int get() = stories.size + + val story: StoryShape? get() = stories.getOrNull(storyIndex) + + val slide: SlideShape? get() = story?.slides?.getOrNull(slideIndex) + + val pauseReasons: Set get() = pauses + + /** Часы слайда идут. */ + val isRunning: Boolean get() = entered && slide != null && pauses.isEmpty() + + /** Видео должно играть: всё, кроме подгрузки и ошибки, его останавливает. */ + val playerShouldPlay: Boolean + get() = entered && pauses.none { it != Pause.LOADING && it != Pause.ERROR } + + /** Заполнение текущей полоски прогресса, 0…1. */ + val progress: Float + get() = if (durationMs <= 0) 0f else (elapsedMs.toFloat() / durationMs).coerceIn(0f, 1f) + + fun isPaused(reason: Pause): Boolean = reason in pauses + + /** Слайд, с которого откроется сторис [index] (A4). */ + fun startSlideOf(index: Int): Int { + val shape = stories.getOrNull(index) ?: return 0 + return StoriesMapping.startSlide( + shape.slides.map { it.id }, + seen.seen(shape.id), + shape.serverViewed, + shape.startPosition + ) + } + + /** Пейджер выбрал сторис [index]: она становится текущей и откроется по правилу A4. */ + fun selectStory(index: Int) { + if (index == storyIndex || index !in stories.indices) return + entered = false + storyIndex = index + slideIndex = startSlideOf(index) + resetSlide() + } + + /** + * Пейджер остановился на текущей сторис — она пошла: слайд показан, он просмотрен (A1). + * Возвращает `true`, если слайд только что начался: вьюер трекает `view` и грузит медиа. + */ + fun enter(): Boolean { + if (entered || slide == null) return false + entered = true + startSlide() + return true + } + + /** Сторис ушла с экрана (просмотр закрыт или свёрнут насовсем). */ + fun leave() { + entered = false + } + + fun next(): Move { + val shape = story ?: return away(Move.Close) + return when { + slideIndex + 1 < shape.slides.size -> { + slideIndex++ + startSlide() + Move.Slide + } + storyIndex + 1 < stories.size -> away(Move.Story(storyIndex + 1)) + else -> away(Move.Close) + } + } + + fun previous(): Move = when { + slideIndex > 0 -> { + slideIndex-- + startSlide() + Move.Slide + } + storyIndex > 0 -> away(Move.Story(storyIndex - 1)) + else -> { + // Первый слайд первой сторис начинается заново (B3). + elapsedMs = 0 + Move.Restart + } + } + + /** + * Уходим со сторис: часы стоят, пока пейджер не встанет на соседнюю, — иначе каждый + * следующий тик снова просил бы перейти. + */ + private fun away(move: Move): Move { + entered = false + return move + } + + /** Тап по слайду (B1, B5): при открытой шторке он только закрывает её. */ + fun tap(zone: Zone): Move { + if (sheetOpen) { + setSheet(false) + return Move.CloseSheet + } + return when (zone) { + Zone.PREVIOUS -> previous() + Zone.NEXT -> next() + Zone.CENTER -> Move.None + } + } + + /** Системная «Назад»: сначала шторка, потом просмотр (B5). */ + fun back(): Move { + if (sheetOpen) { + setSheet(false) + return Move.CloseSheet + } + return Move.Close + } + + fun setSheet(open: Boolean) { + sheetOpen = open + setPaused(Pause.SHEET, open) + } + + /** Включить или снять причину паузы. Возвращает `true`, если изменилось, идут ли часы. */ + fun setPaused(reason: Pause, paused: Boolean): Boolean { + val before = isRunning to playerShouldPlay + if (paused) pauses.add(reason) else pauses.remove(reason) + return before != (isRunning to playerShouldPlay) + } + + /** Тик часов: прошло [deltaMs]. Время вышло — следующий слайд. */ + fun tick(deltaMs: Long): Move { + if (!isRunning || clock != Clock.TIMER || deltaMs <= 0) return Move.None + elapsedMs += deltaMs + if (elapsedMs < durationMs) return Move.None + elapsedMs = durationMs + return next() + } + + /** Позиция видео (C4): прогресс идёт за воспроизведением. */ + fun videoPosition(positionMs: Long) { + if (clock != Clock.PLAYER) return + elapsedMs = positionMs.coerceIn(0, durationMs) + } + + /** + * Медиа готово (C5): картинка декодирована, видео играет. [videoDurationMs] — длина + * ролика, если известна: слайд идёт по ней, а не по времени из админки (C4). + */ + fun mediaReady(videoDurationMs: Long? = null) { + if (videoDurationMs != null && videoDurationMs > 0) { + clock = Clock.PLAYER + durationMs = videoDurationMs + } + setPaused(Pause.ERROR, false) + setPaused(Pause.LOADING, false) + } + + /** Видео встало на подгрузку и снова пошло (C4). */ + fun buffering(active: Boolean) { + setPaused(Pause.LOADING, active) + } + + /** Медиа не загрузилось или не успело за 10 с (C5). */ + fun mediaFailed() { + setPaused(Pause.LOADING, false) + setPaused(Pause.ERROR, true) + } + + /** «Повторить»: слайд грузится заново с нуля. */ + fun retry() { + resetClock() + setPaused(Pause.ERROR, false) + setPaused(Pause.LOADING, true) + } + + /** Видео доиграло — слайд закончился (C4). */ + fun mediaEnded(): Move = if (entered) next() else Move.None + + val hasError: Boolean get() = Pause.ERROR in pauses + + /** Новый текущий слайд: шторка закрыта, время с нуля, медиа ещё грузится; он просмотрен. */ + private fun startSlide() { + resetSlide() + val shape = story ?: return + val current = slide ?: return + seen.markSeen(shape.id, current.id) + } + + private fun resetSlide() { + sheetOpen = false + pauses.remove(Pause.SHEET) + pauses.remove(Pause.ERROR) + pauses.add(Pause.LOADING) + resetClock() + } + + private fun resetClock() { + clock = Clock.TIMER + elapsedMs = 0 + durationMs = slide?.durationMs ?: StoriesMapping.DEFAULT_DURATION_MS + } + + companion object { + /** + * Зона тапа по трети ширины (B1): левая — назад, правая — вперёд, середина — ничего. + * В RTL края меняются местами. + */ + fun zone(x: Float, width: Int, rtl: Boolean): Zone { + if (width <= 0) return Zone.CENTER + val third = width / 3f + return when { + x < third -> if (rtl) Zone.NEXT else Zone.PREVIOUS + x > width - third -> if (rtl) Zone.PREVIOUS else Zone.NEXT + else -> Zone.CENTER + } + } + } +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt new file mode 100644 index 00000000..3733c10e --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt @@ -0,0 +1,240 @@ +package com.personalization.ui.widgets + +import com.personalization.ui.widgets.StoriesViewerState.Move +import com.personalization.ui.widgets.StoriesViewerState.Pause +import com.personalization.ui.widgets.StoriesViewerState.SlideShape +import com.personalization.ui.widgets.StoriesViewerState.StoryShape +import com.personalization.ui.widgets.StoriesViewerState.Zone +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +/** The viewer's navigation, pause and seen logic, without any view. */ +class StoriesViewerStateTest { + + private val seen = MemorySeen() + + @Test + fun `a fresh story opens at the server start position and is not seen until it settles`() { + val state = state(story(1, slides = 3, startPosition = 1)) + assertEquals(1, state.slideIndex) + assertTrue(seen.seen(1).isEmpty()) + + assertTrue(state.enter()) + assertEquals(setOf("1_1"), seen.seen(1)) + // Entering twice (adapter bind + page settle) starts the slide once. + assertFalse(state.enter()) + } + + @Test + fun `a partly seen story opens at its first unseen slide, a viewed one at the start`() { + seen.markSeen(1, "1_0") + seen.markSeen(1, "1_2") + assertEquals(1, state(story(1, slides = 4, startPosition = 3)).slideIndex) + + listOf("1_1", "1_3").forEach { seen.markSeen(1, it) } + assertEquals(0, state(story(1, slides = 4, startPosition = 3)).slideIndex) + assertEquals(0, state(story(2, slides = 4, startPosition = 3, viewed = true)).slideIndex) + } + + @Test + fun `the start position is clamped to the slides`() { + assertEquals(2, state(story(1, slides = 3, startPosition = 9)).slideIndex) + } + + @Test + fun `tap zones are thirds, the centre does nothing and RTL mirrors the edges`() { + assertEquals(Zone.PREVIOUS, StoriesViewerState.zone(10f, 300, rtl = false)) + assertEquals(Zone.CENTER, StoriesViewerState.zone(150f, 300, rtl = false)) + assertEquals(Zone.NEXT, StoriesViewerState.zone(290f, 300, rtl = false)) + assertEquals(Zone.NEXT, StoriesViewerState.zone(10f, 300, rtl = true)) + assertEquals(Zone.PREVIOUS, StoriesViewerState.zone(290f, 300, rtl = true)) + + val state = entered(story(1, slides = 3)) + assertEquals(Move.None, state.tap(Zone.CENTER)) + assertEquals(0, state.slideIndex) + } + + @Test + fun `next walks the slides, then the stories, then closes`() { + val state = entered(story(1, slides = 2), story(2, slides = 1)) + assertEquals(Move.Slide, state.tap(Zone.NEXT)) + assertEquals(1, state.slideIndex) + assertEquals(Move.Story(1), state.tap(Zone.NEXT)) + // Leaving the story stops its clock until the pager settles on the next one. + assertFalse(state.isRunning) + + state.selectStory(1) + state.enter() + assertEquals(Move.Close, state.next()) + } + + @Test + fun `previous on the first slide of the first story restarts it`() { + val state = entered(story(1, slides = 2)) + state.mediaReady() + state.tick(1500) + assertEquals(Move.Restart, state.previous()) + assertEquals(0, state.slideIndex) + assertEquals(0L, state.elapsedMs) + assertTrue(state.isRunning) + } + + @Test + fun `previous on the first slide of a later story goes back a story`() { + val state = entered(story(1, slides = 2), story(2, slides = 2), start = 1) + assertEquals(Move.Story(0), state.previous()) + } + + @Test + fun `swiping back into a story applies the start rule`() { + val state = entered(story(1, slides = 3), story(2, slides = 2)) + state.next() + state.selectStory(1) + state.enter() + state.selectStory(0) + // Slides 0 and 1 of the first story were seen: it reopens at slide 2. + assertEquals(2, state.slideIndex) + assertFalse(state.entered) + } + + @Test + fun `the clock runs only when the media is ready and nothing pauses it`() { + val state = entered(story(1, slides = 2, durationMs = 5000)) + assertTrue(state.isPaused(Pause.LOADING)) + assertEquals(Move.None, state.tick(6000)) + assertEquals(0L, state.elapsedMs) + + state.mediaReady() + state.tick(2000) + assertEquals(0.4f, state.progress, 0.001f) + + for (reason in listOf(Pause.HOLD, Pause.DRAG, Pause.SHEET, Pause.BACKGROUND, Pause.HOST)) { + assertTrue(state.setPaused(reason, true)) + assertEquals(Move.None, state.tick(10_000)) + assertTrue(state.setPaused(reason, false)) + } + assertEquals(2000L, state.elapsedMs) + + assertEquals(Move.Slide, state.tick(3000)) + assertEquals(1, state.slideIndex) + } + + @Test + fun `a background pause survives a slide change`() { + val state = entered(story(1, slides = 3)) + state.mediaReady() + state.setPaused(Pause.BACKGROUND, true) + state.next() + state.mediaReady() + assertFalse(state.isRunning) + state.setPaused(Pause.BACKGROUND, false) + assertTrue(state.isRunning) + } + + @Test + fun `the player keeps playing while loading but stops for a hold`() { + val state = entered(story(1, slides = 1)) + assertTrue(state.playerShouldPlay) + state.buffering(true) + assertTrue(state.playerShouldPlay) + assertFalse(state.isRunning) + state.setPaused(Pause.HOLD, true) + assertFalse(state.playerShouldPlay) + } + + @Test + fun `a video slide follows the player and ends with the video`() { + val state = entered(story(1, slides = 2, durationMs = 10_000)) + state.mediaReady(videoDurationMs = 30_000) + assertEquals(StoriesViewerState.Clock.PLAYER, state.clock) + // Timer ticks do not move a video slide: only the playback position does. + assertEquals(Move.None, state.tick(20_000)) + state.videoPosition(15_000) + assertEquals(0.5f, state.progress, 0.001f) + assertEquals(Move.Slide, state.mediaEnded()) + } + + @Test + fun `a video of unknown length falls back to the admin duration`() { + val state = entered(story(1, slides = 2, durationMs = 4000)) + state.mediaReady(videoDurationMs = null) + assertEquals(StoriesViewerState.Clock.TIMER, state.clock) + assertEquals(Move.Slide, state.tick(4000)) + } + + @Test + fun `a failed media pauses the slide until retried`() { + val state = entered(story(1, slides = 2)) + state.mediaFailed() + assertTrue(state.hasError) + assertFalse(state.isRunning) + assertEquals(Move.None, state.tick(60_000)) + + state.retry() + assertFalse(state.hasError) + assertTrue(state.isPaused(Pause.LOADING)) + state.mediaReady() + assertTrue(state.isRunning) + } + + @Test + fun `an open sheet blocks taps, closes on a tap or back, and resets on a slide change`() { + val state = entered(story(1, slides = 3)) + state.mediaReady() + state.setSheet(true) + assertFalse(state.isRunning) + + assertEquals(Move.CloseSheet, state.tap(Zone.NEXT)) + assertEquals(0, state.slideIndex) + assertFalse(state.sheetOpen) + assertTrue(state.isRunning) + + state.setSheet(true) + assertEquals(Move.CloseSheet, state.back()) + assertEquals(Move.Close, state.back()) + + state.setSheet(true) + state.next() + assertFalse(state.sheetOpen) + assertFalse(state.isPaused(Pause.SHEET)) + } + + @Test + fun `the time is up only once per slide`() { + val state = entered(story(1, slides = 1), story(2, slides = 1)) + state.mediaReady() + assertEquals(Move.Story(1), state.tick(StoriesMapping.DEFAULT_DURATION_MS)) + assertEquals(Move.None, state.tick(16)) + } + + @Test + fun `a story without slides does not crash the state`() { + val state = StoriesViewerState(listOf(StoryShape(1, emptyList())), seen) + assertFalse(state.enter()) + assertEquals(Move.Close, state.next()) + assertEquals(Move.None, state.tick(1000)) + } + + private fun state(vararg stories: StoryShape, start: Int = 0) = StoriesViewerState(stories.toList(), seen, start) + + private fun entered(vararg stories: StoryShape, start: Int = 0) = + state(*stories, start = start).also { it.enter() } + + private fun story( + id: Int, + slides: Int, + startPosition: Int = 0, + viewed: Boolean = false, + durationMs: Long = StoriesMapping.DEFAULT_DURATION_MS + ) = StoryShape(id, List(slides) { SlideShape("${id}_$it", durationMs) }, viewed, startPosition) + + private class MemorySeen : SeenSlides { + private val map = HashMap>() + override fun seen(storyId: Int): Set = map[storyId].orEmpty() + override fun markSeen(storyId: Int, slideId: String) { + map.getOrPut(storyId) { HashSet() }.add(slideId) + } + } +} From 41d5eea1bf62391bff43a4389a72da62c4be64e4 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:19:52 +0400 Subject: [PATCH 07/31] feat(ui): stories v2 video cache, audio focus and texts A 50 MB LRU cache shared by every viewer with next-slide preloading, audio focus taken only while the sound is on, and the block texts as string resources with a Russian translation. --- .../ui/widgets/StoriesMedia.kt | 146 ++++++++++++++++++ .../src/main/res/values-ru/strings.xml | 13 +- .../src/main/res/values/strings.xml | 11 ++ 3 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt new file mode 100644 index 00000000..6eaed58c --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt @@ -0,0 +1,146 @@ +package com.personalization.ui.widgets + +import android.content.Context +import android.media.AudioAttributes +import android.media.AudioFocusRequest +import android.media.AudioManager +import android.net.Uri +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.media3.common.util.UnstableApi +import androidx.media3.database.StandaloneDatabaseProvider +import androidx.media3.datasource.DataSpec +import androidx.media3.datasource.DefaultDataSource +import androidx.media3.datasource.DefaultHttpDataSource +import androidx.media3.datasource.cache.CacheDataSource +import androidx.media3.datasource.cache.CacheWriter +import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor +import androidx.media3.datasource.cache.SimpleCache +import androidx.media3.exoplayer.source.DefaultMediaSourceFactory +import androidx.media3.exoplayer.source.MediaSource +import com.personalization.SDK +import java.io.File +import java.util.concurrent.Executors + +/** + * Дисковый кэш видео сторис V2 (C6): LRU на 50 МБ в `cacheDir/personalization_stories`, + * один на процесс — его делят все просмотры. Старые сторис держат свой кэш в другой папке: + * две `SimpleCache` на одной папке не уживаются. + * + * Чтение идёт с [CacheDataSource.FLAG_BLOCK_ON_CACHE]: пока предзагрузка качает начало + * ролика, плеер ждёт её, а не тянет те же байты второй раз. + */ +@androidx.annotation.OptIn(markerClass = [UnstableApi::class]) +internal object StoriesMediaCache { + + private const val FOLDER = "personalization_stories" + private const val MAX_BYTES = 50L * 1024 * 1024 + + /** Сколько начала ролика качать заранее: хватает на первые секунды. */ + private const val PRELOAD_BYTES = 1024L * 1024 + + private var cache: SimpleCache? = null + private val preloading = HashSet() + private val executor = Executors.newSingleThreadExecutor { runnable -> + Thread(runnable, "personalization-stories-preload").apply { isDaemon = true } + } + + @Synchronized + private fun cache(context: Context): SimpleCache = cache ?: SimpleCache( + File(context.applicationContext.cacheDir, FOLDER), + LeastRecentlyUsedCacheEvictor(MAX_BYTES), + StandaloneDatabaseProvider(context.applicationContext) + ).also { cache = it } + + private fun dataSourceFactory(context: Context): CacheDataSource.Factory { + val http = DefaultHttpDataSource.Factory() + .setUserAgent(SDK.userAgent()) + .setAllowCrossProtocolRedirects(true) + return CacheDataSource.Factory() + .setCache(cache(context)) + .setUpstreamDataSourceFactory(DefaultDataSource.Factory(context.applicationContext, http)) + .setFlags(CacheDataSource.FLAG_BLOCK_ON_CACHE or CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR) + } + + /** Источник для плеера: сеть через кэш. */ + fun mediaSourceFactory(context: Context): MediaSource.Factory = + DefaultMediaSourceFactory(dataSourceFactory(context)) + + /** Начало ролика — в кэш заранее, чтобы следующий слайд пошёл сразу. Дубли не качаются. */ + fun preloadVideo(context: Context, url: String) { + if (!url.startsWith("http")) return + synchronized(preloading) { if (!preloading.add(url)) return } + val factory = dataSourceFactory(context) + executor.execute { + try { + val spec = DataSpec.Builder().setUri(Uri.parse(url)).setLength(PRELOAD_BYTES).build() + CacheWriter(factory.createDataSourceForDownloading(), spec, null, null).cache() + } catch (_: Throwable) { + // Предзагрузка — только ускорение: не вышло — ролик докачается при показе. + } finally { + synchronized(preloading) { preloading.remove(url) } + } + } + } +} + +/** + * Аудиофокус видео сторис (C7). Пока звук выключен, фокус не берётся — музыка других + * приложений играет дальше. Включённый звук берёт временный фокус: чужой плеер встаёт + * на паузу и сам продолжит, когда просмотр отдаст фокус (выключил звук, закрыл). + * Потеря фокуса (звонок, другой плеер) выключает звук — [onLoss]. + */ +internal class StoriesAudioFocus(context: Context, private val onLoss: () -> Unit) { + + private val audioManager = context.applicationContext.getSystemService(Context.AUDIO_SERVICE) as? AudioManager + private var held = false + private var request: Any? = null + + private val listener = AudioManager.OnAudioFocusChangeListener { change -> + if (change == AudioManager.AUDIOFOCUS_LOSS || change == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) { + abandon() + onLoss() + } + } + + fun request() { + val manager = audioManager ?: return + if (held) return + held = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + Api26.request(manager, listener).also { request = it.second }.first + } else { + @Suppress("DEPRECATION") + manager.requestAudioFocus(listener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT) == + AudioManager.AUDIOFOCUS_REQUEST_GRANTED + } + } + + fun abandon() { + val manager = audioManager ?: return + if (!held) return + held = false + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + (request as? AudioFocusRequest)?.let { manager.abandonAudioFocusRequest(it) } + } else { + @Suppress("DEPRECATION") + manager.abandonAudioFocus(listener) + } + request = null + } + + @RequiresApi(Build.VERSION_CODES.O) + private object Api26 { + fun request(manager: AudioManager, listener: AudioManager.OnAudioFocusChangeListener): Pair { + val request = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT) + .setAudioAttributes( + AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_MEDIA) + .setContentType(AudioAttributes.CONTENT_TYPE_MOVIE) + .build() + ) + .setOnAudioFocusChangeListener(listener) + .build() + return (manager.requestAudioFocus(request) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) to request + } + } +} diff --git a/personalization-sdk/src/main/res/values-ru/strings.xml b/personalization-sdk/src/main/res/values-ru/strings.xml index cac0144c..db5ab33c 100644 --- a/personalization-sdk/src/main/res/values-ru/strings.xml +++ b/personalization-sdk/src/main/res/values-ru/strings.xml @@ -14,4 +14,15 @@ Invalid notification data. Notifications are already enabled - \ No newline at end of file + + Промокод + Скопировано + Подробнее + Используемые товары + Скрыть товары + Повторить + Закрыть + Звук включён + Звук выключен + + diff --git a/personalization-sdk/src/main/res/values/strings.xml b/personalization-sdk/src/main/res/values/strings.xml index 441ddf8b..4fc649fa 100644 --- a/personalization-sdk/src/main/res/values/strings.xml +++ b/personalization-sdk/src/main/res/values/strings.xml @@ -26,4 +26,15 @@ Invalid notification data. Notifications are already enabled + + Promo code + Copied + More info + Used products + Hide products + Retry + Close + Sound on + Sound off + From cae96985249d6d039b64b1ef3794999e9f0f4ee2 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:25:58 +0400 Subject: [PATCH 08/31] feat(ui): stories v2 viewer on the state machine The slide clock runs on Choreographer frames, so the animation scale no longer races through slides; the viewer pauses on background, focus loss, holds, drags and the open products sheet. Media is fitted with a letterbox, waits until ready (Retry after 10 s or a failure, videos retry themselves), videos run for their real length from the shared cache, sound is off by default, kept for the process and turned on by the volume key. Product slides keep their buttons, carousel and sound, text-block promo codes copy, controls respect system bars and cutouts. The widget takes V1's OnClickListener, forwards every text, gives up after 15 s with onError, opens by index or story id, pauses and resumes the viewer, and PersonalizationStories.show() opens a block without the bar. --- .../personalization/demo/StoriesV2Showcase.kt | 9 +- .../ui/widgets/PersonalizationStories.kt | 251 +++- .../widgets/PersonalizationStoriesViewer.kt | 1202 +++++++++-------- .../ui/widgets/StoriesViewerViews.kt | 279 ++++ .../ui/widgets/StorySlideContent.kt | 80 ++ .../ui/widgets/StorySlideView.kt | 302 +++++ 6 files changed, 1501 insertions(+), 622 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt index b657ac22..e3cda92b 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -124,11 +124,12 @@ private fun Context.sampleStories(): View { bar.imageLoader = { view, url -> Glide.with(view).load(url).into(view) } bar.onItemClick = { index, _ -> PersonalizationStoriesViewer(this, stories, index).apply { - onLinkClick = { link -> - toast("Link: $link") - true + onClickListener = object : com.personalization.OnClickListener { + override fun onClick(url: String): Boolean { + toast("Link: $url") + return false + } } - onStoryProgress = { render() } setOnDismissListener { render() } show() } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt index abcdefc3..bb79bd6f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -6,10 +6,10 @@ import android.view.View import android.widget.FrameLayout import android.widget.ImageView import com.personalization.Cancellable -import com.personalization.Product + import com.personalization.R -import com.personalization.SDK import com.personalization.Rees46 +import com.personalization.SDK import com.personalization.stories.models.Story import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationStoriesBar @@ -17,15 +17,17 @@ import com.personalization.ui.components.PersonalizationStoriesBar /** * Сторис (V2) с данными SDK: лента обложек и полноэкранный просмотр на компонентах кита. * - * Паттерн Stories из Figma (страница 1:32): «сторис-бар + фулскрин-вьюер, - * источник — сторис-блок по code». Блок грузится тем же запросом, что у старого - * `StoriesView` (`stories/{code}`), — старый виджет остаётся как есть. + * Паттерн Stories из Figma (страница 1:32): «сторис-бар + фулскрин-вьюер, источник — + * сторис-блок по code». Блок грузится тем же запросом, что у старого `StoriesView` + * (`stories/{code}`), — старый виджет остаётся как есть. * * Инстанс SDK: [shopId] (атрибут `app:shop_id`) выбирает магазин при нескольких * зарегистрированных; без него берётся единственный. Резолв — при показе через * [Rees46.awaitInstance]; явный инстанс можно передать в [attach]. * - * Пока блок грузится — скелетон; пустой блок прячет виджет целиком. + * Пока блок грузится — скелетон. Пустой блок, ошибка загрузки, пустой [code], + * неоднозначный магазин или 15 с без ответа прячут виджет и зовут [onError]. + * Управление из кода — [open], [openStory], [pause], [resume]; без ленты — [show]. */ @InternalPersonalizationUiApi class PersonalizationStories @JvmOverloads constructor( @@ -46,16 +48,23 @@ class PersonalizationStories @JvmOverloads constructor( /** Загрузчик картинок; `null` — Glide из SDK. */ var imageLoader: ((ImageView, String) -> Unit)? = null - /** Переход по ссылке; `true` — хост обработал сам. См. [PersonalizationStoriesViewer.onLinkClick]. */ - var onLinkClick: ((String) -> Boolean)? = null + /** Клики по ссылкам и товарам — контракт старых сторис ([com.personalization.OnClickListener]). */ + var onClickListener: com.personalization.OnClickListener? = null - var onProductClick: ((Product) -> Unit)? = null + /** Блок не загрузился: код ошибки (HTTP или -1) и сообщение. Виджет при этом скрыт. */ var onError: ((code: Int, message: String?) -> Unit)? = null - var promoCaption: CharSequence = "Promo code" - var promoCopiedText: CharSequence = "Copied" + var promoCaption: CharSequence + var promoCopiedText: CharSequence + var productButtonText: CharSequence + var showProductsText: CharSequence + var hideProductsText: CharSequence + var retryText: CharSequence + var closeLabel: CharSequence + var soundOnLabel: CharSequence + var soundOffLabel: CharSequence - /** Загруженные сторис — в порядке сервера. */ + /** Загруженные сторис — в порядке сервера, без пустых. */ var stories: List = emptyList() private set @@ -63,8 +72,20 @@ class PersonalizationStories @JvmOverloads constructor( private var instanceHandle: Cancellable? = null private var viewer: PersonalizationStoriesViewer? = null private var requestSeq = 0 + private var pendingOpen: (() -> Unit)? = null + private val giveUp = Runnable { fail(StoriesLoader.ERROR_CODE, "stories: no response in ${LOAD_TIMEOUT_MS / 1000} s") } init { + val defaults = StoriesTexts.defaults(context) + promoCaption = defaults.promoCaption + promoCopiedText = defaults.promoCopiedText + productButtonText = defaults.productButtonText + showProductsText = defaults.showProductsText + hideProductsText = defaults.hideProductsText + retryText = defaults.retryText + closeLabel = defaults.closeLabel + soundOnLabel = defaults.soundOnLabel + soundOffLabel = defaults.soundOffLabel attrs?.let { val array = context.obtainStyledAttributes(it, R.styleable.PersonalizationStories) code = array.getString(R.styleable.PersonalizationStories_code) @@ -73,6 +94,8 @@ class PersonalizationStories @JvmOverloads constructor( } addView(bar, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) bar.onItemClick = { index, _ -> open(index) } + // Загрузчик ставится один раз: каждая установка перерисовывает ленту. + bar.imageLoader = { view, url -> imageLoader?.invoke(view, url) ?: SearchImages.load(view, url) } bar.showSkeleton() } @@ -86,35 +109,41 @@ class PersonalizationStories @JvmOverloads constructor( /** Перезагрузить блок [code]. */ fun reload() { - val sdk = sdk ?: return - val blockCode = code?.takeIf { it.isNotEmpty() } ?: run { - SDK.error("PersonalizationStories: code is not set") + val blockCode = code?.takeIf { it.isNotBlank() } ?: run { + fail(StoriesLoader.ERROR_CODE, "PersonalizationStories: code is not set") return } + val sdk = sdk ?: return val seq = ++requestSeq - if (stories.isEmpty()) bar.showSkeleton() - sdk.storiesManager.loadStories(blockCode) { loaded -> - MainThread.run { - if (seq != requestSeq) return@run - stories = loaded - render() - } + if (stories.isEmpty()) { + visibility = View.VISIBLE + bar.showSkeleton() } + startGiveUp() + StoriesLoader.load( + sdk, + blockCode, + onLoaded = { loaded -> + if (seq == requestSeq) { + removeCallbacks(giveUp) + stories = loaded + render() + pendingOpen?.also { pendingOpen = null }?.invoke() + } + }, + onFailed = { code, message -> if (seq == requestSeq) fail(code, message) } + ) } - /** Открыть просмотр с сторис [index]. */ + /** Открыть просмотр со сторис [index]. До загрузки блока — откроется, когда он придёт. */ fun open(index: Int) { + if (stories.isEmpty()) { + pendingOpen = { open(index) } + return + } if (index !in stories.indices) return viewer?.dismiss() - viewer = PersonalizationStoriesViewer(context, stories, index).also { viewer -> - viewer.code = code - viewer.sdk = sdk - viewer.imageLoader = imageLoader - viewer.onLinkClick = onLinkClick - viewer.onProductClick = onProductClick - viewer.promoCaption = promoCaption - viewer.promoCopiedText = promoCopiedText - viewer.onStoryProgress = { render() } + viewer = newViewer(context, stories, index).also { viewer -> viewer.setOnDismissListener { if (this.viewer === viewer) this.viewer = null render() @@ -123,16 +152,35 @@ class PersonalizationStories @JvmOverloads constructor( } } + /** Открыть просмотр со сторис с id [storyId]. */ + fun openStory(storyId: Int) { + if (stories.isEmpty()) { + pendingOpen = { openStory(storyId) } + return + } + stories.indexOfFirst { it.id == storyId }.takeIf { it >= 0 }?.let(::open) + } + + /** Пауза открытого просмотра (B8). */ + fun pause() { + viewer?.pause() + } + + fun resume() { + viewer?.resume() + } + override fun onAttachedToWindow() { super.onAttachedToWindow() - if (sdk != null) return + if (sdk != null || stories.isNotEmpty()) return + startGiveUp() instanceHandle = try { Rees46.awaitInstance(shopId) { resolved -> MainThread.run { attach(resolved) } } } catch (throwable: Throwable) { - SDK.error( - "PersonalizationStories: cannot resolve an SDK for shopId=$shopId — " + - "set app:shop_id to pick a shop when several are registered.", - throwable + fail( + StoriesLoader.ERROR_CODE, + "PersonalizationStories: cannot resolve an SDK for shopId=$shopId — set app:shop_id " + + "to pick a shop when several are registered. ${throwable.message}" ) null } @@ -141,17 +189,138 @@ class PersonalizationStories @JvmOverloads constructor( override fun onDetachedFromWindow() { instanceHandle?.cancel() instanceHandle = null + removeCallbacks(giveUp) viewer?.dismiss() viewer = null super.onDetachedFromWindow() } + private fun startGiveUp() { + removeCallbacks(giveUp) + postDelayed(giveUp, LOAD_TIMEOUT_MS) + } + + /** Ошибка: поздний ответ уже не нужен, пустой блок прячется, хост узнаёт. */ + private fun fail(code: Int, message: String?) { + removeCallbacks(giveUp) + requestSeq++ + instanceHandle?.cancel() + instanceHandle = null + pendingOpen = null + SDK.error("PersonalizationStories: $code $message") + if (stories.isEmpty()) visibility = View.GONE + onError?.invoke(code, message) + } + private fun render() { visibility = if (stories.isEmpty()) View.GONE else View.VISIBLE - bar.imageLoader = { view, url -> - val loader = imageLoader - if (loader != null) loader(view, url) else SearchImages.load(view, url) + val seen = StoriesSeenStore.forSdk(context, sdk, shopId) + bar.items = stories.map { StoriesMapping.item(it, seen.seen(it.id)) } + } + + private fun texts() = StoriesTexts( + promoCaption, promoCopiedText, productButtonText, showProductsText, hideProductsText, + retryText, closeLabel, soundOnLabel, soundOffLabel + ) + + private fun newViewer(context: Context, stories: List, index: Int) = + PersonalizationStoriesViewer(context, stories, index).also { viewer -> + viewer.code = code + viewer.sdk = sdk + viewer.shopId = shopId + viewer.imageLoader = imageLoader + viewer.onClickListener = this@PersonalizationStories.onClickListener + viewer.applyTexts(texts()) + } + + companion object { + /** Сколько ждать блок, прежде чем сдаться и спрятать виджет. */ + internal const val LOAD_TIMEOUT_MS = 15_000L + + /** + * Показать сторис блока [code] без ленты (B8): загрузить блок и открыть просмотр + * со сторис [startStoryId] (или с первой). SDK — [sdk], иначе инстанс магазина + * [shopId]. Тексты `null` — по умолчанию из ресурсов. Ошибки — в [onError]. + * Возвращает отмену ещё не открытого показа. + */ + @JvmStatic + @JvmOverloads + fun show( + context: Context, + code: String, + sdk: SDK? = null, + shopId: String? = null, + startStoryId: Int? = null, + onClickListener: com.personalization.OnClickListener? = null, + onError: ((code: Int, message: String?) -> Unit)? = null, + imageLoader: ((ImageView, String) -> Unit)? = null, + promoCaption: CharSequence? = null, + promoCopiedText: CharSequence? = null, + productButtonText: CharSequence? = null, + showProductsText: CharSequence? = null, + hideProductsText: CharSequence? = null, + retryText: CharSequence? = null, + closeLabel: CharSequence? = null, + soundOnLabel: CharSequence? = null, + soundOffLabel: CharSequence? = null + ): Cancellable { + val widget = PersonalizationStories(context).also { widget -> + widget.code = code + widget.shopId = shopId + widget.onClickListener = onClickListener + widget.onError = onError + widget.imageLoader = imageLoader + promoCaption?.let { widget.promoCaption = it } + promoCopiedText?.let { widget.promoCopiedText = it } + productButtonText?.let { widget.productButtonText = it } + showProductsText?.let { widget.showProductsText = it } + hideProductsText?.let { widget.hideProductsText = it } + retryText?.let { widget.retryText = it } + closeLabel?.let { widget.closeLabel = it } + soundOnLabel?.let { widget.soundOnLabel = it } + soundOffLabel?.let { widget.soundOffLabel = it } + } + return widget.showDetached(sdk, startStoryId) + } + } + + /** + * Показ без ленты: виджет не на экране, поэтому SDK и таймаут ведутся вручную, + * а просмотр открывается, как только блок пришёл. + */ + private fun showDetached(explicitSdk: SDK?, startStoryId: Int?): Cancellable { + val handler = android.os.Handler(android.os.Looper.getMainLooper()) + handler.postDelayed(giveUp, LOAD_TIMEOUT_MS) + pendingOpen = open@{ + handler.removeCallbacks(giveUp) + if (stories.isEmpty()) { + onError?.invoke(StoriesLoader.ERROR_CODE, "PersonalizationStories.show: block $code is empty") + return@open + } + val index = startStoryId?.let { id -> stories.indexOfFirst { it.id == id } }?.takeIf { it >= 0 } ?: 0 + newViewer(context, stories, index).show() + } + val previousError = onError + onError = { code, message -> + handler.removeCallbacks(giveUp) + previousError?.invoke(code, message) + } + if (explicitSdk != null) { + attach(explicitSdk) + } else { + instanceHandle = try { + Rees46.awaitInstance(shopId) { resolved -> MainThread.run { attach(resolved) } } + } catch (throwable: Throwable) { + fail(StoriesLoader.ERROR_CODE, "PersonalizationStories.show: cannot resolve an SDK for shopId=$shopId. ${throwable.message}") + null + } + } + return Cancellable { + handler.removeCallbacks(giveUp) + requestSeq++ + pendingOpen = null + instanceHandle?.cancel() + instanceHandle = null } - bar.items = stories.map { StoriesMapping.item(it, emptySet()) } } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 93e44332..b5d675ca 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -1,735 +1,783 @@ package com.personalization.ui.widgets -import android.animation.Animator -import android.animation.AnimatorListenerAdapter -import android.animation.ValueAnimator -import android.annotation.SuppressLint import android.app.Dialog -import android.content.ActivityNotFoundException import android.content.Context -import android.content.Intent +import android.content.res.Configuration import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.graphics.drawable.GradientDrawable -import android.net.Uri +import android.media.AudioManager +import android.os.Build import android.os.Bundle -import android.view.GestureDetector -import android.view.Gravity -import android.view.MotionEvent -import android.view.View -import android.view.ViewConfiguration +import android.os.Handler +import android.os.Looper +import android.view.KeyEvent import android.view.ViewGroup -import android.view.animation.LinearInterpolator +import android.view.WindowManager import android.widget.FrameLayout import android.widget.ImageView -import android.widget.LinearLayout +import androidx.core.graphics.Insets import androidx.core.view.ViewCompat +import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat -import androidx.media3.common.MediaItem -import androidx.media3.common.PlaybackException -import androidx.media3.common.Player -import androidx.media3.common.util.UnstableApi +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver import androidx.media3.exoplayer.ExoPlayer -import androidx.media3.ui.AspectRatioFrameLayout -import androidx.media3.ui.PlayerView -import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.bumptech.glide.Glide -import com.personalization.Product -import com.personalization.R +import com.personalization.OnClickListener import com.personalization.SDK -import com.personalization.stories.models.Slide import com.personalization.stories.models.Story -import com.personalization.stories.models.elements.ButtonElement import com.personalization.ui.InternalPersonalizationUiApi -import com.personalization.ui.PersonalizationTheme -import com.personalization.ui.components.PersonalizationButton -import com.personalization.ui.components.PersonalizationStoryCard -import com.personalization.ui.components.PersonalizationStoryNavigation -import com.personalization.ui.components.PersonalizationStoryTextBlock -import com.personalization.ui.components.PersonalizationStoryUsedProducts -import com.personalization.ui.components.StorySupport -import kotlin.math.abs +import com.personalization.ui.widgets.StoriesViewerState.Pause /** * Полноэкранный просмотр сторис (V2) — на компонентах кита. * - * Паттерн Stories из Figma (страница 1:32): слайд 402×874 с отступом 16 и шагом 16, - * сверху [PersonalizationStoryNavigation], дальше по содержимому: - * - слайд с товаром — [PersonalizationStoryCard] (бренд, название, фото, цена, кнопка); - * - медиа-слайд — фон-картинка или видео, текстовые блоки на своей высоте - * (`y_offset` в процентах), кнопки внизу и [PersonalizationStoryUsedProducts]. - * Медиа-слайды рисуются тёмными токенами, как в макете; слайд без фона — в теме хоста. + * Паттерн Stories из Figma (страница 1:32): слайд со скримом, сверху + * [com.personalization.ui.components.PersonalizationStoryNavigation], дальше по содержимому — + * карточка товара или текстовые блоки, кнопки и «Используемые товары» (см. [StorySlideView]). * - * Поведение: слайд идёт [Slide.duration], тап слева — назад, справа — вперёд, - * удержание — пауза, свайп вниз — закрыть, свайп вбок — соседняя сторис. - * Показ слайда трекается `view`, нажатие на кнопку, товар или промокод — `click`. + * Логика — в [StoriesViewerState]: тап по трети ширины, удержание — пауза, свайп вбок — + * соседняя сторис, вниз — закрыть; сторис открывается с первого невиденного слайда, и + * увиденное хранится по магазину. Пауза и при уходе в фон, потере фокуса, погасшем экране. + * + * Ссылки и товары — через [onClickListener] с контрактом старых сторис: `true` — SDK + * открывает сам, `false` — хост обработал. Перед переходом просмотр закрывается. * * Модели — те же, что у старого `StoriesView`: V2 его не трогает. */ @InternalPersonalizationUiApi class PersonalizationStoriesViewer( context: Context, - private val stories: List, - private val startStory: Int = 0 + stories: List, + startStory: Int = 0 ) : Dialog(context, android.R.style.Theme_Translucent_NoTitleBar) { /** Контекст хоста: вьюхи строятся в его теме, чтобы работал брендинг кита. */ private val hostContext = context + /** Сторис без слайдов не показываются (C16). */ + private val stories: List = stories.filter { it.slidesCount > 0 } + private val startIndex: Int = stories.getOrNull(startStory)?.let { this.stories.indexOf(it) }?.takeIf { it >= 0 } ?: 0 + /** Код блока — для трекинга. */ var code: String? = null - /** Инстанс SDK — трекинг `view` / `click`. Без него сторис просто показываются. */ + /** Инстанс SDK: трекинг и хранилище увиденного магазина. Без него сторис просто показываются. */ var sdk: SDK? = null + /** Магазин для хранилища увиденного, если [sdk] не зарегистрирован в реестре. */ + var shopId: String? = null + /** Загрузчик картинок; `null` — Glide из SDK. */ var imageLoader: ((ImageView, String) -> Unit)? = null - /** - * Переход по ссылке кнопки или товара. Вернуть `true`, если хост обработал сам; - * иначе ссылка открывается системой. После перехода просмотр закрывается. - */ - var onLinkClick: ((String) -> Boolean)? = null - - /** Нажатие на товар (карточка слайда или карусель). */ - var onProductClick: ((Product) -> Unit)? = null - - /** Сторис досмотрена или просмотр закрыт на её середине — лента обновляет кольцо. */ - var onStoryProgress: ((story: Story) -> Unit)? = null - - var promoCaption: CharSequence = "Promo code" - - /** Кнопка товарного слайда, если своей кнопки у слайда нет, — открывает товар. */ - var productButtonText: CharSequence = "More info" - var promoCopiedText: CharSequence = "Copied" - var usedProductsShowText: CharSequence = "Used products" - var usedProductsHideText: CharSequence = "Hide products" + /** Клики по ссылкам и товарам — контракт старых сторис ([OnClickListener]). */ + var onClickListener: OnClickListener? = null + + var promoCaption: CharSequence + var promoCopiedText: CharSequence + var productButtonText: CharSequence + var showProductsText: CharSequence + var hideProductsText: CharSequence + var retryText: CharSequence + var closeLabel: CharSequence + var soundOnLabel: CharSequence + var soundOffLabel: CharSequence + + init { + val defaults = StoriesTexts.defaults(context) + promoCaption = defaults.promoCaption + promoCopiedText = defaults.promoCopiedText + productButtonText = defaults.productButtonText + showProductsText = defaults.showProductsText + hideProductsText = defaults.hideProductsText + retryText = defaults.retryText + closeLabel = defaults.closeLabel + soundOnLabel = defaults.soundOnLabel + soundOffLabel = defaults.soundOffLabel + } - private lateinit var pager: ViewPager2 + private lateinit var state: StoriesViewerState private lateinit var root: StoryDismissLayout + private lateinit var pager: ViewPager2 + private lateinit var texts: StoriesTexts private val pages = HashMap() - private var currentStory = -1 - /** Звук выключен, пока его не включат, — как у старых сторис. */ - private var muted = true + private val handler = Handler(Looper.getMainLooper()) + private val frameClock = StoryFrameClock(::onFrame) private var player: ExoPlayer? = null + private var playerSlide: StorySlideView? = null + private var audioFocus: StoriesAudioFocus? = null + private var insets: Insets = Insets.NONE + private var hostLifecycle: Lifecycle? = null + private var created = false + private var dismissed = false + private var hostStopped = false + private var windowFocused = true + private var hostPaused = false + private var dismissDragging = false + private var pagerDragging = false + + /** Поставить просмотр на паузу из кода хоста (B8). */ + fun pause() = setHostPaused(true) + + /** Снять паузу хоста. */ + fun resume() = setHostPaused(false) + + private fun setHostPaused(paused: Boolean) { + hostPaused = paused + if (!created) return + state.setPaused(Pause.HOST, paused) + sync() + } + + internal fun applyTexts(texts: StoriesTexts) { + promoCaption = texts.promoCaption + promoCopiedText = texts.promoCopiedText + productButtonText = texts.productButtonText + showProductsText = texts.showProductsText + hideProductsText = texts.hideProductsText + retryText = texts.retryText + closeLabel = texts.closeLabel + soundOnLabel = texts.soundOnLabel + soundOffLabel = texts.soundOffLabel + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window?.let { window -> - window.setBackgroundDrawable(ColorDrawable(Color.BLACK)) - window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) - } + texts = StoriesTexts( + promoCaption, promoCopiedText, productButtonText, showProductsText, hideProductsText, + retryText, closeLabel, soundOnLabel, soundOffLabel + ) + val seen = StoriesSeenStore.forSdk(hostContext, sdk, shopId) + state = StoriesViewerState(stories.map(::shape), seen, startIndex) + state.setPaused(Pause.HOST, hostPaused) + created = true + setupWindow() root = StoryDismissLayout(hostContext).apply { - onDismissDrag = { dragging -> if (dragging) currentPage()?.pause() else currentPage()?.resume() } + canDrag = { !state.sheetOpen } + onDragChange = { dragging -> + dismissDragging = dragging + updateDrag() + } onDismiss = { dismiss() } } pager = ViewPager2(hostContext).apply { adapter = StoriesAdapter() offscreenPageLimit = 1 - registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) = selectStory(position) - }) + registerOnPageChangeCallback(pageCallback) } root.addView(pager, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)) - ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets -> - val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) - view.setPadding(0, 0, 0, bars.bottom) - insets + ViewCompat.setOnApplyWindowInsetsListener(root) { _, windowInsets -> + insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) + pages.values.forEach { it.slideView?.applyInsets(insets) } + WindowInsetsCompat.CONSUMED } setContentView(root) - pager.setCurrentItem(startStory.coerceIn(0, (stories.size - 1).coerceAtLeast(0)), false) - // Для нулевой страницы пейджер onPageSelected может не прислать. - selectStory(pager.currentItem) - } + volumeControlStream = AudioManager.STREAM_MUSIC + audioFocus = StoriesAudioFocus(hostContext) { setMuted(true) } + observeHost() - override fun onStart() { - super.onStart() - currentPage()?.resume() + if (stories.isEmpty()) { + handler.post { dismiss() } + return + } + pager.setCurrentItem(state.storyIndex, false) + // Для начальной страницы пейджер onPageSelected может не прислать. + handler.post { enterCurrent() } } - override fun onStop() { - currentPage()?.pause() - super.onStop() + /** Окно во весь экран: медиа уходит под панели и вырез, органы управления — нет. */ + private fun setupWindow() { + val window = window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.BLACK)) + window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + WindowCompat.setDecorFitsSystemWindows(window, false) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + window.statusBarColor = Color.TRANSPARENT + window.navigationBarColor = Color.TRANSPARENT + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + window.attributes = window.attributes.apply { + layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES + } + } } - override fun dismiss() { - currentPage()?.leave() - pages.values.forEach { it.release() } - pages.clear() - player?.release() - player = null - super.dismiss() + /** Значки панелей светлые над медиа и тёмные на светлой теме хоста. */ + private fun applySystemBars(view: StorySlideView) { + val window = window ?: return + val night = (hostContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == + Configuration.UI_MODE_NIGHT_YES + val light = !view.isMedia && !night + WindowCompat.getInsetsController(window, window.decorView).apply { + isAppearanceLightStatusBars = light + isAppearanceLightNavigationBars = light + } } - private fun currentPage(): StoryPage? = pages[currentStory] + /** Хост ушёл в фон, его закрыло другое окно, погас экран — пауза (B6). */ + private fun observeHost() { + val lifecycle = hostContext.findLifecycleOwner()?.lifecycle ?: return + hostLifecycle = lifecycle + hostStopped = !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) + lifecycle.addObserver(hostObserver) + } - private fun selectStory(position: Int) { - if (position == currentStory) return - pages[currentStory]?.leave() - currentStory = position - pages[position]?.enter() + private val hostObserver = LifecycleEventObserver { _, event -> + when (event) { + Lifecycle.Event.ON_START -> setBackground(stopped = false) + Lifecycle.Event.ON_STOP -> setBackground(stopped = true) + Lifecycle.Event.ON_DESTROY -> dismiss() + else -> Unit + } } - private fun nextStory() { - if (currentStory + 1 < stories.size) pager.currentItem = currentStory + 1 else dismiss() + private fun setBackground(stopped: Boolean = hostStopped) { + hostStopped = stopped + if (!created) return + state.setPaused(Pause.BACKGROUND, hostStopped || !windowFocused) + sync() } - private fun previousStory() { - if (currentStory > 0) pager.currentItem = currentStory - 1 else currentPage()?.restart() + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + windowFocused = hasFocus + setBackground() } - private fun obtainPlayer(): ExoPlayer = - player ?: ExoPlayer.Builder(hostContext).build().also { - it.repeatMode = Player.REPEAT_MODE_ONE - it.volume = if (muted) 0f else 1f - player = it + /** «Назад» сначала закрывает шторку товаров (B5). */ + @Deprecated("Dialog still routes back here, also through OnBackInvokedDispatcher on API 33+") + override fun onBackPressed() { + if (!created) { + @Suppress("DEPRECATION") + super.onBackPressed() + return } - - private fun loadImage(view: ImageView, url: String) { - val loader = imageLoader - if (loader != null) loader(view, url) else Glide.with(view).load(url).into(view) + apply(state.back()) } - private fun track(event: String, story: Story, slide: Slide) { - val blockCode = code ?: return - runCatching { sdk?.storiesManager?.trackStory(event, blockCode, story.id, slide.id) } + /** Кнопка громкости вверх включает звук (C7); громкость меняет система, как обычно. */ + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && muted) setMuted(false) + return super.onKeyDown(keyCode, event) } - private fun openLink(link: String) { - if (link.isEmpty()) return - val handled = onLinkClick?.invoke(link) ?: false - if (!handled) { - try { - hostContext.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } catch (_: ActivityNotFoundException) { - SDK.error("PersonalizationStoriesViewer: no app can open $link") - } + override fun dismiss() { + if (created && !dismissed) { + dismissed = true + frameClock.stop() + handler.removeCallbacksAndMessages(null) + state.leave() + stopMedia() + player?.release() + player = null + audioFocus?.abandon() + hostLifecycle?.removeObserver(hostObserver) + pages.clear() } - dismiss() + super.dismiss() } - private inner class StoriesAdapter : RecyclerView.Adapter() { - override fun getItemCount(): Int = stories.size + // --- Навигация ------------------------------------------------------------------------- - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - val page = StoryPage(hostContext) - page.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) - return object : RecyclerView.ViewHolder(page) {} - } + private fun shape(story: Story) = StoriesViewerState.StoryShape( + id = story.id, + slides = List(story.slidesCount) { index -> + val slide = story.getSlide(index) + StoriesViewerState.SlideShape(slide.id, StoriesMapping.durationMs(slide)) + }, + serverViewed = story.isViewed, + startPosition = story.startPosition + ) - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { - val page = holder.itemView as StoryPage - pages.entries.removeAll { it.value === page } - pages[position] = page - page.bind(position) - if (position == currentStory) page.enter() + private fun currentPage(): StoryPage? = pages[state.storyIndex] + + private fun currentSlideView(): StorySlideView? = currentPage()?.slideView + + /** Какой слайд показывает страница: у текущей — текущий, у соседних — стартовый (A4). */ + private fun slideFor(index: Int): Int = if (index == state.storyIndex) state.slideIndex else state.startSlideOf(index) + + private val pageCallback = object : ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) { + if (!created || dismissed) return + if (position != state.storyIndex) { + stopMedia() + state.selectStory(position) + pages[position]?.showSlide(state.slideIndex) + } + if (pager.scrollState == ViewPager2.SCROLL_STATE_IDLE) enterCurrent() + sync() } - override fun onViewRecycled(holder: RecyclerView.ViewHolder) { - val page = holder.itemView as StoryPage - page.release() - pages.entries.removeAll { it.value === page } + override fun onPageScrollStateChanged(scrollState: Int) { + if (!created || dismissed) return + pagerDragging = scrollState == ViewPager2.SCROLL_STATE_DRAGGING + updateDrag() + // Страница, на которой пейджер остановился, — показанная (A1), подсмотренная — нет. + if (scrollState == ViewPager2.SCROLL_STATE_IDLE) enterCurrent() } } - /** - * Одна сторис: слайды по очереди, таймер слайда, видео. Слайд каждый раз - * собирается заново — в своём контексте (тёмном для медиа). - */ - @SuppressLint("ViewConstructor") - private inner class StoryPage(context: Context) : FrameLayout(context) { - - private var storyIndex = -1 - private val story: Story get() = stories[storyIndex] - private var slideIndex = 0 - private var slideView: StorySlideView? = null - private var animator: ValueAnimator? = null - private var entered = false - private var fingerHold = false - private var sheetOpen = false - private val held get() = fingerHold || sheetOpen - private var waitingForVideo = false + private fun updateDrag() { + if (!created) return + state.setPaused(Pause.DRAG, dismissDragging || pagerDragging) + sync() + } - /** Плеер у просмотра один: останавливать его может только страница, которая его заняла. */ - private var ownsVideo = false + private fun enterCurrent() { + if (!created || dismissed) return + // Ушедшие сторис откроются по правилу A4 — их страницы показывают стартовый слайд. + pages.forEach { (index, page) -> if (index != state.storyIndex) page.showSlide(slideFor(index)) } + if (state.enter()) onSlideStarted() + sync() + } - fun bind(index: Int) { - release() - storyIndex = index - slideIndex = StoriesMapping.startSlide(story, emptySet()) - showSlide(start = false) + /** Слайд стал текущим на остановившейся странице: трекинг, медиа, предзагрузка. */ + private fun onSlideStarted() { + track("view") + val page = currentPage() ?: return + page.showSlide(state.slideIndex) + page.slideView?.let { view -> + startMedia(view) + applySystemBars(view) } + preloadNext() + } - fun enter() { - // Страницу входят и из привязки адаптера, и из смены страницы пейджера — - // второй вход перезапустил бы слайд и оборвал бы подготовку видео. - if (storyIndex < 0 || entered) return - entered = true - showSlide(start = true) + private fun apply(move: StoriesViewerState.Move) { + if (dismissed) return + when (move) { + StoriesViewerState.Move.None -> Unit + StoriesViewerState.Move.Slide -> { + stopMedia() + onSlideStarted() + } + is StoriesViewerState.Move.Story -> { + stopMedia() + pager.setCurrentItem(move.index, true) + } + StoriesViewerState.Move.Restart -> { + val view = currentSlideView() + if (view != null && view === playerSlide) player?.seekTo(0) + view?.setProgress(0f) + } + StoriesViewerState.Move.CloseSheet -> currentSlideView()?.closeSheet() + StoriesViewerState.Move.Close -> { + dismiss() + return + } } + sync() + } - fun leave() { - if (!entered) return - entered = false - stopTimer() - detachVideo() - // Недосмотренная сторис откроется с того же слайда. - if (!story.isViewed) story.startPosition = slideIndex - onStoryProgress?.invoke(story) - } + /** Привести часы, плеер, пейджер и фокус звука к состоянию. */ + private fun sync() { + if (!created || dismissed) return + if (state.isRunning) frameClock.start() else frameClock.stop() + player?.playWhenReady = playerSlide != null && state.playerShouldPlay + pager.isUserInputEnabled = !state.sheetOpen + currentSlideView()?.setProgress(state.progress) + updateAudioFocus() + } - fun release() { - stopTimer() - detachVideo() - entered = false + private fun onFrame(deltaMs: Long) { + if (!created || dismissed) return + val view = currentSlideView() + val exo = player + if (state.clock == StoriesViewerState.Clock.PLAYER && exo != null && view != null && view === playerSlide) { + state.videoPosition(exo.currentPosition) } + val move = state.tick(deltaMs) + view?.setProgress(state.progress) + if (move != StoriesViewerState.Move.None) apply(move) + } - fun pause() { - animator?.pause() - if (ownsVideo) player?.pause() - } + // --- Слайд: касания и клики ------------------------------------------------------------- + + private val slideHost = object : StorySlideHost { + override val texts: StoriesTexts get() = this@PersonalizationStoriesViewer.texts + override val muted: Boolean get() = Companion.muted + override val sheetOpen: Boolean get() = created && state.sheetOpen + override val insets: Insets get() = this@PersonalizationStoriesViewer.insets - fun resume() { - if (!entered || held) return - if (ownsVideo) player?.play() - // Пока видео не готово, время слайда стоит — таймер запустит сам плеер. - if (waitingForVideo) return - animator?.resume() ?: startTimer() + override fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) = + this@PersonalizationStoriesViewer.loadImage(view, url, onReady, onFailed) + + override fun onTap(x: Float, width: Int, rtl: Boolean) = apply(state.tap(StoriesViewerState.zone(x, width, rtl))) + + override fun onHold(hold: Boolean) { + if (!created) return + state.setPaused(Pause.HOLD, hold) + sync() } - fun restart() { - slideIndex = 0 - showSlide(start = entered) + override fun onOutsideSheetTap() = apply(state.tap(StoriesViewerState.Zone.CENTER)) + + override fun onSheet(open: Boolean) { + if (!created || state.sheetOpen == open) return + state.setSheet(open) + sync() } - fun next() { - if (slideIndex + 1 < story.slidesCount) { - slideIndex++ - showSlide(start = true) - } else { - story.isViewed = true - story.startPosition = 0 - onStoryProgress?.invoke(story) - nextStory() + override fun onButton(button: com.personalization.stories.models.elements.ButtonElement, product: com.personalization.Product?) { + track("click") + val link = button.link + when { + link.isNotEmpty() -> { + dismiss() + if (clicks.onClick(link)) openUrl(link) + } + // Кнопка без ссылки открывает товар слайда (C11). + product != null -> openProduct(product) } } - fun previous() { - if (slideIndex > 0) { - slideIndex-- - showSlide(start = true) - } else { - previousStory() - } + override fun onProduct(product: com.personalization.Product) { + track("click") + openProduct(product) } - private fun showSlide(start: Boolean) { - stopTimer() - detachVideo() - removeAllViews() - if (story.slidesCount == 0) return - val slide = story.getSlide(slideIndex) - val view = StorySlideView(this@StoryPage.context, story, slide, this) - slideView = view - addView(view, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) - view.navigation.progress.count = story.slidesCount - view.navigation.progress.current = slideIndex - view.navigation.progress.progress = 0f - preloadNext() - if (start && entered) { - track("view", story, slide) - if (StoriesMapping.isVideo(slide)) attachVideo(view, slide) else startTimer() + /** Карусель — как у старых сторис: `onCloseDialogClick` решает, закрыть или открыть. */ + override fun onCarouselProduct(product: com.personalization.Product) { + track("click") + val url = StoriesMapping.productLink(product) + when { + !clicks.onClick(product) -> dismiss() + clicks.onCloseDialogClick(product, url) -> dismiss() + else -> openUrl(url) } } - private fun preloadNext() { - val next = slideIndex + 1 - if (next >= story.slidesCount) return - val slide = story.getSlide(next) - val url = if (StoriesMapping.isVideo(slide)) slide.preview else slide.background - if (url.isNotEmpty() && imageLoader == null) Glide.with(hostContext).load(url).preload() - } - - private fun startTimer() { - stopTimer() - val slide = story.getSlide(slideIndex) - val navigation = slideView?.navigation ?: return - animator = ValueAnimator.ofFloat(0f, 1f).apply { - duration = slide.duration.coerceAtLeast(MIN_DURATION_MS) - interpolator = LinearInterpolator() - addUpdateListener { navigation.progress.progress = it.animatedValue as Float } - addListener(object : AnimatorListenerAdapter() { - private var cancelled = false - override fun onAnimationCancel(animation: Animator) { - cancelled = true - } + override fun onPromoCopied() = track("click") - override fun onAnimationEnd(animation: Animator) { - if (!cancelled) next() - } - }) - start() - } - } + override fun onSoundToggle() = setMuted(!Companion.muted) - private fun stopTimer() { - animator?.cancel() - animator = null - } + override fun onRetry(view: StorySlideView) = retry(view) - private fun attachVideo(view: StorySlideView, slide: Slide) { - val exo = obtainPlayer() - ownsVideo = true - waitingForVideo = true - exo.addListener(videoListener) - view.playerView?.player = exo - exo.setMediaItem(MediaItem.fromUri(slide.background)) - exo.playWhenReady = !held - exo.prepare() - } + override fun onClose() = dismiss() + } - private val videoListener = object : Player.Listener { - override fun onPlaybackStateChanged(playbackState: Int) { - // Время слайда идёт, только когда видео реально играет. - if (playbackState == Player.STATE_READY && waitingForVideo) { - waitingForVideo = false - slideView?.hidePoster() - if (entered && !held) startTimer() - } - } + private val clicks: OnClickListener get() = onClickListener ?: DEFAULT_CLICKS - override fun onPlayerError(error: PlaybackException) { - // Видео не играет — слайд остаётся картинкой-превью и идёт по своему времени. - if (!waitingForVideo) return - waitingForVideo = false - SDK.error("PersonalizationStoriesViewer: video failed, showing the preview", error) - if (entered && !held) startTimer() - } - } + private fun openProduct(product: com.personalization.Product) { + dismiss() + if (clicks.onClick(product)) openUrl(StoriesMapping.productLink(product)) + } - private fun detachVideo() { - waitingForVideo = false - if (!ownsVideo) return - ownsVideo = false - player?.let { exo -> - exo.removeListener(videoListener) - exo.stop() - exo.clearMediaItems() - } - slideView?.playerView?.player = null + private fun openUrl(url: String) { + if (url.isEmpty()) return + val activity = hostContext.findActivity() + val intent = android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)) + if (activity == null) intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) + try { + (activity ?: hostContext).startActivity(intent) + } catch (_: android.content.ActivityNotFoundException) { + SDK.error("PersonalizationStoriesViewer: no app can open $url") } + } - // --- вызовы слайда --- + /** `view` и `click` с кодом блока; id не целые положительные — не трекаются (A6). */ + private fun track(event: String) { + if (!created) return + val blockCode = code ?: return + val story = stories.getOrNull(state.storyIndex) ?: return + if (state.slideIndex !in 0 until story.slidesCount) return + val slide = story.getSlide(state.slideIndex) + if (!StoriesMapping.isTrackable(story.id, slide.id)) return + runCatching { sdk?.storiesManager?.trackStory(event, blockCode, story.id, slide.id) } + } - fun onTap(x: Float) { - if (x < width * PREVIOUS_ZONE) previous() else next() - } + private fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) { + val loader = imageLoader + if (loader != null) { + // Загрузчик хоста о себе не сообщает: готовность видна по картинке во вьюхе. + loader(view, url) + return + } + com.bumptech.glide.Glide.with(view).load(url) + .listener(object : com.bumptech.glide.request.RequestListener { + override fun onLoadFailed( + e: com.bumptech.glide.load.engine.GlideException?, + model: Any?, + target: com.bumptech.glide.request.target.Target, + isFirstResource: Boolean + ): Boolean { + onFailed?.invoke() + return false + } - fun onHold(hold: Boolean) { - // Смена слайда удаляет вьюху под пальцем, и она получает ACTION_CANCEL — - // без этой проверки «отпускание» запускало бы второй таймер. - if (fingerHold == hold) return - fingerHold = hold - if (held) pause() else resume() - } + override fun onResourceReady( + resource: android.graphics.drawable.Drawable, + model: Any, + target: com.bumptech.glide.request.target.Target?, + dataSource: com.bumptech.glide.load.DataSource, + isFirstResource: Boolean + ): Boolean { + onReady?.invoke() + return false + } + }) + .into(view) + } + + // --- Медиа ----------------------------------------------------------------------------- - /** Открытая шторка товаров держит слайд, пока её не закроют. */ - fun onSheet(open: Boolean) { - sheetOpen = open - if (held) pause() else resume() + /** + * Часы слайда пойдут, когда медиа готово (C5): картинка загружена, видео играет. + * Не готово за 10 с или ошибка — пауза и «Повторить». + */ + private fun startMedia(view: StorySlideView) { + if (view.mediaStarted || dismissed) return + view.mediaStarted = true + cancelMediaTimers() + when { + view.isVideo -> attachVideo(view) + view.isMedia -> { + view.onImageState = { onImageState(view) } + onImageState(view) + } + else -> onMediaReady(view, null) } + if (view.isMedia) handler.postDelayed(readyTimeout, READY_TIMEOUT_MS) + } - fun onSoundToggle() { - muted = !muted - player?.volume = if (muted) 0f else 1f - slideView?.setMuted(muted) + private fun onImageState(view: StorySlideView) { + when (view.imageState) { + StorySlideView.ImageState.READY -> onMediaReady(view, null) + StorySlideView.ImageState.FAILED -> onMediaFailed(view) + StorySlideView.ImageState.LOADING -> Unit } + } - fun isMuted() = muted + private fun onMediaReady(view: StorySlideView, videoDurationMs: Long?) { + if (view !== currentSlideView() || dismissed) return + view.mediaReadyOnce = true + handler.removeCallbacks(readyTimeout) + handler.removeCallbacks(videoRetry) + view.showRetry(false) + state.mediaReady(videoDurationMs) + sync() + } - fun onButton(element: ButtonElement) { - track("click", story, story.getSlide(slideIndex)) - openLink(element.link) - } + private fun onMediaFailed(view: StorySlideView) { + if (view !== currentSlideView() || dismissed) return + handler.removeCallbacks(readyTimeout) + state.mediaFailed() + view.showRetry(true) + // Видео пробует ещё раз само; картинка — по кнопке. + if (view.isVideo) { + handler.removeCallbacks(videoRetry) + handler.postDelayed(videoRetry, VIDEO_RETRY_MS) + } + sync() + } - fun onProduct(product: Product) { - track("click", story, story.getSlide(slideIndex)) - val handler = onProductClick - if (handler != null) { - handler(product) - dismiss() - } else { - openLink(product.deeplink.ifEmpty { product.url }) - } - } + private val readyTimeout = Runnable { + val view = currentSlideView() ?: return@Runnable + if (!view.mediaReadyOnce && !state.hasError) onMediaFailed(view) + } - fun onPromoCopied() { - track("click", story, story.getSlide(slideIndex)) - } + private val videoRetry = Runnable { currentSlideView()?.let(::retry) } + + private fun retry(view: StorySlideView) { + if (view !== currentSlideView() || dismissed) return + cancelMediaTimers() + if (view === playerSlide) detachPlayer() + view.showRetry(false) + view.mediaStarted = false + view.mediaReadyOnce = false + state.retry() + if (!view.isVideo) view.loadImage() + startMedia(view) + sync() + } - fun onClose() = dismiss() + private fun cancelMediaTimers() { + handler.removeCallbacks(readyTimeout) + handler.removeCallbacks(videoRetry) } - /** - * Вёрстка одного слайда. Строится в [slideContext]: для медиа-слайда — тёмном. - */ - // resizeMode и цвет шаттера PlayerView в media3 помечены UnstableApi — это только вид. - @androidx.annotation.OptIn(markerClass = [UnstableApi::class]) - @SuppressLint("ViewConstructor", "ClickableViewAccessibility") - private inner class StorySlideView( - baseContext: Context, - story: Story, - slide: Slide, - private val page: StoryPage - ) : FrameLayout(if (StoriesMapping.isMedia(slide)) StorySupport.darkContext(baseContext) else baseContext) { - - val navigation: PersonalizationStoryNavigation - var playerView: PlayerView? = null - private set - private val poster = ImageView(context) - private var usedProducts: PersonalizationStoryUsedProducts? = null - - init { - val media = StoriesMapping.isMedia(slide) - val video = StoriesMapping.isVideo(slide) - val fallback = StoriesMapping.parseColor(slide.backgroundColor) - setBackgroundColor( - if (media) fallback ?: Color.BLACK - else PersonalizationTheme.color(context, R.color.personalization_background_card) - ) - - if (media) { - poster.scaleType = ImageView.ScaleType.CENTER_CROP - addView(poster, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) - val posterUrl = if (video) slide.preview else slide.background - if (posterUrl.isNotEmpty()) loadImage(poster, posterUrl) - if (video) { - playerView = PlayerView(context).apply { - useController = false - resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM - setShutterBackgroundColor(Color.TRANSPARENT) - } - addView(playerView, 0, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) - poster.bringToFront() - } - } - // Скрим сверху и снизу — у всех видов Card/Story, и на белом фоне тоже: - // у фото без текста чёрный 50%, у слайдов с товаром и текстом — 30%. - val strong = media && StoriesMapping.product(slide) == null && StoriesMapping.textBlocks(slide).isEmpty() - addView( - View(context).apply { background = scrim(if (strong) SCRIM_STRONG else SCRIM_LIGHT) }, - LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) - ) - - // Слой касаний: тап — листать, удержание — пауза. Кнопки лежат выше и забирают свои касания. - val detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { - override fun onDown(e: MotionEvent) = true - override fun onSingleTapUp(e: MotionEvent): Boolean { - page.onTap(e.x) - return true - } + /** Уход со слайда: таймеры и повторы отменяются, плеер отдан. */ + private fun stopMedia() { + cancelMediaTimers() + detachPlayer() + } - override fun onLongPress(e: MotionEvent) = page.onHold(true) - }) - addView(View(context).apply { - setOnTouchListener { _, event -> - detector.onTouchEvent(event) - if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) { - page.onHold(false) - } - true - } - }, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) + @androidx.annotation.OptIn(markerClass = [androidx.media3.common.util.UnstableApi::class]) + private fun obtainPlayer(): ExoPlayer = player ?: ExoPlayer.Builder(hostContext) + .setMediaSourceFactory(StoriesMediaCache.mediaSourceFactory(hostContext)) + .build() + .also { exo -> + exo.repeatMode = androidx.media3.common.Player.REPEAT_MODE_OFF + exo.addListener(playerListener) + player = exo + applyVolume() + } + + private fun attachVideo(view: StorySlideView) { + val exo = obtainPlayer() + detachPlayer() + playerSlide = view + view.playerView?.player = exo + exo.setMediaItem(androidx.media3.common.MediaItem.fromUri(view.slide.background)) + exo.prepare() + exo.playWhenReady = state.playerShouldPlay + } - val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) - val column = LinearLayout(context).apply { - orientation = LinearLayout.VERTICAL - setPadding(padding, padding, padding, 0) - } - navigation = PersonalizationStoryNavigation(context).apply { onClose = { page.onClose() } } - column.addView(navigation, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) - - val product = StoriesMapping.product(slide)?.item - val buttons = StoriesMapping.buttons(slide) - val productsElement = StoriesMapping.products(slide) - - if (product != null) { - column.addView(productCard(product, buttons.firstOrNull()), LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f - ).apply { - topMargin = padding - bottomMargin = padding - }) - addView(column, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) - } else { - // Текстовые блоки — на своей высоте поверх слайда, как их расставила админка. - val texts = FrameLayout(context) - column.addView(texts, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) - addView(column, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) - StoriesMapping.textBlocks(slide).forEach { element -> - val block = PersonalizationStoryTextBlock(context).apply { - text = element.textInput - textSizeSp = element.fontSize.toFloat() - lineHeightSp = if (element.textLineSpacing > 0) element.fontSize * element.textLineSpacing.toFloat() else null - blockColor = StoriesMapping.textBlockColor(element) - textColorOverride = StoriesMapping.parseColor(element.textColor) - align = StoriesMapping.textAlign(element) - bold = element.isBold - italic = element.isItalic - fontFamily = element.fontType.takeIf { it.isNotEmpty() } + private fun detachPlayer() { + val view = playerSlide ?: return + playerSlide = null + player?.let { exo -> + exo.stop() + exo.clearMediaItems() + } + view.playerView?.player = null + updateAudioFocus() + } + + private val playerListener = object : androidx.media3.common.Player.Listener { + override fun onPlaybackStateChanged(playbackState: Int) { + val view = playerSlide ?: return + val exo = player ?: return + when (playbackState) { + androidx.media3.common.Player.STATE_READY -> + if (!view.mediaReadyOnce) { + val duration = exo.duration.takeIf { it != androidx.media3.common.C.TIME_UNSET && it > 0 } + onMediaReady(view, duration) + } else { + state.buffering(false) + sync() } - texts.addView(block, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)) - texts.post { block.y = texts.height * element.yOffset / 100f } + // Подгрузка посреди ролика — прогресс стоит (C4). + androidx.media3.common.Player.STATE_BUFFERING -> if (view.mediaReadyOnce) { + state.buffering(true) + sync() } - addBottom(productsElement, buttons, video, extraBottom = padding) + androidx.media3.common.Player.STATE_ENDED -> if (view === currentSlideView()) apply(state.mediaEnded()) + else -> Unit } } - /** Низ медиа-слайда: кнопки и строка товаров/звука. */ - private fun addBottom( - productsElement: com.personalization.stories.models.elements.ProductsElement?, - buttons: List, - video: Boolean, - extraBottom: Int - ) { - val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) - val bottom = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL } - buttons.forEach { element -> - val button = PersonalizationButton(context).apply { - size = PersonalizationButton.Size.LG - buttonView = PersonalizationButton.ButtonView.PRIMARY - text = element.title - setOnClickListener { page.onButton(element) } - } - bottom.addView(button, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { - marginStart = padding - marginEnd = padding - topMargin = padding - }) - } - val products = productsElement?.getProducts().orEmpty() - if (products.isNotEmpty() || video) { - val used = PersonalizationStoryUsedProducts(context).apply { - this.products = products.map(StoriesMapping::cardProduct) - showText = productsElement?.labelShow?.takeIf { it.isNotEmpty() } ?: usedProductsShowText - hideText = productsElement?.labelHide?.takeIf { it.isNotEmpty() } ?: usedProductsHideText - imageLoader = { view, item -> item.imageUrl?.let { loadImage(view, it) } } - onProductClick = { item -> products.firstOrNull { it.id == item.id }?.let(page::onProduct) } - onExpandedChange = { open -> page.onSheet(open) } - showSoundButton = video - muted = page.isMuted() - onSoundClick = { page.onSoundToggle() } - } - usedProducts = used - bottom.addView(used, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) - } else if (buttons.isNotEmpty()) { - bottom.setPadding(0, 0, 0, extraBottom) - } - addView(bottom, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM)) - } - - private fun productCard(product: Product, button: ButtonElement?): View { - val price = StoriesMapping.price(product) - return PersonalizationStoryCard(context).apply { - title = product.brand.takeIf { it.isNotEmpty() } - subtitle = product.name - if (product.image.isNotEmpty()) loadImage(imageView, product.image) - this.price.type = price.type - this.price.price = price.price - this.price.oldPrice = price.oldPrice - this.price.discount = price.discount - this.price.promoCode = price.promoCode - this.price.promoCaption = promoCaption - this.price.copiedText = promoCopiedText - this.price.onPromoCopied = { page.onPromoCopied() } - buttonText = button?.title ?: productButtonText - // Товар открывается кнопкой: фото занимает середину слайда, и тап по нему - // должен листать, как по любому другому месту. - onButtonClick = { if (button != null) page.onButton(button) else page.onProduct(product) } - } + override fun onRenderedFirstFrame() { + playerSlide?.hidePoster() } - fun hidePoster() { - poster.visibility = View.GONE + override fun onPlayerError(error: androidx.media3.common.PlaybackException) { + SDK.error("PersonalizationStoriesViewer: video failed", error) + playerSlide?.let(::onMediaFailed) } - fun setMuted(muted: Boolean) { - usedProducts?.muted = muted + override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) { + // Выдернули наушники: звук выключается, ролик идёт дальше без звука. + if (reason == androidx.media3.common.Player.PLAY_WHEN_READY_CHANGE_REASON_AUDIO_BECOMING_NOISY) { + setMuted(true) + sync() + } } + } + + private fun setMuted(value: Boolean) { + muted = value + applyVolume() + pages.values.forEach { it.slideView?.setMuted(value) } + updateAudioFocus() + } + + private fun applyVolume() { + val exo = player ?: return + exo.volume = if (muted) 0f else 1f + exo.setHandleAudioBecomingNoisy(!muted) + } + + /** Фокус берётся, только пока звук включён и видео на экране (C7). */ + private fun updateAudioFocus() { + val focus = audioFocus ?: return + val wanted = created && !dismissed && !muted && playerSlide != null && !state.isPaused(Pause.BACKGROUND) + if (wanted) focus.request() else focus.abandon() + } - private fun scrim(alpha: Int): GradientDrawable { - val dark = Color.argb(alpha, 0, 0, 0) - return GradientDrawable( - GradientDrawable.Orientation.TOP_BOTTOM, - intArrayOf(dark, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, dark) - ) + /** Следующий слайд — заранее (C6): картинка или превью и начало видео. */ + private fun preloadNext() { + val story = stories.getOrNull(state.storyIndex) ?: return + val next = when { + state.slideIndex + 1 < story.slidesCount -> story.getSlide(state.slideIndex + 1) + state.storyIndex + 1 < stories.size -> + stories[state.storyIndex + 1].getSlide(state.startSlideOf(state.storyIndex + 1)) + else -> return + } + if (StoriesMapping.isVideo(next)) { + StoriesMediaCache.preloadVideo(hostContext, next.background) + preloadImage(next.preview) + } else if (StoriesMapping.isMedia(next)) { + preloadImage(next.background) } } - private companion object { - const val MIN_DURATION_MS = 1000L - const val SCRIM_STRONG = 128 - const val SCRIM_LIGHT = 77 - const val PREVIOUS_ZONE = 0.3f + private fun preloadImage(url: String) { + if (url.isEmpty() || imageLoader != null) return + com.bumptech.glide.Glide.with(hostContext.applicationContext).load(url).preload() } -} -/** - * Корень просмотра: свайп вниз утаскивает сторис и закрывает её, если протянуть - * дальше пятой части экрана. Горизонтальные жесты остаются пейджеру и карусели. - */ -@SuppressLint("ViewConstructor") -internal class StoryDismissLayout(context: Context) : FrameLayout(context) { - - var onDismissDrag: ((Boolean) -> Unit)? = null - var onDismiss: (() -> Unit)? = null - - private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop - private var downX = 0f - private var downY = 0f - private var dragging = false - - override fun onInterceptTouchEvent(event: MotionEvent): Boolean { - when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - downX = event.rawX - downY = event.rawY - dragging = false - } - MotionEvent.ACTION_MOVE -> { - val dy = event.rawY - downY - val dx = event.rawX - downX - if (dy > touchSlop && dy > abs(dx) * 1.5f) { - dragging = true - onDismissDrag?.invoke(true) - return true - } - } + private inner class StoriesAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { + override fun getItemCount(): Int = stories.size + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { + val page = StoryPage(hostContext) + page.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + return object : androidx.recyclerview.widget.RecyclerView.ViewHolder(page) {} + } + + override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { + val page = holder.itemView as StoryPage + pages.entries.removeAll { it.value === page } + pages[position] = page + page.bind(position) + if (position == state.storyIndex && state.entered) page.slideView?.let(::startMedia) + } + + override fun onViewRecycled(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder) { + val page = holder.itemView as StoryPage + if (page.slideView != null && page.slideView === playerSlide) stopMedia() + pages.entries.removeAll { it.value === page } } - return false } - @SuppressLint("ClickableViewAccessibility") - override fun onTouchEvent(event: MotionEvent): Boolean { - if (!dragging) return super.onTouchEvent(event) - when (event.actionMasked) { - MotionEvent.ACTION_MOVE -> translationY = (event.rawY - downY).coerceAtLeast(0f) - MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { - dragging = false - if (translationY > height * DISMISS_FRACTION) { - animate().translationY(height.toFloat()).setDuration(ANIMATION_MS).withEndAction { onDismiss?.invoke() }.start() - } else { - animate().translationY(0f).setDuration(ANIMATION_MS).withEndAction { onDismissDrag?.invoke(false) }.start() - } - } + /** Страница одной сторис: держит вьюху показанного слайда. */ + private inner class StoryPage(context: Context) : FrameLayout(context) { + var storyIndex = -1 + private set + var slideView: StorySlideView? = null + private set + + fun bind(index: Int) { + storyIndex = index + showSlide(slideFor(index), force = true) + } + + /** Слайд строится заново, если он другой или его медиа уже запускали. */ + fun showSlide(index: Int, force: Boolean = false) { + val story = stories.getOrNull(storyIndex) ?: return + if (index !in 0 until story.slidesCount) return + val current = slideView + if (!force && current != null && current.slideIndex == index && !current.mediaStarted) return + if (current != null && current === playerSlide) stopMedia() + removeAllViews() + val view = StorySlideView(context, storyIndex, index, story.getSlide(index), story.slidesCount, slideHost) + slideView = view + addView(view, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) } - return true } private companion object { - const val DISMISS_FRACTION = 0.2f - const val ANIMATION_MS = 200L + /** Выбор звука живёт до конца процесса (C7); первый просмотр — без звука. */ + @Volatile + var muted = true + + /** Без слушателя хоста — поведение по умолчанию из контракта: SDK открывает сам. */ + val DEFAULT_CLICKS = object : OnClickListener {} + + const val READY_TIMEOUT_MS = 10_000L + const val VIDEO_RETRY_MS = 15_000L } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt new file mode 100644 index 00000000..fa7a8a67 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt @@ -0,0 +1,279 @@ +package com.personalization.ui.widgets + +import android.annotation.SuppressLint +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.view.Choreographer +import android.view.MotionEvent +import android.view.VelocityTracker +import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout +import androidx.lifecycle.LifecycleOwner +import com.personalization.R +import kotlin.math.abs + +/** Тексты блока сторис — одни имена на всех платформах (раздел D правил). */ +internal data class StoriesTexts( + val promoCaption: CharSequence, + val promoCopiedText: CharSequence, + val productButtonText: CharSequence, + val showProductsText: CharSequence, + val hideProductsText: CharSequence, + val retryText: CharSequence, + val closeLabel: CharSequence, + val soundOnLabel: CharSequence, + val soundOffLabel: CharSequence +) { + companion object { + /** Тексты по умолчанию — из ресурсов SDK (английские, с переводом в `values-ru`). */ + fun defaults(context: Context) = StoriesTexts( + promoCaption = context.getString(R.string.personalization_stories_promo_caption), + promoCopiedText = context.getString(R.string.personalization_stories_promo_copied), + productButtonText = context.getString(R.string.personalization_stories_product_button), + showProductsText = context.getString(R.string.personalization_stories_show_products), + hideProductsText = context.getString(R.string.personalization_stories_hide_products), + retryText = context.getString(R.string.personalization_stories_retry), + closeLabel = context.getString(R.string.personalization_stories_close), + soundOnLabel = context.getString(R.string.personalization_stories_sound_on), + soundOffLabel = context.getString(R.string.personalization_stories_sound_off) + ) + } +} + +internal fun Context.findActivity(): Activity? { + var current: Context? = this + while (current is ContextWrapper) { + if (current is Activity) return current + current = current.baseContext + } + return null +} + +internal fun Context.findLifecycleOwner(): LifecycleOwner? { + var current: Context? = this + while (current is ContextWrapper) { + if (current is LifecycleOwner) return current + current = current.baseContext + } + return null +} + +/** + * Часы слайда (B7): кадры [Choreographer], время — по меткам кадров. От масштаба анимаций + * системы они не зависят, в отличие от `ValueAnimator`: при «Отключить анимацию» слайды не + * пролетают. Шаг между кадрами ограничен — подвисший поток не перескакивает слайд. + */ +internal class StoryFrameClock(private val onTick: (deltaMs: Long) -> Unit) : Choreographer.FrameCallback { + + private var running = false + private var lastFrameNanos = 0L + + fun start() { + if (running) return + running = true + lastFrameNanos = 0L + Choreographer.getInstance().postFrameCallback(this) + } + + fun stop() { + if (!running) return + running = false + Choreographer.getInstance().removeFrameCallback(this) + } + + override fun doFrame(frameTimeNanos: Long) { + if (!running) return + val delta = if (lastFrameNanos == 0L) 0L else (frameTimeNanos - lastFrameNanos) / 1_000_000L + lastFrameNanos = frameTimeNanos + Choreographer.getInstance().postFrameCallback(this) + onTick(delta.coerceIn(0L, MAX_FRAME_MS)) + } + + private companion object { + const val MAX_FRAME_MS = 250L + } +} + +/** + * Слой касаний слайда: тап по трети ширины (B1) и удержание (B2). Нажатие дольше 200 мс — + * пауза; отпускание её снимает и никуда не листает. Сдвинутый палец — не тап: его заберёт + * пейджер или свайп закрытия. + */ +@SuppressLint("ViewConstructor", "ClickableViewAccessibility") +internal class StoryTouchLayer( + context: Context, + private val onTap: (x: Float, width: Int, rtl: Boolean) -> Unit, + private val onHold: (Boolean) -> Unit +) : View(context) { + + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private var downX = 0f + private var downY = 0f + private var moved = false + private var holding = false + private val holdRunnable = Runnable { + holding = true + onHold(true) + } + + override fun onTouchEvent(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + downX = event.x + downY = event.y + moved = false + postDelayed(holdRunnable, HOLD_MS) + } + MotionEvent.ACTION_MOVE -> + if (abs(event.x - downX) > touchSlop || abs(event.y - downY) > touchSlop) moved = true + MotionEvent.ACTION_UP -> { + removeCallbacks(holdRunnable) + if (holding) release() else if (!moved) onTap(event.x, width, layoutDirection == LAYOUT_DIRECTION_RTL) + } + MotionEvent.ACTION_CANCEL -> { + removeCallbacks(holdRunnable) + release() + } + } + return true + } + + override fun onDetachedFromWindow() { + removeCallbacks(holdRunnable) + release() + super.onDetachedFromWindow() + } + + private fun release() { + if (!holding) return + holding = false + onHold(false) + } + + private companion object { + const val HOLD_MS = 200L + } +} + +/** + * Корень просмотра: свайп вниз утаскивает сторис (B4). Закрывает, если протянуть дальше + * 120 dp или бросить быстрее 800 dp/с, иначе пружинит обратно. Пока тянут — пауза + * ([onDragChange]). При открытой шторке ([canDrag] = false) не тянется вовсе (B5). + * Горизонтальные жесты остаются пейджеру и карусели. + */ +@SuppressLint("ViewConstructor") +internal class StoryDismissLayout(context: Context) : FrameLayout(context) { + + var canDrag: () -> Boolean = { true } + var onDragChange: ((Boolean) -> Unit)? = null + var onDismiss: (() -> Unit)? = null + + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private val density = resources.displayMetrics.density + private var velocity: VelocityTracker? = null + private var downX = 0f + private var downY = 0f + private var dragging = false + + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + downX = event.rawX + downY = event.rawY + dragging = false + velocity?.recycle() + velocity = VelocityTracker.obtain() + track(event) + } + MotionEvent.ACTION_MOVE -> { + track(event) + val dy = event.rawY - downY + val dx = event.rawX - downX + if (canDrag() && dy > touchSlop && dy > abs(dx) * 1.5f) { + dragging = true + onDragChange?.invoke(true) + return true + } + } + } + return false + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + if (!dragging) return super.onTouchEvent(event) + track(event) + when (event.actionMasked) { + MotionEvent.ACTION_MOVE -> translationY = (event.rawY - downY).coerceAtLeast(0f) + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { + dragging = false + val tracker = velocity + tracker?.computeCurrentVelocity(1000) + val speedDp = (tracker?.yVelocity ?: 0f) / density + velocity?.recycle() + velocity = null + val far = translationY / density > DISMISS_DISTANCE_DP + val fast = event.actionMasked == MotionEvent.ACTION_UP && speedDp > DISMISS_VELOCITY_DP + if (far || fast) { + animate().translationY(height.toFloat()).setDuration(ANIMATION_MS) + .withEndAction { onDismiss?.invoke() }.start() + } else { + animate().translationY(0f).setDuration(ANIMATION_MS) + .withEndAction { onDragChange?.invoke(false) }.start() + } + } + } + return true + } + + /** Скорость — по координатам экрана: сама вьюха едет за пальцем. */ + private fun track(event: MotionEvent) { + val copy = MotionEvent.obtain(event) + copy.setLocation(event.rawX, event.rawY) + velocity?.addMovement(copy) + copy.recycle() + } + + private companion object { + const val DISMISS_DISTANCE_DP = 120f + const val DISMISS_VELOCITY_DP = 800f + const val ANIMATION_MS = 200L + } +} + +/** + * Обёртка карусели внутри пейджера: пока карусель может листаться в сторону жеста, + * родители (пейджер, свайп закрытия) жест не перехватывают. Схема NestedScrollableHost + * из примеров ViewPager2. + */ +@SuppressLint("ViewConstructor") +internal class StoryNestedScrollHost(context: Context, private val target: View) : FrameLayout(context) { + + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private var initialX = 0f + private var initialY = 0f + + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { + if (target.canScrollHorizontally(1) || target.canScrollHorizontally(-1)) { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + initialX = event.x + initialY = event.y + parent?.requestDisallowInterceptTouchEvent(true) + } + MotionEvent.ACTION_MOVE -> { + val dx = event.x - initialX + val dy = event.y - initialY + if (abs(dx) > touchSlop || abs(dy) > touchSlop) { + val horizontal = abs(dx) > abs(dy) + val canScroll = target.canScrollHorizontally(if (dx > 0) -1 else 1) + parent?.requestDisallowInterceptTouchEvent(horizontal && canScroll) + } + } + } + } + return super.onInterceptTouchEvent(event) + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt new file mode 100644 index 00000000..30b07a9c --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt @@ -0,0 +1,80 @@ +package com.personalization.ui.widgets + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.view.View +import android.widget.FrameLayout +import com.personalization.Product +import com.personalization.stories.models.Slide +import com.personalization.stories.models.elements.ProductElement +import com.personalization.ui.components.PersonalizationStoryCard +import com.personalization.ui.components.PersonalizationStoryTextBlock +import com.personalization.ui.components.PersonalizationToast + +/** + * Карточка товарного слайда (C8): бренд, название, фото, цена. Кнопки рисует слайд — + * все кнопки админки, а не одну кнопку карточки. + */ +internal object StoryProductCard { + + fun build(context: Context, element: ProductElement, product: Product, host: StorySlideHost): View { + val price = StoriesMapping.price(product) + return PersonalizationStoryCard(context).apply { + title = product.brand.takeIf { it.isNotEmpty() } + subtitle = product.name + if (product.image.isNotEmpty()) host.loadImage(imageView, product.image) + this.price.type = price.type + this.price.price = price.price + this.price.oldPrice = price.oldPrice + this.price.discount = price.discount + this.price.promoCode = price.promoCode + // Подпись над кодом — из админки, без неё — текст хоста (C9). + this.price.promoCaption = StoriesMapping.promoCaption(element, host.texts.promoCaption) + this.price.copiedText = host.texts.promoCopiedText + this.price.onPromoCopied = { host.onPromoCopied() } + buttonText = null + } + } +} + +/** + * Текстовые блоки медиа-слайда — на своей высоте (`y_offset`, проценты), как их расставила + * админка. Блок с промокодом по тапу копирует код и показывает «Copied» сверху (C12). + */ +internal object StoryTextBlocks { + + fun build(context: Context, slide: Slide, host: StorySlideHost): View { + val frame = FrameLayout(context) + StoriesMapping.textBlocks(slide).forEach { element -> + val block = PersonalizationStoryTextBlock(context).apply { + text = element.textInput + textSizeSp = element.fontSize.toFloat() + lineHeightSp = StoriesMapping.lineHeightSp(element) + blockColor = StoriesMapping.textBlockColor(element) + textColorOverride = StoriesMapping.parseColor(element.textColor) + align = StoriesMapping.textAlign(element) + bold = element.isBold + italic = element.isItalic + fontFamily = element.fontType.takeIf { it.isNotEmpty() } + } + StoriesMapping.textPromocode(element)?.let { code -> + block.setOnClickListener { copy(it, code, host) } + } + frame.addView(block, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + frame.post { + // Блок не уезжает за низ области: его должно быть видно целиком. + val top = frame.height * element.yOffset / 100f + block.y = top.coerceAtMost((frame.height - block.height).toFloat()).coerceAtLeast(0f) + } + } + return frame + } + + private fun copy(anchor: View, code: String, host: StorySlideHost) { + val clipboard = anchor.context.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager + clipboard?.setPrimaryClip(ClipData.newPlainText(host.texts.promoCaption, code)) + PersonalizationToast.show(anchor, host.texts.promoCopiedText, PersonalizationToast.Position.TOP) + host.onPromoCopied() + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt new file mode 100644 index 00000000..14cefb68 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt @@ -0,0 +1,302 @@ +package com.personalization.ui.widgets + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.Drawable +import android.graphics.drawable.GradientDrawable +import android.view.Gravity +import android.view.MotionEvent +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatImageView +import androidx.core.graphics.Insets +import androidx.media3.common.util.UnstableApi +import androidx.media3.ui.AspectRatioFrameLayout +import androidx.media3.ui.PlayerView +import com.personalization.Product +import com.personalization.R +import com.personalization.stories.models.Slide +import com.personalization.stories.models.elements.ButtonElement +import com.personalization.ui.PersonalizationTheme +import com.personalization.ui.components.PersonalizationButton +import com.personalization.ui.components.PersonalizationStoryNavigation +import com.personalization.ui.components.PersonalizationStoryUsedProducts +import com.personalization.ui.components.StorySupport + +/** Что слайд просит у просмотра: загрузку картинок, навигацию, клики. */ +internal interface StorySlideHost { + val texts: StoriesTexts + val muted: Boolean + val sheetOpen: Boolean + val insets: Insets + fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)? = null, onFailed: (() -> Unit)? = null) + fun onTap(x: Float, width: Int, rtl: Boolean) + fun onHold(hold: Boolean) + fun onOutsideSheetTap() + fun onSheet(open: Boolean) + fun onButton(button: ButtonElement, product: Product?) + fun onProduct(product: Product) + fun onCarouselProduct(product: Product) + fun onPromoCopied() + fun onSoundToggle() + fun onRetry(view: StorySlideView) + fun onClose() +} + +/** + * Вёрстка одного слайда (Card/Story). Медиа-слайд строится в тёмном контексте (C1), + * слайд без медиа — в теме хоста на Background/Card (C2). Слои снизу вверх: поля вокруг + * медиа, фото/видео целиком (fit), скрим (C3), слой касаний, органы управления с отступами + * от системных панелей и выреза, кнопка «Повторить» (C5). Медиа идёт под панели, органы + * управления — нет. + */ +@androidx.annotation.OptIn(markerClass = [UnstableApi::class]) +@SuppressLint("ViewConstructor") +internal class StorySlideView( + baseContext: Context, + val storyIndex: Int, + val slideIndex: Int, + val slide: Slide, + slideCount: Int, + private val host: StorySlideHost +) : FrameLayout(if (StoriesMapping.isMedia(slide)) StorySupport.darkContext(baseContext) else baseContext) { + + enum class ImageState { LOADING, READY, FAILED } + + val isMedia = StoriesMapping.isMedia(slide) + val isVideo = StoriesMapping.isVideo(slide) + val navigation = PersonalizationStoryNavigation(context) + var playerView: PlayerView? = null + private set + + /** Медиа слайда уже запускали — повторный показ строит слайд заново. */ + var mediaStarted = false + + /** Медиа хоть раз было готово: дальше подгрузка — буферизация, а не загрузка. */ + var mediaReadyOnce = false + + var imageState = ImageState.LOADING + private set + + /** Картинка слайда загрузилась или нет. */ + var onImageState: (() -> Unit)? = null + + private val poster = StoryImageView(context) + private val column = LinearLayout(context) + private val retry = PersonalizationButton(context) + private var usedProducts: PersonalizationStoryUsedProducts? = null + private var usedHost: View? = null + private var sheetTapPending = false + private val padding = resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + + init { + setBackgroundColor( + if (isMedia) StoriesMapping.letterboxColor(slide) + else PersonalizationTheme.color(context, R.color.personalization_background_card) + ) + if (isMedia) addMedia() + addView(View(context).apply { background = scrim(StoriesMapping.scrimAlpha(slide)) }, matchParent()) + addView(StoryTouchLayer(context, host::onTap, host::onHold), matchParent()) + + column.orientation = LinearLayout.VERTICAL + navigation.closeContentDescription = host.texts.closeLabel + navigation.onClose = { host.onClose() } + navigation.progress.count = slideCount + navigation.progress.current = slideIndex + column.addView(navigation, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + buildContent() + addView(column, matchParent()) + + retry.text = host.texts.retryText + retry.buttonView = PersonalizationButton.ButtonView.PRIMARY + retry.visibility = View.GONE + retry.setOnClickListener { host.onRetry(this) } + addView(retry, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.CENTER)) + applyInsets(host.insets) + } + + private fun addMedia() { + poster.scaleType = ImageView.ScaleType.FIT_CENTER + if (isVideo) { + playerView = PlayerView(context).apply { + useController = false + resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT + setShutterBackgroundColor(Color.TRANSPARENT) + setBackgroundColor(Color.TRANSPARENT) + } + addView(playerView, matchParent()) + } + addView(poster, matchParent()) + loadImage() + } + + /** Картинка слайда или превью видео; у видео готовность решает плеер. */ + fun loadImage() { + val url = if (isVideo) slide.preview else slide.background + imageState = ImageState.LOADING + if (url.isEmpty()) { + setImageState(if (isVideo) ImageState.READY else ImageState.FAILED) + return + } + poster.visibility = View.VISIBLE + poster.onDrawable = { setImageState(ImageState.READY) } + host.loadImage(poster, url, { setImageState(ImageState.READY) }, { setImageState(ImageState.FAILED) }) + } + + private fun setImageState(state: ImageState) { + if (imageState == state) return + imageState = state + onImageState?.invoke() + } + + /** + * Товарный слайд (C8) — карточка товара, все кнопки слайда и строка товаров/звука; + * текстовые блоки на нём не рисуются. Медиа-слайд — текстовые блоки на своей высоте, + * кнопки и та же строка. + */ + private fun buildContent() { + val productElement = StoriesMapping.product(slide) + val product = productElement?.item + val middle: View = if (productElement != null && product != null) { + StoryProductCard.build(context, productElement, product, host) + } else { + StoryTextBlocks.build(context, slide, host) + } + column.addView(middle, columnParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) + + val buttons = StoriesMapping.buttons(slide) + buttons.forEach { element -> addButton(element.title) { host.onButton(element, product) } } + // Без своих кнопок товар открывает кнопка хоста — «More info» (C11). + if (buttons.isEmpty() && product != null) addButton(host.texts.productButtonText) { host.onProduct(product) } + + val products = StoriesMapping.products(slide)?.let { element -> element to element.getProducts() } + if (products != null || isVideo) addUsedProducts(products?.first, products?.second.orEmpty()) + } + + private fun addButton(title: CharSequence, onClick: () -> Unit) { + val button = PersonalizationButton(context).apply { + size = PersonalizationButton.Size.LG + buttonView = PersonalizationButton.ButtonView.PRIMARY + text = title + setOnClickListener { onClick() } + } + column.addView(button, columnParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + } + + private fun addUsedProducts( + element: com.personalization.stories.models.elements.ProductsElement?, + products: List + ) { + val used = PersonalizationStoryUsedProducts(context).apply { + this.products = products.map(StoriesMapping::cardProduct) + showText = element?.labelShow?.takeIf { it.isNotBlank() } ?: host.texts.showProductsText + hideText = element?.labelHide?.takeIf { it.isNotBlank() } ?: host.texts.hideProductsText + imageLoader = { view, item -> item.imageUrl?.let { host.loadImage(view, it) } } + onProductClick = { item -> products.firstOrNull { it.id == item.id }?.let(host::onCarouselProduct) } + onExpandedChange = { open -> host.onSheet(open) } + showSoundButton = isVideo + soundOnDescription = host.texts.soundOnLabel + soundOffDescription = host.texts.soundOffLabel + muted = host.muted + onSoundClick = { host.onSoundToggle() } + } + usedProducts = used + val wrapper = StoryNestedScrollHost(context, used.carousel) + wrapper.addView(used, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + usedHost = wrapper + column.addView(wrapper, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + } + + private fun columnParams(width: Int, height: Int, weight: Float = 0f) = + LinearLayout.LayoutParams(width, height, weight).apply { + marginStart = padding + marginEnd = padding + topMargin = padding + } + + /** + * Отступы от системных панелей и выреза — только у органов управления (дефект + * edge-to-edge). Шторка товаров уходит под панель навигации своим фоном. + */ + fun applyInsets(insets: Insets) { + val used = usedHost + column.setPadding(insets.left, insets.top, insets.right, if (used == null) insets.bottom + padding else 0) + used?.setPadding(0, 0, 0, insets.bottom) + } + + fun setProgress(progress: Float) { + navigation.progress.progress = progress + } + + fun setMuted(muted: Boolean) { + usedProducts?.muted = muted + } + + fun closeSheet() { + usedProducts?.expanded = false + } + + fun hidePoster() { + if (isVideo) poster.visibility = View.GONE + } + + fun showRetry(show: Boolean) { + retry.visibility = if (show) View.VISIBLE else View.GONE + } + + /** При открытой шторке тап мимо неё только закрывает её (B5). */ + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN && host.sheetOpen && !inside(usedHost, event)) { + sheetTapPending = true + return true + } + return false + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + if (!sheetTapPending) return super.onTouchEvent(event) + when (event.actionMasked) { + MotionEvent.ACTION_UP -> { + sheetTapPending = false + host.onOutsideSheetTap() + } + MotionEvent.ACTION_CANCEL -> sheetTapPending = false + } + return true + } + + private fun inside(view: View?, event: MotionEvent): Boolean { + view ?: return false + val location = IntArray(2) + view.getLocationOnScreen(location) + return event.rawX >= location[0] && event.rawX <= location[0] + view.width && + event.rawY >= location[1] && event.rawY <= location[1] + view.height + } + + private fun matchParent() = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) + + private fun scrim(alpha: Int): GradientDrawable { + val dark = Color.argb(alpha, 0, 0, 0) + return GradientDrawable( + GradientDrawable.Orientation.TOP_BOTTOM, + intArrayOf(dark, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, Color.TRANSPARENT, dark) + ) + } +} + +/** + * Картинка, которая сообщает, что ей поставили изображение: так готовность видна и при + * загрузчике хоста, который о себе ничего не сообщает. + */ +internal class StoryImageView(context: Context) : AppCompatImageView(context) { + var onDrawable: (() -> Unit)? = null + + override fun setImageDrawable(drawable: Drawable?) { + super.setImageDrawable(drawable) + if (drawable != null) onDrawable?.invoke() + } +} From 5f86ade2acbe70d9eb5be042d9ed227ca9b73556 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:26:50 +0400 Subject: [PATCH 09/31] feat(ui): compose wrapper for stories v2 PersonalizationStoriesWidget takes the view's parameters and a PersonalizationStoriesController for open, pause and resume. The viewer also styles the system bars and preloads when its page binds late. --- .../widgets/PersonalizationStoriesViewer.kt | 9 +- .../widgets/PersonalizationStoriesWidget.kt | 104 ++++++++++++++++++ 2 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index b5d675ca..c7038c1c 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -336,13 +336,11 @@ class PersonalizationStoriesViewer( /** Слайд стал текущим на остановившейся странице: трекинг, медиа, предзагрузка. */ private fun onSlideStarted() { track("view") + preloadNext() + // Страницы может ещё не быть: тогда медиа запустит привязка адаптера. val page = currentPage() ?: return page.showSlide(state.slideIndex) - page.slideView?.let { view -> - startMedia(view) - applySystemBars(view) - } - preloadNext() + page.slideView?.let(::startMedia) } private fun apply(move: StoriesViewerState.Move) { @@ -530,6 +528,7 @@ class PersonalizationStoriesViewer( private fun startMedia(view: StorySlideView) { if (view.mediaStarted || dismissed) return view.mediaStarted = true + applySystemBars(view) cancelMediaTimers() when { view.isVideo -> attachVideo(view) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt new file mode 100644 index 00000000..ccedc53b --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt @@ -0,0 +1,104 @@ +package com.personalization.ui.widgets + +import android.widget.ImageView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.key +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.ui.Modifier +import androidx.compose.ui.viewinterop.AndroidView +import com.personalization.OnClickListener +import com.personalization.SDK +import com.personalization.ui.InternalPersonalizationUiApi + +/** + * Управление сторис из Compose (B8): то же, что методы [PersonalizationStories]. + * Передаётся в [PersonalizationStoriesWidget]; до показа виджета вызовы ничего не делают. + */ +@InternalPersonalizationUiApi +class PersonalizationStoriesController { + + internal var view: PersonalizationStories? = null + + fun open(index: Int) { + view?.open(index) + } + + fun openStory(storyId: Int) { + view?.openStory(storyId) + } + + fun pause() { + view?.pause() + } + + fun resume() { + view?.resume() + } + + fun reload() { + view?.reload() + } +} + +/** + * Compose-обёртка над [PersonalizationStories] — те же параметры, что у вьюхи. + * Compose у SDK опциональный (`compileOnly`), как у старого `StoriesWidget`: хост + * подключает его сам. Тексты `null` — по умолчанию из ресурсов SDK. + * + * ```kotlin + * PersonalizationStoriesWidget(code = "STORIES_CODE", onClickListener = listener) + * ``` + */ +@InternalPersonalizationUiApi +@Composable +fun PersonalizationStoriesWidget( + code: String, + modifier: Modifier = Modifier, + shopId: String? = null, + sdk: SDK? = null, + controller: PersonalizationStoriesController? = null, + onClickListener: OnClickListener? = null, + onError: ((code: Int, message: String?) -> Unit)? = null, + imageLoader: ((ImageView, String) -> Unit)? = null, + promoCaption: CharSequence? = null, + promoCopiedText: CharSequence? = null, + productButtonText: CharSequence? = null, + showProductsText: CharSequence? = null, + hideProductsText: CharSequence? = null, + retryText: CharSequence? = null, + closeLabel: CharSequence? = null, + soundOnLabel: CharSequence? = null, + soundOffLabel: CharSequence? = null +) { + val currentOnError = rememberUpdatedState(onError) + // Код, магазин и SDK задают, какой блок грузить, — их смена пересоздаёт вьюху. + key(code, shopId, sdk) { + AndroidView( + modifier = modifier, + factory = { context -> + PersonalizationStories(context).apply { + this.code = code + this.shopId = shopId + this.onError = { errorCode, message -> currentOnError.value?.invoke(errorCode, message) } + sdk?.let(::attach) + } + }, + update = { view -> + val defaults = StoriesTexts.defaults(view.context) + view.onClickListener = onClickListener + view.imageLoader = imageLoader + view.promoCaption = promoCaption ?: defaults.promoCaption + view.promoCopiedText = promoCopiedText ?: defaults.promoCopiedText + view.productButtonText = productButtonText ?: defaults.productButtonText + view.showProductsText = showProductsText ?: defaults.showProductsText + view.hideProductsText = hideProductsText ?: defaults.hideProductsText + view.retryText = retryText ?: defaults.retryText + view.closeLabel = closeLabel ?: defaults.closeLabel + view.soundOnLabel = soundOnLabel ?: defaults.soundOnLabel + view.soundOffLabel = soundOffLabel ?: defaults.soundOffLabel + controller?.view = view + }, + onRelease = { view -> if (controller?.view === view) controller.view = null } + ) + } +} From 396f1dec75900d9d0163c50d661b2bc5d0e28e9f Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:28:02 +0400 Subject: [PATCH 10/31] feat(demo): stories v2 round 2 exhibits The sample block shows a fitted photo with a letterbox, a broken image with Retry, a product video slide with buttons, carousel and sound, a text-block promo code and two-line labels; a Compose exhibit drives the wrapper with a controller and opens the block without the bar. --- .../src/main/assets/uikit/stories_sample.json | 150 +++++++++++++++++- .../personalization/demo/StoriesV2Compose.kt | 82 ++++++++++ .../personalization/demo/StoriesV2Showcase.kt | 20 +-- 3 files changed, 239 insertions(+), 13 deletions(-) create mode 100644 demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt diff --git a/demo-app/src/main/assets/uikit/stories_sample.json b/demo-app/src/main/assets/uikit/stories_sample.json index bfbaaaa7..bbbd6413 100644 --- a/demo-app/src/main/assets/uikit/stories_sample.json +++ b/demo-app/src/main/assets/uikit/stories_sample.json @@ -4,7 +4,7 @@ "stories": [ { "id": 901, - "name": "Скидки", + "name": "Скидки недели на обувь и часы", "avatar": "file:///android_asset/uikit/sneakers.jpg", "pinned": true, "viewed": false, @@ -108,9 +108,139 @@ } ] }, + { + "id": 905, + "name": "Видео и товары", + "avatar": "file:///android_asset/uikit/headphones.jpg", + "pinned": false, + "viewed": false, + "start_position": 0, + "slides": [ + { + "id": "905_0", + "type": "video", + "duration": 0, + "background": "https://cdn.stories.rees46.ru/9f3065c8-82bc-4f4f-8fca-6b9ee4d4ae57.mp4", + "preview": "https://cdn.stories.rees46.ru/69c1044a-0ba5-42a4-b8b8-2fae2dff9125.jpg", + "background_color": "#101820", + "elements": [ + { + "type": "product", + "title": "Ваш промокод", + "item": { + "id": "3", + "brand": "Sonic", + "name": "Наушники беспроводные Sonic Pro с шумоподавлением", + "image_url": "file:///android_asset/uikit/headphones.jpg", + "price": 7490, + "price_formatted": "7 490 ₽", + "url": "https://example.com/p/3", + "promocode": "SOUND15", + "price_with_promocode_formatted": "6 367 ₽" + } + }, + { + "type": "button", + "title": "Купить", + "link_android": "https://example.com/buy/3" + }, + { + "type": "button", + "title": "Все наушники", + "link": "https://example.com/c/headphones" + }, + { + "type": "products", + "labels": { + "show_carousel": "С этим покупают", + "hide_carousel": "Скрыть" + }, + "products": [ + { + "id": "4", + "brand": "Trail", + "name": "Рюкзак городской Trail 20 л", + "image_url": "file:///android_asset/uikit/backpack.jpg", + "picture": "file:///android_asset/uikit/backpack.jpg", + "price": 4990, + "price_formatted": "4 990 ₽", + "url": "https://example.com/p/4", + "oldprice": 5990, + "oldprice_formatted": "5 990 ₽", + "discount": 17 + }, + { + "id": "5", + "brand": "Sunny", + "name": "Очки солнцезащитные Sunny", + "image_url": "file:///android_asset/uikit/sunglasses.jpg", + "picture": "file:///android_asset/uikit/sunglasses.jpg", + "price": 2990, + "price_formatted": "2 990 ₽", + "url": "https://example.com/p/5" + }, + { + "id": "6", + "brand": "Aqua", + "name": "Бутылка для воды Aqua 0,75 л", + "image_url": "file:///android_asset/uikit/bottle.jpg", + "picture": "file:///android_asset/uikit/bottle.jpg", + "price": 990, + "price_formatted": "990 ₽", + "url": "https://example.com/p/6", + "oldprice": 1290, + "oldprice_formatted": "1 290 ₽", + "discount": 23 + } + ] + } + ] + } + ] + }, + { + "id": 906, + "name": "Фото целиком и ошибка", + "avatar": "file:///android_asset/uikit/loyalty_stripe.jpg", + "pinned": false, + "viewed": false, + "start_position": 0, + "slides": [ + { + "id": "906_0", + "type": "image", + "duration": 5, + "background": "file:///android_asset/uikit/loyalty_stripe.jpg", + "background_color": "#1B2A41", + "elements": [] + }, + { + "id": "906_1", + "type": "image", + "duration": 5, + "background": "https://invalid.example/missing.jpg", + "background_color": "#000000", + "elements": [ + { + "type": "text_block", + "text_input": "Картинка не загрузится — нажмите «Повторить»", + "font_size": 20, + "y_offset": 10, + "text_align": "center", + "text_color": "#FFFFFF", + "text_background_color": "#000000", + "text_background_color_opacity": "0%", + "bold": false, + "italic": false, + "font_type": "" + } + ] + } + ] + }, { "id": 902, - "name": "Образ", + "name": "Образ на выходные", "avatar": "file:///android_asset/uikit/jacket.jpg", "pinned": false, "viewed": false, @@ -216,6 +346,20 @@ "bold": false, "italic": false, "font_type": "" + }, + { + "type": "text_block", + "text_input": "Промокод SALE10 — нажмите, чтобы скопировать", + "promocode": "SALE10", + "font_size": 20, + "y_offset": 70, + "text_align": "center", + "text_color": "#FFFFFF", + "text_background_color": "#1BAA1B", + "text_background_color_opacity": "100%", + "bold": true, + "italic": false, + "font_type": "" } ] }, @@ -327,4 +471,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt new file mode 100644 index 00000000..d9623cf3 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt @@ -0,0 +1,82 @@ +package com.personalization.demo + +import android.content.Context +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material.MaterialTheme +import androidx.compose.material.OutlinedButton +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import com.personalization.OnClickListener +import com.personalization.Product +import com.personalization.ui.widgets.PersonalizationStories +import com.personalization.ui.widgets.PersonalizationStoriesController +import com.personalization.ui.widgets.PersonalizationStoriesWidget + +/** + * The Compose wrapper of the Stories V2 block on the demo shop, driven by a controller (open a story + * by index), and the same block shown without the bar through PersonalizationStories.show(). + */ +@Composable +internal fun StoriesV2ComposeExhibit(storiesCode: String, shopId: String) { + val context = LocalContext.current + val controller = remember { PersonalizationStoriesController() } + var status by remember { mutableStateOf("Errors of the block and of show() appear here") } + val clicks = remember { DemoStoriesClicks(context) } + + Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text( + text = "Stories V2 — Compose PersonalizationStoriesWidget with a controller", + style = MaterialTheme.typography.caption, + color = MaterialTheme.colors.onBackground.copy(alpha = 0.6f) + ) + PersonalizationStoriesWidget( + code = storiesCode, + shopId = shopId, + controller = controller, + onClickListener = clicks, + onError = { code, message -> status = "onError $code: $message" } + ) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OutlinedButton(onClick = { controller.open(1) }) { Text("Open #2") } + OutlinedButton(onClick = { + PersonalizationStories.show( + context = context, + code = storiesCode, + shopId = shopId, + onClickListener = clicks, + onError = { code, message -> status = "show() onError $code: $message" } + ) + }) { Text("Show without bar") } + } + Text(text = status, style = MaterialTheme.typography.caption) + } +} + +/** + * Logs every link and product the stories hand to the host and lets the SDK open it — the V1 + * OnClickListener contract: `true` means "SDK, open it", `false` means "the host handled it". + */ +internal class DemoStoriesClicks(private val context: Context) : OnClickListener { + override fun onClick(url: String): Boolean { + toast("Link: $url") + return false + } + + override fun onClick(product: Product): Boolean { + toast("Product: ${product.name}") + return false + } + + private fun toast(message: String) = Toast.makeText(context, message, Toast.LENGTH_SHORT).show() +} diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt index e3cda92b..dfd6aad4 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -45,13 +45,17 @@ internal fun StoriesV2Showcase(storiesCode: String, shopId: String) { this.shopId = shopId } } - Exhibit("Stories V2 — sample block with every slide kind (offline)") { ctx -> ctx.sampleStories() } - Exhibit("Story Preview — pinned, default, viewed, skeleton") { ctx -> ctx.previews() } - Exhibit("Story Cover — ring split by slides, 2 of 5 seen") { ctx -> + StoriesV2ComposeExhibit(storiesCode = storiesCode, shopId = shopId) + Exhibit( + "Stories V2 — sample block: fitted photo with letterbox, Retry, product video slide with " + + "buttons + carousel + sound, text-block promo code, two-line labels" + ) { ctx -> ctx.sampleStories() } + Exhibit("Story Preview — pinned, default, viewed, two-line label, skeleton") { ctx -> ctx.previews() } + Exhibit("Story Cover — ring split by slides, slides 2 and 4 seen; pinned with slide 1 seen") { ctx -> ctx.row( PersonalizationStoryCover(ctx).apply { segments = 5 - seenSegments = setOf(0, 1) + seenSegments = setOf(1, 3) ctx.loadAsset(imageView, "sneakers.jpg") }, PersonalizationStoryCover(ctx).apply { @@ -124,12 +128,7 @@ private fun Context.sampleStories(): View { bar.imageLoader = { view, url -> Glide.with(view).load(url).into(view) } bar.onItemClick = { index, _ -> PersonalizationStoriesViewer(this, stories, index).apply { - onClickListener = object : com.personalization.OnClickListener { - override fun onClick(url: String): Boolean { - toast("Link: $url") - return false - } - } + onClickListener = DemoStoriesClicks(this@sampleStories) setOnDismissListener { render() } show() } @@ -149,6 +148,7 @@ private fun Context.previews(): View { preview("Pinned", PersonalizationStoryCover.State.PINNED, "sneakers.jpg"), preview("Default", PersonalizationStoryCover.State.DEFAULT, "jacket.jpg"), preview("Viewed", PersonalizationStoryCover.State.VIEWED, "watch.jpg"), + preview("Two-line label that is cut at the end", PersonalizationStoryCover.State.DEFAULT, "bottle.jpg"), preview("", PersonalizationStoryCover.State.SKELETON, null) ) } From 06d928a6c2d2f1e46776b7b2ee1b321f5333e35b Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:30:00 +0400 Subject: [PATCH 11/31] fix(ui): sound button descriptions name the sound state --- .../ui/components/PersonalizationStoryUsedProducts.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt index 92102da0..f41edec0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt @@ -93,8 +93,9 @@ class PersonalizationStoryUsedProducts @JvmOverloads constructor( var onSoundClick: (() -> Unit)? = null - var soundOnDescription: CharSequence = "Mute" - var soundOffDescription: CharSequence = "Unmute" + /** Описание кнопки звука для TalkBack: звук включён — [soundOnDescription], выключен — [soundOffDescription]. */ + var soundOnDescription: CharSequence = "Sound on" + var soundOffDescription: CharSequence = "Sound off" init { orientation = VERTICAL From bddea65e35b083551a032b23de5678aa48fb18b2 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 07:49:59 +0400 Subject: [PATCH 12/31] fix(ui): stories v2 navigation keeps the content padding --- .../kotlin/com/personalization/ui/widgets/StorySlideView.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt index 14cefb68..51e2d376 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt @@ -106,7 +106,8 @@ internal class StorySlideView( navigation.onClose = { host.onClose() } navigation.progress.count = slideCount navigation.progress.current = slideIndex - column.addView(navigation, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + // Навигация в том же отступе 16, что и контент слайда (Figma: content padding 16). + column.addView(navigation, columnParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) buildContent() addView(column, matchParent()) From 4b2e10f033875b1d6354d23d9d8fac8f9fd94b43 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:36:30 +0400 Subject: [PATCH 13/31] fix(ui): stories v2 close cross closes the viewer over the products sheet --- .../PersonalizationStoryNavigation.kt | 3 + .../ui/widgets/StorySlideView.kt | 9 +- .../ui/widgets/StorySlideViewTest.kt | 107 ++++++++++++++++++ 3 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt index cca74162..ebb9b7dc 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryNavigation.kt @@ -113,6 +113,9 @@ class PersonalizationStoryNavigation @JvmOverloads constructor( private val close = AppCompatImageView(context) + /** Крестик: слайд пропускает к нему касания и при открытой шторке товаров (F2). */ + internal val closeButton: View get() = close + var onClose: (() -> Unit)? = null var closeContentDescription: CharSequence? = "Close" diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt index 51e2d376..c60c37de 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt @@ -248,9 +248,14 @@ internal class StorySlideView( retry.visibility = if (show) View.VISIBLE else View.GONE } - /** При открытой шторке тап мимо неё только закрывает её (B5). */ + /** + * При открытой шторке тап мимо неё только закрывает её (B5). Крестик не в счёт: он + * закрывает просмотр всегда, и при открытой шторке тоже (F2). + */ override fun onInterceptTouchEvent(event: MotionEvent): Boolean { - if (event.actionMasked == MotionEvent.ACTION_DOWN && host.sheetOpen && !inside(usedHost, event)) { + if (event.actionMasked == MotionEvent.ACTION_DOWN && host.sheetOpen && + !inside(usedHost, event) && !inside(navigation.closeButton, event) + ) { sheetTapPending = true return true } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt new file mode 100644 index 00000000..6b29361a --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt @@ -0,0 +1,107 @@ +package com.personalization.ui.widgets + +import android.app.Activity +import android.os.Looper +import android.os.SystemClock +import android.view.MotionEvent +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import androidx.core.graphics.Insets +import com.personalization.Product +import com.personalization.stories.models.Slide +import com.personalization.stories.models.elements.ButtonElement +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +/** One slide's touch routing: what reaches the controls while the products sheet is open. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class StorySlideViewTest { + + private val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + private val host = FakeHost() + + @Test + fun `the close cross still gets the touch while the sheet is open`() { + host.sheetOpen = true + val view = laidOut(slideWithProducts()) + + assertFalse(view.onInterceptTouchEvent(down(pointIn(view.navigation.closeButton)))) + } + + @Test + fun `a touch elsewhere outside the open sheet only closes the sheet`() { + host.sheetOpen = true + val view = laidOut(slideWithProducts()) + + val middle = pointIn(view, 0.5f, 0.4f) + assertTrue(view.onInterceptTouchEvent(down(middle))) + host.sheetOpen = false + assertFalse(view.onInterceptTouchEvent(down(middle))) + } + + /** On screen: an unattached view has no location, and the slide hit-tests by location. */ + private fun laidOut(slide: Slide): StorySlideView = + StorySlideView(activity, 0, 0, slide, 1, host).also { view -> + activity.setContentView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + shadowOf(Looper.getMainLooper()).idle() + assertTrue(view.isAttachedToWindow && view.width > 0) + } + + /** A screen point at the fractions of [view]'s size — raw coordinates, as the slide reads them. */ + private fun pointIn(view: View, fx: Float = 0.5f, fy: Float = 0.5f): Pair { + val location = IntArray(2) + view.getLocationOnScreen(location) + return location[0] + view.width * fx to location[1] + view.height * fy + } + + private fun down(point: Pair): MotionEvent { + val now = SystemClock.uptimeMillis() + return MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, point.first, point.second, 0) + } + + private fun slideWithProducts(): Slide = Slide( + JSONObject() + .put("id", "1") + .put( + "elements", + JSONArray().put( + JSONObject() + .put("type", "products") + .put("products", JSONArray().put(JSONObject().put("id", "p1").put("name", "Sneakers"))) + ) + ) + ) + + private class FakeHost : StorySlideHost { + override val texts = StoriesTexts("Promo code", "Copied", "More info", "Used products", "Hide products", "Retry", "Close", "Sound on", "Sound off") + override val muted = true + override var sheetOpen = false + override val insets: Insets = Insets.NONE + val products = mutableListOf() + + override fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) = Unit + override fun onTap(x: Float, width: Int, rtl: Boolean) = Unit + override fun onHold(hold: Boolean) = Unit + override fun onOutsideSheetTap() = Unit + override fun onSheet(open: Boolean) = Unit + override fun onButton(button: ButtonElement, product: Product?) = Unit + override fun onProduct(product: Product) { + products += product + } + override fun onCarouselProduct(product: Product) = Unit + override fun onPromoCopied() = Unit + override fun onSoundToggle() = Unit + override fun onRetry(view: StorySlideView) = Unit + override fun onClose() = Unit + } +} From b98ae925cb717da4162253a38d6a35aedf9df93e Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:37:10 +0400 Subject: [PATCH 14/31] fix(ui): stories v2 product picture opens the product --- .../ui/components/PersonalizationStoryCard.kt | 12 +++++++ .../ui/widgets/StorySlideContent.kt | 5 ++- .../ui/widgets/StorySlideViewTest.kt | 35 ++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt index 49d34e0c..4169a5e9 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryCard.kt @@ -99,6 +99,18 @@ class PersonalizationStoryCard @JvmOverloads constructor( var onButtonClick: (() -> Unit)? = null + /** Тап по фото товара; `null` — фото не нажимается, и касания уходят под карточку. */ + var onImageClick: (() -> Unit)? = null + set(value) { + field = value + if (value == null) { + imageCard.setOnClickListener(null) + imageCard.isClickable = false + } else { + imageCard.setOnClickListener { onImageClick?.invoke() } + } + } + init { orientation = VERTICAL diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt index 30b07a9c..d840da9f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt @@ -14,7 +14,7 @@ import com.personalization.ui.components.PersonalizationToast /** * Карточка товарного слайда (C8): бренд, название, фото, цена. Кнопки рисует слайд — - * все кнопки админки, а не одну кнопку карточки. + * все кнопки админки, а не одну кнопку карточки. Фото нажимается, как кнопка товара (F8). */ internal object StoryProductCard { @@ -24,6 +24,9 @@ internal object StoryProductCard { title = product.brand.takeIf { it.isNotEmpty() } subtitle = product.name if (product.image.isNotEmpty()) host.loadImage(imageView, product.image) + imageView.contentDescription = product.name + // Тап по фото — как кнопка товара: клик, просмотр закрывается, товар открывается (F8). + onImageClick = { host.onProduct(product) } this.price.type = price.type this.price.price = price.price this.price.oldPrice = price.oldPrice diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt index 6b29361a..8f9a3ec0 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt @@ -11,8 +11,10 @@ import androidx.core.graphics.Insets import com.personalization.Product import com.personalization.stories.models.Slide import com.personalization.stories.models.elements.ButtonElement +import com.personalization.ui.components.PersonalizationStoryCard import org.json.JSONArray import org.json.JSONObject +import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test @@ -22,7 +24,7 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config -/** One slide's touch routing: what reaches the controls while the products sheet is open. */ +/** One slide's touch routing: the controls over an open products sheet, the product picture. */ @RunWith(RobolectricTestRunner::class) @Config(sdk = [28]) class StorySlideViewTest { @@ -49,6 +51,17 @@ class StorySlideViewTest { assertFalse(view.onInterceptTouchEvent(down(middle))) } + @Test + fun `the product picture opens the product like the product button`() { + val view = laidOut(productSlide()) + val card = view.first(PersonalizationStoryCard::class.java)!! + val picture = card.imageView.parent as View + + assertTrue(picture.isClickable) + picture.performClick() + assertEquals(listOf("p1"), host.products.map { it.id }) + } + /** On screen: an unattached view has no location, and the slide hit-tests by location. */ private fun laidOut(slide: Slide): StorySlideView = StorySlideView(activity, 0, 0, slide, 1, host).also { view -> @@ -82,6 +95,26 @@ class StorySlideViewTest { ) ) + private fun productSlide(): Slide = Slide( + JSONObject() + .put("id", "2") + .put( + "elements", + JSONArray().put( + JSONObject() + .put("type", "product") + .put("item", JSONObject().put("id", "p1").put("name", "Sneakers").put("price_formatted", "100 ₽")) + ) + ) + ) + + private fun View.first(type: Class): T? { + if (type.isInstance(this)) return type.cast(this) + if (this !is ViewGroup) return null + for (index in 0 until childCount) getChildAt(index).first(type)?.let { return it } + return null + } + private class FakeHost : StorySlideHost { override val texts = StoriesTexts("Promo code", "Copied", "More info", "Used products", "Hide products", "Retry", "Close", "Sound on", "Sound off") override val muted = true From 5cd9eccf594412789f4736859711f3e495cf4f0a Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:38:00 +0400 Subject: [PATCH 15/31] fix(ui): stories v2 crossed price under a promo compares with the regular price --- .../ui/widgets/StoriesSupport.kt | 31 +++++++------- .../ui/widgets/StoriesMappingTest.kt | 40 +++++++++++++++++++ 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index d4aaddea..2c94f9e8 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -46,36 +46,33 @@ internal object StoriesMapping { ) /** - * Цена товарного слайда (C10). С промокодом крупно — цена по промокоду, зачёркнута - * старая цена, а без неё — обычная, если она отличается. Скидка — процент как есть, - * с дробной частью. Зачёркнутая цена показывается, только если она численно больше. + * Цена товарного слайда (C10, F10). Старая цена имеет смысл, только если она численно + * больше обычной. С промокодом крупно — цена по промокоду, зачёркнута старая цена, а без + * неё — обычная, если она отличается от цены по промокоду. Скидка — процент как есть, + * с дробной частью. */ fun price(product: Product): Price { val regular = product.priceDecimal ?: Decimals.parse(product.price) - val old = product.oldPrice.takeIf { it.isNotEmpty() } - val oldValue = product.oldPriceDecimal ?: Decimals.parse(product.oldPrice) + val old = product.oldPrice.takeIf { + it.isNotEmpty() && Decimals.greater(product.oldPriceDecimal ?: Decimals.parse(it), regular) + } val promo = product.promocode.trim().takeIf { it.isNotEmpty() && it != "null" } if (promo != null) { val withPromo = product.priceWithPromocode.takeIf { it.isNotEmpty() } - val shownValue = if (withPromo != null) { - product.priceWithPromocodeDecimal ?: Decimals.parse(withPromo) - } else { - regular - } + val promoValue = withPromo?.let { product.priceWithPromocodeDecimal ?: Decimals.parse(it) } val crossed = when { - old != null && Decimals.greater(oldValue, shownValue) -> old - withPromo != null && Decimals.greater(regular, shownValue) -> product.price + old != null -> old + Decimals.differ(regular, promoValue) -> product.price else -> null } return Price(PersonalizationStoryPrice.Type.PROMO_CODE, withPromo ?: product.price, crossed, null, promo) } - val crossed = old?.takeIf { Decimals.greater(oldValue, regular) } val percent = Decimals.parse(product.discountPercent)?.takeIf { it.signum() > 0 } if (percent != null) { val text = percent.stripTrailingZeros().toPlainString() + "%" - return Price(PersonalizationStoryPrice.Type.DISCOUNT, product.price, crossed, text, null) + return Price(PersonalizationStoryPrice.Type.DISCOUNT, product.price, old, text, null) } - return Price(PersonalizationStoryPrice.Type.PRICE, product.price, crossed, null, null) + return Price(PersonalizationStoryPrice.Type.PRICE, product.price, old, null, null) } /** Товар карусели «Используемые товары» → карточка кита. */ @@ -236,6 +233,10 @@ internal object Decimals { fun greater(left: BigDecimal?, right: BigDecimal?): Boolean = left != null && right != null && left > right + /** Оба числа есть и они разные (`1.0` и `1.00` — одно и то же). */ + fun differ(left: BigDecimal?, right: BigDecimal?): Boolean = + left != null && right != null && left.compareTo(right) != 0 + fun parse(text: String?): BigDecimal? { val raw = text?.trim().orEmpty() if (raw.isEmpty()) return null diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt index b3c62843..bf66f7f4 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -58,6 +58,46 @@ class StoriesMappingTest { assertEquals("1 500 ₽", price.oldPrice) } + @Test + fun `under a promo code an old price counts only above the regular price`() { + // 950 is above the promo price but below the regular one: the regular price is crossed out. + val belowRegular = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "oldprice" to 950, "oldprice_formatted" to "950 ₽", + "promocode" to "PROMO", "price_with_promocode" to 900, "price_with_promocode_formatted" to "900 ₽" + ) + ) + assertEquals("1 000 ₽", belowRegular.oldPrice) + // An old price equal to the regular one is no markdown either. + val equalToRegular = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "oldprice" to 1000, "oldprice_formatted" to "1 000.00 ₽", + "promocode" to "PROMO", "price_with_promocode_formatted" to "900 ₽" + ) + ) + assertEquals("1 000 ₽", equalToRegular.oldPrice) + } + + @Test + fun `under a promo code the regular price is crossed out only when it differs from the promo price`() { + val same = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "promocode" to "PROMO", "price_with_promocode" to "1000.00", "price_with_promocode_formatted" to "1 000 ₽" + ) + ) + assertNull(same.oldPrice) + val higherPromo = StoriesMapping.price( + product( + "price" to 1000, "price_formatted" to "1 000 ₽", + "promocode" to "PROMO", "price_with_promocode_formatted" to "1 100 ₽" + ) + ) + assertEquals("1 000 ₽", higherPromo.oldPrice) + } + @Test fun `a promo code without a promo price shows the regular price and crosses nothing`() { val price = StoriesMapping.price( From fadd0489daef0c36761f754c6e37dd373831532b Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:38:26 +0400 Subject: [PATCH 16/31] fix(ui): stories v2 preset line height is rounded --- .../ui/components/PersonalizationStoryTextBlock.kt | 8 ++++++-- .../com/personalization/ui/widgets/StoriesMappingTest.kt | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt index bb27af55..dcf2a000 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTextBlock.kt @@ -42,8 +42,12 @@ class PersonalizationStoryTextBlock @JvmOverloads constructor( /** Пресет, ближайший к кеглю [textSp]. */ fun nearest(textSp: Float): Size = values().minByOrNull { kotlin.math.abs(it.textSp - textSp) } ?: SMALL - /** Высота строки пресета, пересчитанная на кегль: 48/48 → 1.0, 30/36 и 20/24 → 1.2. */ - fun lineHeightFor(textSp: Float): Float = nearest(textSp).let { textSp * it.lineHeightSp / it.textSp } + /** + * Высота строки пресета, пересчитанная на кегль и округлённая (F4): 48/48 → 1.0, + * 30/36 и 20/24 → 1.2. Ничья между пресетами — у крупного. + */ + fun lineHeightFor(textSp: Float): Float = + nearest(textSp).let { Math.round(textSp * it.lineHeightSp / it.textSp).toFloat() } } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt index bf66f7f4..9366cdf6 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -344,7 +344,11 @@ class StoriesMappingTest { assertEquals(48f, PersonalizationStoryTextBlock.Size.lineHeightFor(48f), 0.01f) assertEquals(36f, PersonalizationStoryTextBlock.Size.lineHeightFor(30f), 0.01f) assertEquals(24f, PersonalizationStoryTextBlock.Size.lineHeightFor(20f), 0.01f) - assertEquals(16.8f, PersonalizationStoryTextBlock.Size.lineHeightFor(14f), 0.01f) + // round(size × ratio): 14 × 1.2 = 16.8 → 17. + assertEquals(17f, PersonalizationStoryTextBlock.Size.lineHeightFor(14f), 0.01f) + // 39 is as far from Large (48) as from Medium (30): the tie goes to Large, ratio 1.0. + assertEquals(39f, PersonalizationStoryTextBlock.Size.lineHeightFor(39f), 0.01f) + assertEquals(PersonalizationStoryTextBlock.Size.LARGE, PersonalizationStoryTextBlock.Size.nearest(39f)) } // --- Loading (C16) -------------------------------------------------------------------------- From 8ff5e11af0d2c63563846a5cb1c7fc7b4e81af31 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:38:57 +0400 Subject: [PATCH 17/31] fix(ui): sound button exposes its state as selected --- .../PersonalizationStoryUsedProducts.kt | 2 ++ .../PersonalizationStoryComponentsTest.kt | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt index f41edec0..8f06c477 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryUsedProducts.kt @@ -145,6 +145,8 @@ class PersonalizationStoryUsedProducts @JvmOverloads constructor( // В макете выключенный звук — иконка на 65%, включённый — непрозрачная. sound.alpha = if (muted) MUTED_ALPHA else 1f sound.contentDescription = if (muted) soundOffDescription else soundOnDescription + // Состояние переключателя для TalkBack: звук включён — кнопка выбрана (F1). + sound.isSelected = !muted } private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt() diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt index 993c1ac3..acca84e6 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt @@ -6,7 +6,9 @@ import android.content.Context import android.graphics.Color import android.view.View import android.view.ViewGroup +import android.widget.ImageView import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test @@ -135,6 +137,27 @@ class PersonalizationStoryComponentsTest { assertEquals(View.GONE, star.visibility) } + @Test + fun `the sound button names the current sound state and is selected while the sound is on`() { + val used = PersonalizationStoryUsedProducts(activity).apply { + showSoundButton = true + muted = true + } + val sound = firstImage(used) { it.contentDescription == "Sound off" }!! + assertFalse(sound.isSelected) + + used.muted = false + assertEquals("Sound on", sound.contentDescription) + assertTrue(sound.isSelected) + } + + private fun firstImage(view: View, matches: (ImageView) -> Boolean): ImageView? { + if (view is ImageView && matches(view)) return view + if (view !is ViewGroup) return null + for (index in 0 until view.childCount) firstImage(view.getChildAt(index), matches)?.let { return it } + return null + } + private fun rightBlocks(price: PersonalizationStoryPrice): Pair = price.getChildAt(1) to price.getChildAt(2) From cb587ea4b775789cc671acafafc2ffd814856ba2 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:41:10 +0400 Subject: [PATCH 18/31] fix(ui): stories v2 media timers stand still in background --- .../widgets/PersonalizationStoriesViewer.kt | 35 +++++---- .../ui/widgets/StoriesViewerViews.kt | 52 +++++++++++++ .../ui/widgets/StoriesViewerSupportTest.kt | 78 +++++++++++++++++++ 3 files changed, 149 insertions(+), 16 deletions(-) create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index c7038c1c..1bfc4344 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -104,6 +104,8 @@ class PersonalizationStoriesViewer( private val pages = HashMap() private val handler = Handler(Looper.getMainLooper()) private val frameClock = StoryFrameClock(::onFrame) + private val readyTimer = StoryTimer(handler) { onReadyTimeout() } + private val videoRetryTimer = StoryTimer(handler) { currentSlideView()?.let(::retry) } private var player: ExoPlayer? = null private var playerSlide: StorySlideView? = null private var audioFocus: StoriesAudioFocus? = null @@ -222,6 +224,7 @@ class PersonalizationStoriesViewer( hostLifecycle = lifecycle hostStopped = !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) lifecycle.addObserver(hostObserver) + setBackground() } private val hostObserver = LifecycleEventObserver { _, event -> @@ -236,7 +239,11 @@ class PersonalizationStoriesViewer( private fun setBackground(stopped: Boolean = hostStopped) { hostStopped = stopped if (!created) return - state.setPaused(Pause.BACKGROUND, hostStopped || !windowFocused) + val background = hostStopped || !windowFocused + state.setPaused(Pause.BACKGROUND, background) + // Ожидание готовности и автоповтор видео в фоне стоят и потом идут с остатка (F5). + readyTimer.freeze(background) + videoRetryTimer.freeze(background) sync() } @@ -523,7 +530,9 @@ class PersonalizationStoriesViewer( /** * Часы слайда пойдут, когда медиа готово (C5): картинка загружена, видео играет. - * Не готово за 10 с или ошибка — пауза и «Повторить». + * Не готово за 10 с или ошибка — пауза и «Повторить». Время в фоне не считается (F5): + * Glide на `onStop` хоста ставит загрузки на паузу без ошибки и сам продолжает их на + * `onStart`, а ожидание готовности тем временем заморожено. */ private fun startMedia(view: StorySlideView) { if (view.mediaStarted || dismissed) return @@ -538,7 +547,7 @@ class PersonalizationStoriesViewer( } else -> onMediaReady(view, null) } - if (view.isMedia) handler.postDelayed(readyTimeout, READY_TIMEOUT_MS) + if (view.isMedia) readyTimer.start(READY_TIMEOUT_MS) } private fun onImageState(view: StorySlideView) { @@ -552,8 +561,7 @@ class PersonalizationStoriesViewer( private fun onMediaReady(view: StorySlideView, videoDurationMs: Long?) { if (view !== currentSlideView() || dismissed) return view.mediaReadyOnce = true - handler.removeCallbacks(readyTimeout) - handler.removeCallbacks(videoRetry) + cancelMediaTimers() view.showRetry(false) state.mediaReady(videoDurationMs) sync() @@ -561,24 +569,19 @@ class PersonalizationStoriesViewer( private fun onMediaFailed(view: StorySlideView) { if (view !== currentSlideView() || dismissed) return - handler.removeCallbacks(readyTimeout) + readyTimer.cancel() state.mediaFailed() view.showRetry(true) // Видео пробует ещё раз само; картинка — по кнопке. - if (view.isVideo) { - handler.removeCallbacks(videoRetry) - handler.postDelayed(videoRetry, VIDEO_RETRY_MS) - } + if (view.isVideo) videoRetryTimer.start(VIDEO_RETRY_MS) sync() } - private val readyTimeout = Runnable { - val view = currentSlideView() ?: return@Runnable + private fun onReadyTimeout() { + val view = currentSlideView() ?: return if (!view.mediaReadyOnce && !state.hasError) onMediaFailed(view) } - private val videoRetry = Runnable { currentSlideView()?.let(::retry) } - private fun retry(view: StorySlideView) { if (view !== currentSlideView() || dismissed) return cancelMediaTimers() @@ -593,8 +596,8 @@ class PersonalizationStoriesViewer( } private fun cancelMediaTimers() { - handler.removeCallbacks(readyTimeout) - handler.removeCallbacks(videoRetry) + readyTimer.cancel() + videoRetryTimer.cancel() } /** Уход со слайда: таймеры и повторы отменяются, плеер отдан. */ diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt index fa7a8a67..a307a606 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerViews.kt @@ -4,6 +4,8 @@ import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.content.ContextWrapper +import android.os.Handler +import android.os.SystemClock import android.view.Choreographer import android.view.MotionEvent import android.view.VelocityTracker @@ -96,6 +98,56 @@ internal class StoryFrameClock(private val onTick: (deltaMs: Long) -> Unit) : Ch } } +/** + * Отложенное действие просмотра: ожидание готовности медиа (10 с) и автоповтор видео (15 с). + * В фоне оно заморожено ([freeze]): время не идёт, а после возврата продолжается с остатка + * (F5) — пока приложение свёрнуто, слайд не успевает «не загрузиться». + */ +internal class StoryTimer(private val handler: Handler, private val action: () -> Unit) { + + /** Сколько осталось до срабатывания, мс; `null` — не заведён. */ + private var remainingMs: Long? = null + private var postedAt = 0L + private var frozen = false + private val runnable = Runnable { + remainingMs = null + action() + } + + val isScheduled: Boolean get() = remainingMs != null + + /** Завести заново на [delayMs]. В заморозке отсчёт начнётся после разморозки. */ + fun start(delayMs: Long) { + cancel() + remainingMs = delayMs + if (!frozen) post() + } + + fun cancel() { + handler.removeCallbacks(runnable) + remainingMs = null + } + + /** Заморозить отсчёт или продолжить его с остатка. */ + fun freeze(value: Boolean) { + if (frozen == value) return + frozen = value + val left = remainingMs ?: return + if (value) { + handler.removeCallbacks(runnable) + remainingMs = (left - (SystemClock.uptimeMillis() - postedAt)).coerceAtLeast(0L) + } else { + post() + } + } + + private fun post() { + val delay = remainingMs ?: return + postedAt = SystemClock.uptimeMillis() + handler.postDelayed(runnable, delay) + } +} + /** * Слой касаний слайда: тап по трети ширины (B1) и удержание (B2). Нажатие дольше 200 мс — * пауза; отпускание её снимает и никуда не листает. Сдвинутый палец — не тап: его заберёт diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt new file mode 100644 index 00000000..95f40c4b --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt @@ -0,0 +1,78 @@ +package com.personalization.ui.widgets + +import android.os.Handler +import android.os.Looper +import java.util.concurrent.TimeUnit +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +/** The viewer's helpers: timers that stand still in the background. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class StoriesViewerSupportTest { + + private val looper = shadowOf(Looper.getMainLooper()) + private val handler = Handler(Looper.getMainLooper()) + + @Test + fun `a frozen timer stands still and then runs out its remaining time`() { + var fired = 0 + val timer = StoryTimer(handler) { fired++ } + timer.start(10_000) + idle(4_000) + + timer.freeze(true) + idle(60_000) + assertEquals(0, fired) + assertTrue(timer.isScheduled) + + timer.freeze(false) + idle(5_999) + assertEquals(0, fired) + idle(1) + assertEquals(1, fired) + assertFalse(timer.isScheduled) + } + + @Test + fun `a timer started while frozen counts only after the thaw`() { + var fired = 0 + val timer = StoryTimer(handler) { fired++ } + timer.freeze(true) + timer.start(15_000) + idle(30_000) + assertEquals(0, fired) + + timer.freeze(false) + idle(15_000) + assertEquals(1, fired) + } + + @Test + fun `a cancelled or restarted timer does not fire for the old start`() { + var fired = 0 + val timer = StoryTimer(handler) { fired++ } + timer.start(10_000) + timer.freeze(true) + timer.cancel() + timer.freeze(false) + idle(20_000) + assertEquals(0, fired) + + timer.start(10_000) + idle(6_000) + timer.start(10_000) + idle(6_000) + assertEquals(0, fired) + idle(4_000) + assertEquals(1, fired) + } + + private fun idle(ms: Long) = looper.idleFor(ms, TimeUnit.MILLISECONDS) +} From d6c6d099bc8e9ecdf45deca0d41887047b92a2e3 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:41:35 +0400 Subject: [PATCH 19/31] fix(ui): stories v2 audio interruptions keep the sound choice --- .../widgets/PersonalizationStoriesViewer.kt | 37 ++++++++++------- .../ui/widgets/StoriesMedia.kt | 39 +++++++++++++++++- .../ui/widgets/StoriesViewerSupportTest.kt | 41 ++++++++++++++++++- 3 files changed, 100 insertions(+), 17 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 1bfc4344..9cc28e08 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -109,6 +109,7 @@ class PersonalizationStoriesViewer( private var player: ExoPlayer? = null private var playerSlide: StorySlideView? = null private var audioFocus: StoriesAudioFocus? = null + private val sound = StoriesSound() private var insets: Insets = Insets.NONE private var hostLifecycle: Lifecycle? = null private var created = false @@ -177,7 +178,7 @@ class PersonalizationStoriesViewer( } setContentView(root) volumeControlStream = AudioManager.STREAM_MUSIC - audioFocus = StoriesAudioFocus(hostContext) { setMuted(true) } + audioFocus = StoriesAudioFocus(hostContext) { silence() } observeHost() if (stories.isEmpty()) { @@ -266,7 +267,7 @@ class PersonalizationStoriesViewer( /** Кнопка громкости вверх включает звук (C7); громкость меняет система, как обычно. */ override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { - if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && muted) setMuted(false) + if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && sound.muted) setMuted(false) return super.onKeyDown(keyCode, event) } @@ -402,7 +403,7 @@ class PersonalizationStoriesViewer( private val slideHost = object : StorySlideHost { override val texts: StoriesTexts get() = this@PersonalizationStoriesViewer.texts - override val muted: Boolean get() = Companion.muted + override val muted: Boolean get() = sound.muted override val sheetOpen: Boolean get() = created && state.sheetOpen override val insets: Insets get() = this@PersonalizationStoriesViewer.insets @@ -456,7 +457,7 @@ class PersonalizationStoriesViewer( override fun onPromoCopied() = track("click") - override fun onSoundToggle() = setMuted(!Companion.muted) + override fun onSoundToggle() = setMuted(!sound.muted) override fun onRetry(view: StorySlideView) = retry(view) @@ -671,31 +672,41 @@ class PersonalizationStoriesViewer( } override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) { - // Выдернули наушники: звук выключается, ролик идёт дальше без звука. + // Выдернули наушники: ролик идёт дальше без звука, выбор звука не меняется (F6). if (reason == androidx.media3.common.Player.PLAY_WHEN_READY_CHANGE_REASON_AUDIO_BECOMING_NOISY) { - setMuted(true) + silence() sync() } } } + /** Звук включил или выключил пользователь: выбор запоминается на весь процесс (C7). */ private fun setMuted(value: Boolean) { - muted = value + sound.choose(value) + applySound() + } + + /** Звонок, другой плеер, выдернутые наушники: глушится только это воспроизведение (F6). */ + private fun silence() { + if (sound.silence()) applySound() + } + + private fun applySound() { applyVolume() - pages.values.forEach { it.slideView?.setMuted(value) } + pages.values.forEach { it.slideView?.setMuted(sound.muted) } updateAudioFocus() } private fun applyVolume() { val exo = player ?: return - exo.volume = if (muted) 0f else 1f - exo.setHandleAudioBecomingNoisy(!muted) + exo.volume = if (sound.muted) 0f else 1f + exo.setHandleAudioBecomingNoisy(!sound.muted) } /** Фокус берётся, только пока звук включён и видео на экране (C7). */ private fun updateAudioFocus() { val focus = audioFocus ?: return - val wanted = created && !dismissed && !muted && playerSlide != null && !state.isPaused(Pause.BACKGROUND) + val wanted = created && !dismissed && !sound.muted && playerSlide != null && !state.isPaused(Pause.BACKGROUND) if (wanted) focus.request() else focus.abandon() } @@ -772,10 +783,6 @@ class PersonalizationStoriesViewer( } private companion object { - /** Выбор звука живёт до конца процесса (C7); первый просмотр — без звука. */ - @Volatile - var muted = true - /** Без слушателя хоста — поведение по умолчанию из контракта: SDK открывает сам. */ val DEFAULT_CLICKS = object : OnClickListener {} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt index 6eaed58c..64253b7d 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesMedia.kt @@ -84,11 +84,48 @@ internal object StoriesMediaCache { } } +/** + * Звук просмотра сторис (C7, F6). Выбор пользователя ([chosenMuted]) живёт до конца процесса: + * первый просмотр без звука, дальше — как выбрали. Потеря аудиофокуса (звонок, другой плеер) + * и выдернутые наушники только глушат текущее воспроизведение ([silence]): выбор остаётся, + * и следующий просмотр откроется с ним. Сам пользователь звук возвращает кнопкой или + * громкостью вверх ([choose]). + */ +internal class StoriesSound { + + /** Звук заглушён системой в этом просмотре. */ + var silenced = false + private set + + /** Звука сейчас нет: так выбрал пользователь или заглушила система. */ + val muted: Boolean get() = chosenMuted || silenced + + /** Выбор пользователя: он запоминается, заглушение снимается. */ + fun choose(muted: Boolean) { + chosenMuted = muted + silenced = false + } + + /** Заглушить текущее воспроизведение, не трогая выбор. `true` — звук был и пропал. */ + fun silence(): Boolean { + if (muted) return false + silenced = true + return true + } + + companion object { + /** Выбор пользователя на весь процесс; первый просмотр — без звука. */ + @Volatile + var chosenMuted = true + internal set + } +} + /** * Аудиофокус видео сторис (C7). Пока звук выключен, фокус не берётся — музыка других * приложений играет дальше. Включённый звук берёт временный фокус: чужой плеер встаёт * на паузу и сам продолжит, когда просмотр отдаст фокус (выключил звук, закрыл). - * Потеря фокуса (звонок, другой плеер) выключает звук — [onLoss]. + * Потеря фокуса (звонок, другой плеер) глушит текущее воспроизведение — [onLoss] (F6). */ internal class StoriesAudioFocus(context: Context, private val onLoss: () -> Unit) { diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt index 95f40c4b..ead7d40c 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerSupportTest.kt @@ -3,6 +3,7 @@ package com.personalization.ui.widgets import android.os.Handler import android.os.Looper import java.util.concurrent.TimeUnit +import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -12,7 +13,7 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config -/** The viewer's helpers: timers that stand still in the background. */ +/** The viewer's helpers: timers that stand still in the background, the kept sound choice. */ @RunWith(RobolectricTestRunner::class) @Config(sdk = [28]) class StoriesViewerSupportTest { @@ -74,5 +75,43 @@ class StoriesViewerSupportTest { assertEquals(1, fired) } + @Test + fun `an audio interruption silences this viewer but keeps the chosen sound`() { + val sound = StoriesSound() + sound.choose(false) + + assertTrue(sound.silence()) + assertTrue(sound.muted) + assertFalse(StoriesSound.chosenMuted) + // The next viewer opens with the kept choice. + assertFalse(StoriesSound().muted) + } + + @Test + fun `the user's own choice lifts the silence`() { + val sound = StoriesSound() + sound.choose(false) + sound.silence() + + sound.choose(false) + assertFalse(sound.muted) + assertFalse(sound.silenced) + } + + @Test + fun `nothing is silenced while the sound is already off`() { + val sound = StoriesSound() + sound.choose(true) + + assertFalse(sound.silence()) + assertFalse(sound.silenced) + assertTrue(StoriesSound.chosenMuted) + } + + @After + fun resetSound() { + StoriesSound.chosenMuted = true + } + private fun idle(ms: Long) = looper.idleFor(ms, TimeUnit.MILLISECONDS) } From 58ed2a72e5a6eaad94b2b4d41d058bc3c6ee5745 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:43:56 +0400 Subject: [PATCH 20/31] fix(ui): stories v2 open pages inside an open viewer --- .../ui/widgets/PersonalizationStories.kt | 10 +- .../widgets/PersonalizationStoriesViewer.kt | 19 ++- .../ui/widgets/StoriesViewerState.kt | 10 ++ .../ui/widgets/PersonalizationStoriesTest.kt | 116 ++++++++++++++++++ .../ui/widgets/StoriesViewerStateTest.kt | 26 ++++ 5 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt index bb79bd6f..c3e88b10 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -135,13 +135,17 @@ class PersonalizationStories @JvmOverloads constructor( ) } - /** Открыть просмотр со сторис [index]. До загрузки блока — откроется, когда он придёт. */ + /** + * Открыть просмотр со сторис [index]. До загрузки блока — откроется, когда он придёт. + * Просмотр уже открыт — листает к ней в нём, не пересоздавая его (F11). + */ fun open(index: Int) { if (stories.isEmpty()) { pendingOpen = { open(index) } return } - if (index !in stories.indices) return + val story = stories.getOrNull(index) ?: return + if (viewer?.showStory(story.id) == true) return viewer?.dismiss() viewer = newViewer(context, stories, index).also { viewer -> viewer.setOnDismissListener { @@ -161,7 +165,7 @@ class PersonalizationStories @JvmOverloads constructor( stories.indexOfFirst { it.id == storyId }.takeIf { it >= 0 }?.let(::open) } - /** Пауза открытого просмотра (B8). */ + /** Пауза открытого просмотра (B8); без просмотра — ничего. */ fun pause() { viewer?.pause() } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 9cc28e08..10ca7b7a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -57,7 +57,7 @@ class PersonalizationStoriesViewer( /** Сторис без слайдов не показываются (C16). */ private val stories: List = stories.filter { it.slidesCount > 0 } - private val startIndex: Int = stories.getOrNull(startStory)?.let { this.stories.indexOf(it) }?.takeIf { it >= 0 } ?: 0 + private var startIndex: Int = stories.getOrNull(startStory)?.let { this.stories.indexOf(it) }?.takeIf { it >= 0 } ?: 0 /** Код блока — для трекинга. */ var code: String? = null @@ -126,6 +126,23 @@ class PersonalizationStoriesViewer( /** Снять паузу хоста. */ fun resume() = setHostPaused(false) + /** + * Открыть сторис [storyId] в уже открытом просмотре (F11): пейджер листает к ней, просмотр + * не пересоздаётся. `false` — такой сторис в просмотре нет или он уже закрыт. + */ + internal fun showStory(storyId: Int): Boolean { + if (dismissed) return false + val index = stories.indexOfFirst { it.id == storyId } + if (index < 0) return false + if (!created) { + startIndex = index + return true + } + if (state.sheetOpen) currentSlideView()?.closeSheet() + apply(state.jumpTo(index)) + return true + } + private fun setHostPaused(paused: Boolean) { hostPaused = paused if (!created) return diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt index e5fa1007..d52e4184 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt @@ -201,6 +201,16 @@ internal class StoriesViewerState( } } + /** + * Хост открывает сторис [index], пока просмотр открыт (F11): листаем к ней в нём же. + * Шторка закрывается; сторис откроется по правилу A4, когда пейджер на неё встанет. + */ + fun jumpTo(index: Int): Move { + if (index !in stories.indices || index == storyIndex) return Move.None + if (sheetOpen) setSheet(false) + return away(Move.Story(index)) + } + /** * Уходим со сторис: часы стоят, пока пейджер не встанет на соседнюю, — иначе каждый * следующий тик снова просил бы перейти. diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt new file mode 100644 index 00000000..ed802265 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt @@ -0,0 +1,116 @@ +package com.personalization.ui.widgets + +import android.app.Activity +import android.os.Looper +import android.view.View +import android.view.ViewGroup +import androidx.viewpager2.widget.ViewPager2 +import com.personalization.SDK +import com.personalization.api.OnApiCallbackListener +import com.personalization.stories.StoriesManager +import io.mockk.every +import io.mockk.mockk +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.shadows.ShadowDialog + +/** The widget's programmatic control: open, open by id, pause and resume around one viewer. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class PersonalizationStoriesTest { + + private val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + private lateinit var sdk: SDK + + @Before + fun setUp() { + val manager = mockk(relaxed = true) + every { manager.requestStories(any(), any()) } answers { + secondArg().onSuccess(block(ids = listOf(11, 12, 13))) + } + sdk = mockk(relaxed = true) + every { sdk.storiesManager } returns manager + } + + @Test + fun `open while the viewer is open pages inside that viewer`() { + val widget = widget() + widget.open(0) + idle() + val viewer = ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer + assertEquals(0, pager(viewer).currentItem) + + widget.open(2) + idle() + assertSame(viewer, ShadowDialog.getLatestDialog()) + assertTrue(viewer.isShowing) + assertEquals(1, ShadowDialog.getShownDialogs().size) + assertEquals(2, pager(viewer).currentItem) + + widget.openStory(12) + idle() + assertEquals(1, pager(viewer).currentItem) + assertEquals(1, ShadowDialog.getShownDialogs().size) + } + + @Test + fun `pause and resume without an open viewer do nothing`() { + val widget = widget() + widget.pause() + widget.resume() + idle() + assertEquals(0, ShadowDialog.getShownDialogs().size) + } + + /** Photo slides whose loader never answers: the slide clock stands, nothing pages by itself. */ + private fun widget() = PersonalizationStories(activity).apply { + code = "BLOCK" + imageLoader = { _, _ -> } + attach(sdk) + } + + private fun pager(viewer: PersonalizationStoriesViewer): ViewPager2 = + find(viewer.window!!.decorView, ViewPager2::class.java)!! + + private fun find(view: View, type: Class): T? { + if (type.isInstance(view)) return type.cast(view) + if (view !is ViewGroup) return null + for (index in 0 until view.childCount) find(view.getChildAt(index), type)?.let { return it } + return null + } + + private fun idle() = shadowOf(Looper.getMainLooper()).idle() + + private fun block(ids: List) = JSONObject().put( + "stories", + JSONArray().apply { + ids.forEach { id -> + put( + JSONObject() + .put("id", id) + .put("name", "Story $id") + .put( + "slides", + JSONArray().put( + JSONObject() + .put("id", "${id}1") + .put("type", "image") + .put("background", "https://example.com/$id.jpg") + .put("elements", JSONArray()) + ) + ) + ) + } + } + ) +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt index 3733c10e..621c0852 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt @@ -201,6 +201,32 @@ class StoriesViewerStateTest { assertFalse(state.isPaused(Pause.SHEET)) } + @Test + fun `opening another story from the host pages there inside the open viewer`() { + seen.markSeen(3, "3_0") + val state = entered(story(1, slides = 2), story(2, slides = 2), story(3, slides = 3)) + state.mediaReady() + state.setSheet(true) + + assertEquals(Move.Story(2), state.jumpTo(2)) + assertFalse(state.sheetOpen) + // The clock stands until the pager settles on the new story. + assertFalse(state.isRunning) + assertEquals(Move.None, state.tick(StoriesMapping.DEFAULT_DURATION_MS)) + + state.selectStory(2) + assertTrue(state.enter()) + assertEquals(1, state.slideIndex) + } + + @Test + fun `opening the current or a missing story from the host changes nothing`() { + val state = entered(story(1, slides = 2), story(2, slides = 2)) + assertEquals(Move.None, state.jumpTo(0)) + assertEquals(Move.None, state.jumpTo(5)) + assertTrue(state.entered) + } + @Test fun `the time is up only once per slide`() { val state = entered(story(1, slides = 1), story(2, slides = 1)) From 9579f48a0b4feca114d2d8596cbcdf6c1951ba32 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:44:55 +0400 Subject: [PATCH 21/31] feat(ui): stories v2 show reports the viewer closing, stories open by a string id --- .../ui/widgets/PersonalizationStories.kt | 24 +++++-- .../widgets/PersonalizationStoriesWidget.kt | 5 ++ .../ui/widgets/PersonalizationStoriesTest.kt | 63 ++++++++++++++++++- 3 files changed, 84 insertions(+), 8 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt index c3e88b10..9f310d50 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -165,6 +165,11 @@ class PersonalizationStories @JvmOverloads constructor( stories.indexOfFirst { it.id == storyId }.takeIf { it >= 0 }?.let(::open) } + /** То же по id строкой — как его отдают другие платформы (F12). Не число — ничего. */ + fun openStory(storyId: String) { + storyId.trim().toIntOrNull()?.let { openStory(it) } + } + /** Пауза открытого просмотра (B8); без просмотра — ничего. */ fun pause() { viewer?.pause() @@ -243,9 +248,12 @@ class PersonalizationStories @JvmOverloads constructor( /** * Показать сторис блока [code] без ленты (B8): загрузить блок и открыть просмотр - * со сторис [startStoryId] (или с первой). SDK — [sdk], иначе инстанс магазина - * [shopId]. Тексты `null` — по умолчанию из ресурсов. Ошибки — в [onError]. - * Возвращает отмену ещё не открытого показа. + * со сторис [startStoryId] (нет такой — с первой). SDK — [sdk], иначе инстанс + * магазина [shopId]. Тексты `null` — по умолчанию из ресурсов. + * + * Пустой блок, ошибка загрузки, магазин не найден или 15 с без ответа — [onError], + * и показ на этом заканчивается. Просмотр закрыли — [onClose] (F12; на RN и Flutter + * так завершаются Promise и Future). Возвращает отмену ещё не открытого показа. */ @JvmStatic @JvmOverloads @@ -257,6 +265,7 @@ class PersonalizationStories @JvmOverloads constructor( startStoryId: Int? = null, onClickListener: com.personalization.OnClickListener? = null, onError: ((code: Int, message: String?) -> Unit)? = null, + onClose: (() -> Unit)? = null, imageLoader: ((ImageView, String) -> Unit)? = null, promoCaption: CharSequence? = null, promoCopiedText: CharSequence? = null, @@ -284,7 +293,7 @@ class PersonalizationStories @JvmOverloads constructor( soundOnLabel?.let { widget.soundOnLabel = it } soundOffLabel?.let { widget.soundOffLabel = it } } - return widget.showDetached(sdk, startStoryId) + return widget.showDetached(sdk, startStoryId, onClose) } } @@ -292,7 +301,7 @@ class PersonalizationStories @JvmOverloads constructor( * Показ без ленты: виджет не на экране, поэтому SDK и таймаут ведутся вручную, * а просмотр открывается, как только блок пришёл. */ - private fun showDetached(explicitSdk: SDK?, startStoryId: Int?): Cancellable { + private fun showDetached(explicitSdk: SDK?, startStoryId: Int?, onClose: (() -> Unit)?): Cancellable { val handler = android.os.Handler(android.os.Looper.getMainLooper()) handler.postDelayed(giveUp, LOAD_TIMEOUT_MS) pendingOpen = open@{ @@ -302,7 +311,10 @@ class PersonalizationStories @JvmOverloads constructor( return@open } val index = startStoryId?.let { id -> stories.indexOfFirst { it.id == id } }?.takeIf { it >= 0 } ?: 0 - newViewer(context, stories, index).show() + newViewer(context, stories, index).apply { + setOnDismissListener { onClose?.invoke() } + show() + } } val previousError = onError onError = { code, message -> diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt index ccedc53b..5f5e1bb0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt @@ -27,6 +27,11 @@ class PersonalizationStoriesController { view?.openStory(storyId) } + /** То же по id строкой (F12). */ + fun openStory(storyId: String) { + view?.openStory(storyId) + } + fun pause() { view?.pause() } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt index ed802265..f5f042a3 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt @@ -24,19 +24,20 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowDialog -/** The widget's programmatic control: open, open by id, pause and resume around one viewer. */ +/** The widget's programmatic control (open, open by id, pause, resume) and show() without the bar. */ @RunWith(RobolectricTestRunner::class) @Config(sdk = [28]) class PersonalizationStoriesTest { private val activity = Robolectric.buildActivity(Activity::class.java).setup().get() private lateinit var sdk: SDK + private var served = listOf(11, 12, 13) @Before fun setUp() { val manager = mockk(relaxed = true) every { manager.requestStories(any(), any()) } answers { - secondArg().onSuccess(block(ids = listOf(11, 12, 13))) + secondArg().onSuccess(block(served)) } sdk = mockk(relaxed = true) every { sdk.storiesManager } returns manager @@ -72,6 +73,64 @@ class PersonalizationStoriesTest { assertEquals(0, ShadowDialog.getShownDialogs().size) } + @Test + fun `a story opens by its id as a string, a non-number opens nothing`() { + val widget = widget() + widget.openStory("x") + idle() + assertEquals(0, ShadowDialog.getShownDialogs().size) + + widget.openStory(" 13 ") + idle() + assertEquals(2, pager(ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer).currentItem) + } + + @Test + fun `show reports the viewer closing`() { + var closed = 0 + var errors = 0 + show(startStoryId = 12, onError = { errors++ }, onClose = { closed++ }) + val viewer = ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer + assertEquals(1, pager(viewer).currentItem) + assertEquals(0, closed) + + viewer.dismiss() + idle() + assertEquals(1, closed) + assertEquals(0, errors) + } + + @Test + fun `show with an unknown start story opens the first one`() { + show(startStoryId = 99) + assertEquals(0, pager(ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer).currentItem) + } + + @Test + fun `show of an empty block reports the error and opens nothing`() { + served = emptyList() + var closed = 0 + var errors = 0 + show(onError = { errors++ }, onClose = { closed++ }) + + assertEquals(1, errors) + assertEquals(0, closed) + assertEquals(0, ShadowDialog.getShownDialogs().size) + } + + private fun show(startStoryId: Int? = null, onError: () -> Unit = {}, onClose: () -> Unit = {}) { + PersonalizationStories.show( + context = activity, + code = "BLOCK", + sdk = sdk, + startStoryId = startStoryId, + onError = { _, _ -> onError() }, + onClose = onClose, + imageLoader = { _, _ -> } + ) + idle() + } + /** Photo slides whose loader never answers: the slide clock stands, nothing pages by itself. */ private fun widget() = PersonalizationStories(activity).apply { code = "BLOCK" From 6959a5ad39c7d41e0c66eaa7cecded96a957f40f Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:45:31 +0400 Subject: [PATCH 22/31] fix(ui): stories v2 controller keeps an open call until the widget shows --- .../widgets/PersonalizationStoriesWidget.kt | 25 ++++++++++++------- .../ui/widgets/PersonalizationStoriesTest.kt | 11 ++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt index 5f5e1bb0..cc457cf7 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesWidget.kt @@ -12,24 +12,31 @@ import com.personalization.ui.InternalPersonalizationUiApi /** * Управление сторис из Compose (B8): то же, что методы [PersonalizationStories]. - * Передаётся в [PersonalizationStoriesWidget]; до показа виджета вызовы ничего не делают. + * Передаётся в [PersonalizationStoriesWidget]. Открытие до показа виджета ждёт его, как + * ждёт загрузки блока (F11); пауза и остальное без виджета ничего не делают. */ @InternalPersonalizationUiApi class PersonalizationStoriesController { internal var view: PersonalizationStories? = null + set(value) { + field = value + if (value != null) pendingOpen?.also { pendingOpen = null }?.invoke(value) + } - fun open(index: Int) { - view?.open(index) - } + /** Последнее открытие, вызванное до показа виджета. */ + private var pendingOpen: ((PersonalizationStories) -> Unit)? = null - fun openStory(storyId: Int) { - view?.openStory(storyId) - } + fun open(index: Int) = openWhenShown { it.open(index) } + + fun openStory(storyId: Int) = openWhenShown { it.openStory(storyId) } /** То же по id строкой (F12). */ - fun openStory(storyId: String) { - view?.openStory(storyId) + fun openStory(storyId: String) = openWhenShown { it.openStory(storyId) } + + private fun openWhenShown(action: (PersonalizationStories) -> Unit) { + val target = view + if (target != null) action(target) else pendingOpen = action } fun pause() { diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt index f5f042a3..5820272c 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt @@ -85,6 +85,17 @@ class PersonalizationStoriesTest { assertEquals(2, pager(ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer).currentItem) } + @Test + fun `the compose controller keeps an open call until the widget shows`() { + val controller = PersonalizationStoriesController() + controller.openStory("12") + controller.pause() + + controller.view = widget() + idle() + assertEquals(1, pager(ShadowDialog.getLatestDialog() as PersonalizationStoriesViewer).currentItem) + } + @Test fun `show reports the viewer closing`() { var closed = 0 From a3258b8f9ebe8aa19aa68fe87cf7a7a6c95dc361 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:46:57 +0400 Subject: [PATCH 23/31] feat(demo): stories v2 show reports the viewer closing --- .../java/com/personalization/demo/StoriesV2Compose.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt index d9623cf3..4519a1f4 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt @@ -25,13 +25,14 @@ import com.personalization.ui.widgets.PersonalizationStoriesWidget /** * The Compose wrapper of the Stories V2 block on the demo shop, driven by a controller (open a story - * by index), and the same block shown without the bar through PersonalizationStories.show(). + * by index — while the viewer is open it pages there), and the same block shown without the bar + * through PersonalizationStories.show(), which reports the viewer closing. */ @Composable internal fun StoriesV2ComposeExhibit(storiesCode: String, shopId: String) { val context = LocalContext.current val controller = remember { PersonalizationStoriesController() } - var status by remember { mutableStateOf("Errors of the block and of show() appear here") } + var status by remember { mutableStateOf("Errors of the block and of show(), and its closing, appear here") } val clicks = remember { DemoStoriesClicks(context) } Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { @@ -55,7 +56,8 @@ internal fun StoriesV2ComposeExhibit(storiesCode: String, shopId: String) { code = storiesCode, shopId = shopId, onClickListener = clicks, - onError = { code, message -> status = "show() onError $code: $message" } + onError = { code, message -> status = "show() onError $code: $message" }, + onClose = { status = "show() viewer closed" } ) }) { Text("Show without bar") } } From 5480aeb59b1ae36133ca159ec3ed19760f7e3753 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 09:48:39 +0400 Subject: [PATCH 24/31] fix(ui): stories v2 crosses out the regular price only above the promo price --- .../com/personalization/ui/widgets/StoriesSupport.kt | 8 ++------ .../com/personalization/ui/widgets/StoriesMappingTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index 2c94f9e8..bdb51aee 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -48,7 +48,7 @@ internal object StoriesMapping { /** * Цена товарного слайда (C10, F10). Старая цена имеет смысл, только если она численно * больше обычной. С промокодом крупно — цена по промокоду, зачёркнута старая цена, а без - * неё — обычная, если она отличается от цены по промокоду. Скидка — процент как есть, + * неё — обычная, если она выше цены по промокоду (F10). Скидка — процент как есть, * с дробной частью. */ fun price(product: Product): Price { @@ -62,7 +62,7 @@ internal object StoriesMapping { val promoValue = withPromo?.let { product.priceWithPromocodeDecimal ?: Decimals.parse(it) } val crossed = when { old != null -> old - Decimals.differ(regular, promoValue) -> product.price + Decimals.greater(regular, promoValue) -> product.price else -> null } return Price(PersonalizationStoryPrice.Type.PROMO_CODE, withPromo ?: product.price, crossed, null, promo) @@ -233,10 +233,6 @@ internal object Decimals { fun greater(left: BigDecimal?, right: BigDecimal?): Boolean = left != null && right != null && left > right - /** Оба числа есть и они разные (`1.0` и `1.00` — одно и то же). */ - fun differ(left: BigDecimal?, right: BigDecimal?): Boolean = - left != null && right != null && left.compareTo(right) != 0 - fun parse(text: String?): BigDecimal? { val raw = text?.trim().orEmpty() if (raw.isEmpty()) return null diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt index 9366cdf6..01a6b23f 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -81,7 +81,7 @@ class StoriesMappingTest { } @Test - fun `under a promo code the regular price is crossed out only when it differs from the promo price`() { + fun `under a promo code the regular price is crossed out only when it is above the promo price`() { val same = StoriesMapping.price( product( "price" to 1000, "price_formatted" to "1 000 ₽", @@ -95,7 +95,7 @@ class StoriesMappingTest { "promocode" to "PROMO", "price_with_promocode_formatted" to "1 100 ₽" ) ) - assertEquals("1 000 ₽", higherPromo.oldPrice) + assertNull(higherPromo.oldPrice) } @Test From c468f0d65e40ee20a345fea604207207c9bedea4 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Fri, 2 Oct 2026 10:09:28 +0400 Subject: [PATCH 25/31] fix(ui): stories v2 drop repeated story ids --- .../com/personalization/ui/widgets/StoriesSupport.kt | 9 +++++++-- .../ui/widgets/PersonalizationStoriesTest.kt | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index bdb51aee..d6e425ff 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -344,10 +344,15 @@ internal object StoriesLoader { } } - /** Сторис без слайдов выбрасываются (C16): их нечего показывать. */ + /** + * Сторис без слайдов выбрасываются (C16): их нечего показывать. Повтор id тоже — сервер + * иногда отдаёт одну сторис дважды; остаётся первая, иначе просмотренность склеивается. + */ fun parse(response: JSONObject?): List { val array = response?.optJSONArray("stories") ?: return emptyList() - return List(array.length()) { Story(array.getJSONObject(it)) }.filter { it.slidesCount > 0 } + return List(array.length()) { Story(array.getJSONObject(it)) } + .filter { it.slidesCount > 0 } + .distinctBy { it.id } } /** Код ошибки, которая случилась до сервера или без кода HTTP. */ diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt index 5820272c..bdbf7a12 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationStoriesTest.kt @@ -129,6 +129,13 @@ class PersonalizationStoriesTest { assertEquals(0, ShadowDialog.getShownDialogs().size) } + @Test + fun `a repeated story id is dropped, the first story stays`() { + val stories = StoriesLoader.parse(block(listOf(7, 8, 7))) + + assertEquals(listOf(7, 8), stories.map { it.id }) + } + private fun show(startStoryId: Int? = null, onError: () -> Unit = {}, onClose: () -> Unit = {}) { PersonalizationStories.show( context = activity, From 13839c8887ab67b6078903160fa5c6fa12f2e983 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Tue, 6 Oct 2026 16:42:17 +0400 Subject: [PATCH 26/31] feat(ui): stories v2 plays gif slides with the slide clock A GIF slide lasts the longer of its loop and the admin duration, stops on its frame whenever the slide is paused and starts from the first frame on a restart. Covers, product pictures and video posters show the first frame only. --- .../ui/widgets/PersonalizationStories.kt | 2 +- .../widgets/PersonalizationStoriesViewer.kt | 77 ++++++++++++++-- .../ui/widgets/SearchSupport.kt | 7 +- .../personalization/ui/widgets/StoriesGif.kt | 91 +++++++++++++++++++ .../ui/widgets/StoriesSupport.kt | 7 ++ .../ui/widgets/StoriesViewerState.kt | 6 +- .../ui/widgets/StorySlideView.kt | 74 ++++++++++++++- .../ui/widgets/StoriesGifTest.kt | 56 ++++++++++++ .../ui/widgets/StoriesViewerStateTest.kt | 28 ++++++ .../ui/widgets/StorySlideViewTest.kt | 36 +++++++- 10 files changed, 369 insertions(+), 15 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesGif.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesGifTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt index 9f310d50..0df7dc9a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStories.kt @@ -95,7 +95,7 @@ class PersonalizationStories @JvmOverloads constructor( addView(bar, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) bar.onItemClick = { index, _ -> open(index) } // Загрузчик ставится один раз: каждая установка перерисовывает ленту. - bar.imageLoader = { view, url -> imageLoader?.invoke(view, url) ?: SearchImages.load(view, url) } + bar.imageLoader = { view, url -> imageLoader?.invoke(view, url) ?: SearchImages.load(view, url, firstFrame = true) } bar.showSkeleton() } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt index 10ca7b7a..49e9d057 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationStoriesViewer.kt @@ -3,8 +3,10 @@ package com.personalization.ui.widgets import android.app.Dialog import android.content.Context import android.content.res.Configuration +import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.Drawable import android.media.AudioManager import android.os.Build import android.os.Bundle @@ -23,6 +25,14 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.media3.exoplayer.ExoPlayer import androidx.viewpager2.widget.ViewPager2 +import com.bumptech.glide.Glide +import com.bumptech.glide.load.DataSource +import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.load.resource.gif.GifDrawable +import com.bumptech.glide.request.RequestListener +import com.bumptech.glide.request.target.CustomViewTarget +import com.bumptech.glide.request.target.Target +import com.bumptech.glide.request.transition.Transition import com.personalization.OnClickListener import com.personalization.SDK import com.personalization.stories.models.Story @@ -383,6 +393,7 @@ class PersonalizationStoriesViewer( StoriesViewerState.Move.Restart -> { val view = currentSlideView() if (view != null && view === playerSlide) player?.seekTo(0) + view?.restartAnimation() view?.setProgress(0f) } StoriesViewerState.Move.CloseSheet -> currentSlideView()?.closeSheet() @@ -399,6 +410,7 @@ class PersonalizationStoriesViewer( if (!created || dismissed) return if (state.isRunning) frameClock.start() else frameClock.stop() player?.playWhenReady = playerSlide != null && state.playerShouldPlay + currentSlideView()?.setAnimationRunning(state.isRunning) pager.isUserInputEnabled = !state.sheetOpen currentSlideView()?.setProgress(state.progress) updateAudioFocus() @@ -427,6 +439,14 @@ class PersonalizationStoriesViewer( override fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) = this@PersonalizationStoriesViewer.loadImage(view, url, onReady, onFailed) + override fun loadSlideImage( + view: ImageView, + url: String, + onAnimation: (Long?, GifDrawable) -> Unit, + onReady: () -> Unit, + onFailed: () -> Unit + ) = this@PersonalizationStoriesViewer.loadSlideImage(view, url, onAnimation, onReady, onFailed) + override fun onTap(x: Float, width: Int, rtl: Boolean) = apply(state.tap(StoriesViewerState.zone(x, width, rtl))) override fun onHold(hold: Boolean) { @@ -511,6 +531,7 @@ class PersonalizationStoriesViewer( runCatching { sdk?.storiesManager?.trackStory(event, blockCode, story.id, slide.id) } } + /** Картинка компонента: у GIF только первый кадр (G6). */ private fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) { val loader = imageLoader if (loader != null) { @@ -518,12 +539,12 @@ class PersonalizationStoriesViewer( loader(view, url) return } - com.bumptech.glide.Glide.with(view).load(url) - .listener(object : com.bumptech.glide.request.RequestListener { + Glide.with(view).asBitmap().load(url) + .listener(object : RequestListener { override fun onLoadFailed( - e: com.bumptech.glide.load.engine.GlideException?, + e: GlideException?, model: Any?, - target: com.bumptech.glide.request.target.Target, + target: Target, isFirstResource: Boolean ): Boolean { onFailed?.invoke() @@ -531,10 +552,10 @@ class PersonalizationStoriesViewer( } override fun onResourceReady( - resource: android.graphics.drawable.Drawable, + resource: Bitmap, model: Any, - target: com.bumptech.glide.request.target.Target?, - dataSource: com.bumptech.glide.load.DataSource, + target: Target?, + dataSource: DataSource, isFirstResource: Boolean ): Boolean { onReady?.invoke() @@ -544,6 +565,43 @@ class PersonalizationStoriesViewer( .into(view) } + /** + * Фон слайда: GIF здесь играет (G1). Своя цель вместо обычной: Glide сам запускает GIF + * при показе и на `onStart` хоста, а он должен идти только вместе с часами слайда (G5). + * Проход и сам GIF отдаются до того, как картинка встанет во вьюху: по ней слайд готов. + */ + private fun loadSlideImage( + view: ImageView, + url: String, + onAnimation: (Long?, GifDrawable) -> Unit, + onReady: () -> Unit, + onFailed: () -> Unit + ) { + val loader = imageLoader + if (loader != null) { + // GIF загрузчика хоста SDK не трогает и не меряет (G8). + loader(view, url) + return + } + Glide.with(view).load(url).into(object : CustomViewTarget(view) { + override fun onResourceReady(resource: Drawable, transition: Transition?) { + if (resource is GifDrawable) { + resource.setLoopCount(GifDrawable.LOOP_FOREVER) + onAnimation(StoriesGif.loopMs(resource.buffer), resource) + } + this.view.setImageDrawable(resource) + onReady() + } + + override fun onLoadFailed(errorDrawable: Drawable?) = onFailed() + + override fun onResourceCleared(placeholder: Drawable?) { + (this.view.drawable as? GifDrawable)?.stop() + this.view.setImageDrawable(placeholder) + } + }) + } + // --- Медиа ----------------------------------------------------------------------------- /** @@ -581,7 +639,7 @@ class PersonalizationStoriesViewer( view.mediaReadyOnce = true cancelMediaTimers() view.showRetry(false) - state.mediaReady(videoDurationMs) + state.mediaReady(videoDurationMs, view.animationLoopMs) sync() } @@ -618,10 +676,11 @@ class PersonalizationStoriesViewer( videoRetryTimer.cancel() } - /** Уход со слайда: таймеры и повторы отменяются, плеер отдан. */ + /** Уход со слайда: таймеры и повторы отменяются, плеер отдан, GIF стоит. */ private fun stopMedia() { cancelMediaTimers() detachPlayer() + currentSlideView()?.stopAnimation() } @androidx.annotation.OptIn(markerClass = [androidx.media3.common.util.UnstableApi::class]) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/SearchSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/SearchSupport.kt index f68c9a28..95e3b19a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/SearchSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/SearchSupport.kt @@ -86,7 +86,8 @@ internal fun storageKey(sdk: SDK, requestedShopId: String?): String = * После layout размер известен, и Glide стартует сразу. */ internal object SearchImages { - fun load(imageView: ImageView, url: String?) { + /** [firstFrame] — у GIF только первый кадр: так рисуются обложки сторис (G6). */ + fun load(imageView: ImageView, url: String?, firstFrame: Boolean = false) { imageView.tag = url if (url.isNullOrEmpty()) { Glide.with(imageView).clear(imageView) @@ -95,7 +96,9 @@ internal object SearchImages { } imageView.doOnLayout { view -> // Пока ждали layout, view могла уйти под другой товар. - if (view.tag == url) Glide.with(view).load(url).into(view as ImageView) + if (view.tag != url) return@doOnLayout + val request = Glide.with(view) + if (firstFrame) request.asBitmap().load(url).into(view as ImageView) else request.load(url).into(view as ImageView) } } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesGif.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesGif.kt new file mode 100644 index 00000000..8a66fc0b --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesGif.kt @@ -0,0 +1,91 @@ +package com.personalization.ui.widgets + +import java.nio.ByteBuffer +import java.nio.ByteOrder + +/** + * Длина одного прохода GIF по его байтам (G2): сумма задержек кадров, задержка короче 20 мс + * (и нулевая) считается за 100 мс — как в браузерах. GIF узнаём по подписи, не по адресу (G1). + */ +internal object StoriesGif { + + private const val MIN_DELAY_MS = 20L + private const val FALLBACK_DELAY_MS = 100L + + /** Байты начинаются с подписи GIF87a или GIF89a. */ + fun isGif(bytes: ByteBuffer): Boolean { + val data = bytes.duplicate() + data.position(0) + if (data.remaining() < 6) return false + val head = ByteArray(6).also { data.get(it) } + val signature = String(head, Charsets.US_ASCII) + return signature == "GIF87a" || signature == "GIF89a" + } + + /** Задержки кадров, мс, уже с поправкой на короткие; `null` — не GIF или файл битый. */ + fun frameDelaysMs(bytes: ByteBuffer): List? { + if (!isGif(bytes)) return null + val data = bytes.duplicate().order(ByteOrder.LITTLE_ENDIAN) + data.position(6) + return runCatching { readFrames(data) }.getOrNull()?.takeIf { it.isNotEmpty() } + } + + /** Длина одного прохода, мс; `null` — не GIF или файл битый. */ + fun loopMs(bytes: ByteBuffer): Long? = frameDelaysMs(bytes)?.sum() + + private fun readFrames(data: ByteBuffer): List { + data.short // ширина + data.short // высота + val packed = data.get().toInt() and 0xFF + data.get() // фон + data.get() // пропорции пикселя + if (packed and 0x80 != 0) skip(data, 3 * (1 shl ((packed and 0x07) + 1))) + + val delays = ArrayList() + var pendingDelayCs = 0 + while (data.hasRemaining()) { + when (data.get().toInt() and 0xFF) { + 0x21 -> { + val label = data.get().toInt() and 0xFF + if (label == 0xF9) { + val size = data.get().toInt() and 0xFF + val start = data.position() + data.get() // флаги + pendingDelayCs = data.short.toInt() and 0xFFFF + data.position(start + size) + } + skipSubBlocks(data) + } + 0x2C -> { + skip(data, 8) // положение и размер кадра + val flags = data.get().toInt() and 0xFF + if (flags and 0x80 != 0) skip(data, 3 * (1 shl ((flags and 0x07) + 1))) + data.get() // минимальный размер кода LZW + skipSubBlocks(data) + delays += delayMs(pendingDelayCs) + pendingDelayCs = 0 + } + 0x3B -> return delays + else -> return delays + } + } + return delays + } + + private fun delayMs(centiseconds: Int): Long { + val ms = centiseconds * 10L + return if (ms < MIN_DELAY_MS) FALLBACK_DELAY_MS else ms + } + + private fun skip(data: ByteBuffer, count: Int) { + data.position(data.position() + count) + } + + private fun skipSubBlocks(data: ByteBuffer) { + while (true) { + val size = data.get().toInt() and 0xFF + if (size == 0) return + skip(data, size) + } + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index d6e425ff..d56911a1 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -173,6 +173,13 @@ internal object StoriesMapping { fun isVideo(slide: Slide): Boolean = slide.type == "video" && slide.background.isNotEmpty() + /** + * Длина слайда с GIF (G2): большее из времени админки и одного прохода GIF. Проход + * неизвестен (загрузчик хоста, файл не разобрали) — время админки. + */ + fun animatedDurationMs(serverMs: Long, loopMs: Long?): Long = + if (loopMs == null || loopMs <= 0) serverMs else maxOf(serverMs, loopMs) + /** Скрим сверху и снизу есть у каждого слайда; 50% — только у голого медиа (C3). */ fun scrimAlpha(slide: Slide): Int { val bare = isMedia(slide) && product(slide) == null && textBlocks(slide).isEmpty() diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt index d52e4184..0c526e85 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesViewerState.kt @@ -272,11 +272,15 @@ internal class StoriesViewerState( /** * Медиа готово (C5): картинка декодирована, видео играет. [videoDurationMs] — длина * ролика, если известна: слайд идёт по ней, а не по времени из админки (C4). + * [animationLoopMs] — проход GIF: слайд идёт по большему из него и админки (G2). */ - fun mediaReady(videoDurationMs: Long? = null) { + fun mediaReady(videoDurationMs: Long? = null, animationLoopMs: Long? = null) { if (videoDurationMs != null && videoDurationMs > 0) { clock = Clock.PLAYER durationMs = videoDurationMs + } else if (animationLoopMs != null) { + val serverMs = slide?.durationMs ?: StoriesMapping.DEFAULT_DURATION_MS + durationMs = StoriesMapping.animatedDurationMs(serverMs, animationLoopMs) } setPaused(Pause.ERROR, false) setPaused(Pause.LOADING, false) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt index c60c37de..d1ab3dd0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt @@ -16,6 +16,7 @@ import androidx.core.graphics.Insets import androidx.media3.common.util.UnstableApi import androidx.media3.ui.AspectRatioFrameLayout import androidx.media3.ui.PlayerView +import com.bumptech.glide.load.resource.gif.GifDrawable import com.personalization.Product import com.personalization.R import com.personalization.stories.models.Slide @@ -32,7 +33,21 @@ internal interface StorySlideHost { val muted: Boolean val sheetOpen: Boolean val insets: Insets + /** Картинка компонента — товар, постер видео: GIF стоит на первом кадре (G6). */ fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)? = null, onFailed: (() -> Unit)? = null) + + /** + * Фон слайда — GIF здесь играет (G1). [onAnimation] зовётся до того, как картинка встанет + * во вьюху, и только для GIF, загруженного SDK: с проходом, мс, и самим GIF (G2, G5). + */ + fun loadSlideImage( + view: ImageView, + url: String, + onAnimation: (loopMs: Long?, gif: GifDrawable) -> Unit, + onReady: () -> Unit, + onFailed: () -> Unit + ) + fun onTap(x: Float, width: Int, rtl: Boolean) fun onHold(hold: Boolean) fun onOutsideSheetTap() @@ -84,6 +99,16 @@ internal class StorySlideView( /** Картинка слайда загрузилась или нет. */ var onImageState: (() -> Unit)? = null + /** Проход GIF фона, мс; `null` — не GIF, проход не разобран или GIF грузил хост (G2, G8). */ + var animationLoopMs: Long? = null + private set + + /** GIF фона, которым управляет SDK: идёт вместе с часами слайда (G5). */ + private var animation: GifDrawable? = null + + /** Следующий запуск GIF — с первого кадра: слайд начался или начат заново (G5). */ + private var animationFromStart = true + private val poster = StoryImageView(context) private val column = LinearLayout(context) private val retry = PersonalizationButton(context) @@ -138,13 +163,60 @@ internal class StorySlideView( fun loadImage() { val url = if (isVideo) slide.preview else slide.background imageState = ImageState.LOADING + animation?.stop() + animation = null + animationLoopMs = null if (url.isEmpty()) { setImageState(if (isVideo) ImageState.READY else ImageState.FAILED) return } poster.visibility = View.VISIBLE poster.onDrawable = { setImageState(ImageState.READY) } - host.loadImage(poster, url, { setImageState(ImageState.READY) }, { setImageState(ImageState.FAILED) }) + if (isVideo) { + host.loadImage(poster, url, { setImageState(ImageState.READY) }, { setImageState(ImageState.FAILED) }) + return + } + host.loadSlideImage( + poster, + url, + onAnimation = { loopMs, gif -> + animationLoopMs = loopMs + animation = gif + animationFromStart = true + }, + onReady = { setImageState(ImageState.READY) }, + onFailed = { setImageState(ImageState.FAILED) } + ) + } + + /** + * GIF фона идёт, только пока идут часы слайда (G5): пауза оставляет текущий кадр, + * продолжение — с него же, новый или начатый заново слайд — с первого кадра. + */ + fun setAnimationRunning(running: Boolean) { + val gif = animation ?: return + if (!running) { + if (gif.isRunning) gif.stop() + return + } + if (animationFromStart) { + animationFromStart = false + if (gif.isRunning) gif.stop() + gif.startFromFirstFrame() + } else if (!gif.isRunning) { + gif.start() + } + } + + /** Слайд начат заново (B3): GIF пойдёт с первого кадра, без новой загрузки (F3). */ + fun restartAnimation() { + animationFromStart = true + } + + /** Слайд ушёл с экрана — GIF стоит. */ + fun stopAnimation() { + animation?.stop() + animationFromStart = true } private fun setImageState(state: ImageState) { diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesGifTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesGifTest.kt new file mode 100644 index 00000000..e2af7d0f --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesGifTest.kt @@ -0,0 +1,56 @@ +package com.personalization.ui.widgets + +import java.nio.ByteBuffer +import java.util.Base64 +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +/** GIF loop length (rules G1, G2) on the fixture shared by all four SDKs. */ +class StoriesGifTest { + + /** 2x2, 3 frames, delays 10 cs / 0 cs / 50 cs, loops forever. */ + private val fixture = Base64.getDecoder().decode( + "R0lGODlhAgACAIEAAP8AAAD/AAAA/////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQACgAAACwAAAAAAgACAAACAoRRACH5BAAAAAAALAAA" + + "AAACAAIAAAICjFMAIfkEADIAAAAsAAAAAAIAAgAAAgKUVQA7" + ) + + @Test + fun `a gif is recognised by its signature`() { + assertTrue(StoriesGif.isGif(ByteBuffer.wrap(fixture))) + assertTrue(StoriesGif.isGif(ByteBuffer.wrap("GIF87a....".toByteArray()))) + val png = byteArrayOf(0x89.toByte(), 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A) + assertFalse(StoriesGif.isGif(ByteBuffer.wrap(png))) + assertFalse(StoriesGif.isGif(ByteBuffer.wrap(ByteArray(3)))) + } + + @Test + fun `frame delays below 20 ms count as 100 ms`() { + assertEquals(listOf(100L, 100L, 500L), StoriesGif.frameDelaysMs(ByteBuffer.wrap(fixture))) + assertEquals(700L, StoriesGif.loopMs(ByteBuffer.wrap(fixture))) + } + + @Test + fun `the buffer position does not matter and is left alone`() { + val buffer = ByteBuffer.wrap(fixture) + buffer.position(20) + assertEquals(700L, StoriesGif.loopMs(buffer)) + assertEquals(20, buffer.position()) + } + + @Test + fun `not a gif or a broken gif has no loop`() { + assertNull(StoriesGif.loopMs(ByteBuffer.wrap("not a gif".toByteArray()))) + assertNull(StoriesGif.loopMs(ByteBuffer.wrap(fixture.copyOf(30)))) + } + + @Test + fun `the slide length is the longer of the loop and the admin duration`() { + assertEquals(8000L, StoriesMapping.animatedDurationMs(5000, 8000)) + assertEquals(5000L, StoriesMapping.animatedDurationMs(5000, 700)) + assertEquals(5000L, StoriesMapping.animatedDurationMs(5000, null)) + assertEquals(5000L, StoriesMapping.animatedDurationMs(5000, 0)) + } +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt index 621c0852..bbe7c521 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesViewerStateTest.kt @@ -164,6 +164,34 @@ class StoriesViewerStateTest { assertEquals(Move.Slide, state.tick(4000)) } + @Test + fun `a gif slide lasts the longer of its loop and the admin duration`() { + val longer = entered(story(1, slides = 2, durationMs = 5000)) + longer.mediaReady(animationLoopMs = 8000) + assertEquals(StoriesViewerState.Clock.TIMER, longer.clock) + assertEquals(Move.None, longer.tick(5000)) + assertEquals(Move.Slide, longer.tick(3000)) + + val shorter = entered(story(2, slides = 2, durationMs = 5000)) + shorter.mediaReady(animationLoopMs = 700) + assertEquals(Move.Slide, shorter.tick(5000)) + } + + @Test + fun `a gif slide keeps its length on restart and measures it again after a retry`() { + val state = entered(story(1, slides = 2, durationMs = 5000)) + state.mediaReady(animationLoopMs = 8000) + state.tick(6000) + assertEquals(Move.Restart, state.previous()) + assertEquals(8000L, state.durationMs) + + state.mediaFailed() + state.retry() + assertEquals(5000L, state.durationMs) + state.mediaReady(animationLoopMs = 8000) + assertEquals(8000L, state.durationMs) + } + @Test fun `a failed media pauses the slide until retried`() { val state = entered(story(1, slides = 2)) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt index 8f9a3ec0..e1dbc6f5 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt @@ -8,6 +8,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.core.graphics.Insets +import com.bumptech.glide.load.resource.gif.GifDrawable import com.personalization.Product import com.personalization.stories.models.Slide import com.personalization.stories.models.elements.ButtonElement @@ -62,6 +63,24 @@ class StorySlideViewTest { assertEquals(listOf("p1"), host.products.map { it.id }) } + @Test + fun `only the slide background may play a gif, the video poster stays on the first frame`() { + StorySlideView(activity, 0, 0, mediaSlide("image", "https://example.com/a.gif"), 1, host) + StorySlideView(activity, 0, 0, mediaSlide("video", "https://example.com/v.mp4", "https://example.com/p.gif"), 1, host) + + assertEquals(listOf("https://example.com/a.gif"), host.slideImages) + assertEquals(listOf("https://example.com/p.gif"), host.images) + } + + private fun mediaSlide(type: String, background: String, preview: String = ""): Slide = Slide( + JSONObject() + .put("id", "3") + .put("type", type) + .put("background", background) + .put("preview", preview) + .put("elements", JSONArray()) + ) + /** On screen: an unattached view has no location, and the slide hit-tests by location. */ private fun laidOut(slide: Slide): StorySlideView = StorySlideView(activity, 0, 0, slide, 1, host).also { view -> @@ -122,7 +141,22 @@ class StorySlideViewTest { override val insets: Insets = Insets.NONE val products = mutableListOf() - override fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) = Unit + val images = mutableListOf() + val slideImages = mutableListOf() + + override fun loadImage(view: ImageView, url: String, onReady: (() -> Unit)?, onFailed: (() -> Unit)?) { + images += url + } + + override fun loadSlideImage( + view: ImageView, + url: String, + onAnimation: (Long?, GifDrawable) -> Unit, + onReady: () -> Unit, + onFailed: () -> Unit + ) { + slideImages += url + } override fun onTap(x: Float, width: Int, rtl: Boolean) = Unit override fun onHold(hold: Boolean) = Unit override fun onOutsideSheetTap() = Unit From 1da639a902ee514b6585fb042d0805b097cc2178 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Tue, 6 Oct 2026 16:42:18 +0400 Subject: [PATCH 27/31] feat(demo): stories v2 sample gets a gif story --- .../src/main/assets/uikit/stories_sample.json | 18 ++++++++++++++++++ .../src/main/assets/uikit/story_clock.gif | Bin 0 -> 89726 bytes .../personalization/demo/StoriesV2Showcase.kt | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 demo-app/src/main/assets/uikit/story_clock.gif diff --git a/demo-app/src/main/assets/uikit/stories_sample.json b/demo-app/src/main/assets/uikit/stories_sample.json index bbbd6413..c3ae265d 100644 --- a/demo-app/src/main/assets/uikit/stories_sample.json +++ b/demo-app/src/main/assets/uikit/stories_sample.json @@ -108,6 +108,24 @@ } ] }, + { + "id": 907, + "name": "GIF", + "avatar": "file:///android_asset/uikit/story_clock.gif", + "pinned": false, + "viewed": false, + "start_position": 0, + "slides": [ + { + "id": "907_0", + "type": "image", + "duration": 5, + "background": "file:///android_asset/uikit/story_clock.gif", + "background_color": "#1B2A41", + "elements": [] + } + ] + }, { "id": 905, "name": "Видео и товары", diff --git a/demo-app/src/main/assets/uikit/story_clock.gif b/demo-app/src/main/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/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt index dfd6aad4..5f7e2853 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -47,8 +47,9 @@ internal fun StoriesV2Showcase(storiesCode: String, shopId: String) { } StoriesV2ComposeExhibit(storiesCode = storiesCode, shopId = shopId) Exhibit( - "Stories V2 — sample block: fitted photo with letterbox, Retry, product video slide with " + - "buttons + carousel + sound, text-block promo code, two-line labels" + "Stories V2 — sample block: GIF slide (8 s dial over a 5 s duration), fitted photo with " + + "letterbox, Retry, product video slide with buttons + carousel + sound, text-block promo " + + "code, two-line labels" ) { ctx -> ctx.sampleStories() } Exhibit("Story Preview — pinned, default, viewed, two-line label, skeleton") { ctx -> ctx.previews() } Exhibit("Story Cover — ring split by slides, slides 2 and 4 seen; pinned with slide 1 seen") { ctx -> @@ -125,7 +126,8 @@ private fun Context.sampleStories(): View { ) } } - bar.imageLoader = { view, url -> Glide.with(view).load(url).into(view) } + // Like the SDK default: a GIF cover stays on its first frame, only the slide plays it. + bar.imageLoader = { view, url -> Glide.with(view).asBitmap().load(url).into(view) } bar.onItemClick = { index, _ -> PersonalizationStoriesViewer(this, stories, index).apply { onClickListener = DemoStoriesClicks(this@sampleStories) From 0ad33ebd6713c315e6196ee5f0b116b61f420676 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 7 Oct 2026 14:09:37 +0400 Subject: [PATCH 28/31] fix(ui): stories v2 product card shows the promo code of the slide's text block Text blocks stay off product slides, as in the mockup, but a promo code the admin put into one of them now shows in the card's promo block when the product has no code of its own. --- .../ui/widgets/StoriesSupport.kt | 13 ++++- .../ui/widgets/StorySlideContent.kt | 5 +- .../ui/widgets/StorySlideView.kt | 2 +- .../ui/widgets/StoriesMappingTest.kt | 50 +++++++++++++++++++ .../ui/widgets/StorySlideViewTest.kt | 23 +++++++++ 5 files changed, 89 insertions(+), 4 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt index d56911a1..44165b16 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesSupport.kt @@ -50,8 +50,12 @@ internal object StoriesMapping { * больше обычной. С промокодом крупно — цена по промокоду, зачёркнута старая цена, а без * неё — обычная, если она выше цены по промокоду (F10). Скидка — процент как есть, * с дробной частью. + * + * [slidePromo] — промокод текстового блока того же слайда (H2): сами блоки на товарном + * слайде не рисуются, а код идёт в блок цены, как в макете, если у товара своего нет. + * Цена тогда обычная, зачёркнута только старая (H3). */ - fun price(product: Product): Price { + fun price(product: Product, slidePromo: String? = null): Price { val regular = product.priceDecimal ?: Decimals.parse(product.price) val old = product.oldPrice.takeIf { it.isNotEmpty() && Decimals.greater(product.oldPriceDecimal ?: Decimals.parse(it), regular) @@ -67,6 +71,9 @@ internal object StoriesMapping { } return Price(PersonalizationStoryPrice.Type.PROMO_CODE, withPromo ?: product.price, crossed, null, promo) } + if (slidePromo != null) { + return Price(PersonalizationStoryPrice.Type.PROMO_CODE, product.price, old, null, slidePromo) + } val percent = Decimals.parse(product.discountPercent)?.takeIf { it.signum() > 0 } if (percent != null) { val text = percent.stripTrailingZeros().toPlainString() + "%" @@ -207,6 +214,10 @@ internal object StoriesMapping { fun textPromocode(element: TextBlockElement): String? = element.promocode?.trim()?.takeIf { it.isNotEmpty() && it != "null" } + /** Промокод слайда для блока цены товара (H2): первый текстовый блок с непустым кодом. */ + fun slidePromocode(slide: Slide): String? = + slide.getElements().filterIsInstance().firstNotNullOfOrNull(::textPromocode) + /** Интерлиньяж из админки; без него — `null`, и блок берёт высоту строки пресета. */ fun lineHeightSp(element: TextBlockElement): Float? = if (element.textLineSpacing > 0) (element.fontSize * element.textLineSpacing).toFloat() else null diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt index d840da9f..c6f3101f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt @@ -18,8 +18,9 @@ import com.personalization.ui.components.PersonalizationToast */ internal object StoryProductCard { - fun build(context: Context, element: ProductElement, product: Product, host: StorySlideHost): View { - val price = StoriesMapping.price(product) + /** [slidePromo] — промокод текстового блока слайда, если у товара своего нет (H2). */ + fun build(context: Context, element: ProductElement, product: Product, host: StorySlideHost, slidePromo: String? = null): View { + val price = StoriesMapping.price(product, slidePromo) return PersonalizationStoryCard(context).apply { title = product.brand.takeIf { it.isNotEmpty() } subtitle = product.name diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt index d1ab3dd0..609b970c 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideView.kt @@ -234,7 +234,7 @@ internal class StorySlideView( val productElement = StoriesMapping.product(slide) val product = productElement?.item val middle: View = if (productElement != null && product != null) { - StoryProductCard.build(context, productElement, product, host) + StoryProductCard.build(context, productElement, product, host, StoriesMapping.slidePromocode(slide)) } else { StoryTextBlocks.build(context, slide, host) } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt index 01a6b23f..a0282932 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StoriesMappingTest.kt @@ -316,6 +316,56 @@ class StoriesMappingTest { assertNull(StoriesMapping.textPromocode(TextBlockElement(JSONObject().put("promocode", JSONObject.NULL)))) } + // --- Text block promo on a product slide (H) ----------------------------------------------- + + @Test + fun `a product without a promo shows the text block promo at the regular price`() { + val price = StoriesMapping.price( + product("price" to 1000, "price_formatted" to "1 000 ₽", "discount_percent" to 10), + slidePromo = "SLIDE" + ) + assertEquals(PersonalizationStoryPrice.Type.PROMO_CODE, price.type) + assertEquals("1 000 ₽", price.price) + assertNull(price.oldPrice) + assertEquals("SLIDE", price.promoCode) + } + + @Test + fun `the product promo wins over the text block promo`() { + val price = StoriesMapping.price( + product("price" to 1000, "price_formatted" to "1 000 ₽", "promocode" to "OWN", "price_with_promocode_formatted" to "900 ₽"), + slidePromo = "SLIDE" + ) + assertEquals("OWN", price.promoCode) + assertEquals("900 ₽", price.price) + } + + @Test + fun `a text block promo crosses out only an old price above the regular price`() { + val higher = StoriesMapping.price( + product("price" to 1000, "price_formatted" to "1 000 ₽", "oldprice" to 1500, "oldprice_formatted" to "1 500 ₽"), + slidePromo = "SLIDE" + ) + assertEquals("1 500 ₽", higher.oldPrice) + val lower = StoriesMapping.price( + product("price" to 1000, "price_formatted" to "1 000 ₽", "oldprice" to 900, "oldprice_formatted" to "900 ₽"), + slidePromo = "SLIDE" + ) + assertNull(lower.oldPrice) + } + + @Test + fun `the slide promo is the first text block with a code, blank and null ones are skipped`() { + val blocks = JSONArray() + .put(JSONObject().put("type", "text_block").put("text_input", "Hello")) + .put(JSONObject().put("type", "text_block").put("text_input", "x").put("promocode", JSONObject.NULL)) + .put(JSONObject().put("type", "text_block").put("text_input", "y").put("promocode", " ")) + .put(JSONObject().put("type", "text_block").put("text_input", "Code A1").put("promocode", "A1")) + .put(JSONObject().put("type", "text_block").put("text_input", "Code B2").put("promocode", "B2")) + assertEquals("A1", StoriesMapping.slidePromocode(slide("elements" to blocks))) + assertNull(StoriesMapping.slidePromocode(slide("elements" to JSONArray()))) + } + // --- Text blocks (C15) ---------------------------------------------------------------------- @Test diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt index e1dbc6f5..82a71aae 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt @@ -13,10 +13,13 @@ import com.personalization.Product import com.personalization.stories.models.Slide import com.personalization.stories.models.elements.ButtonElement import com.personalization.ui.components.PersonalizationStoryCard +import com.personalization.ui.components.PersonalizationStoryPrice +import com.personalization.ui.components.PersonalizationStoryTextBlock import org.json.JSONArray import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith @@ -63,6 +66,26 @@ class StorySlideViewTest { assertEquals(listOf("p1"), host.products.map { it.id }) } + @Test + fun `a product slide shows its text block promo in the card and draws no text block`() { + val slide = Slide( + JSONObject() + .put("id", "4") + .put( + "elements", + JSONArray() + .put(JSONObject().put("type", "product").put("item", JSONObject().put("id", "p1").put("name", "Sneakers").put("price_formatted", "100 ₽"))) + .put(JSONObject().put("type", "text_block").put("text_input", "Your code SALE10").put("promocode", "SALE10")) + ) + ) + val view = laidOut(slide) + + val card = view.first(PersonalizationStoryCard::class.java)!! + assertEquals("SALE10", card.price.promoCode) + assertEquals(PersonalizationStoryPrice.Type.PROMO_CODE, card.price.type) + assertNull(view.first(PersonalizationStoryTextBlock::class.java)) + } + @Test fun `only the slide background may play a gif, the video poster stays on the first frame`() { StorySlideView(activity, 0, 0, mediaSlide("image", "https://example.com/a.gif"), 1, host) From ef60e67c4935bf11453a2e0c8cf08ed269f0f0e9 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 7 Oct 2026 14:09:37 +0400 Subject: [PATCH 29/31] feat(demo): stories v2 sample product slide carries a text block promo --- demo-app/src/main/assets/uikit/stories_sample.json | 7 +++++++ .../java/com/personalization/demo/StoriesV2Showcase.kt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/demo-app/src/main/assets/uikit/stories_sample.json b/demo-app/src/main/assets/uikit/stories_sample.json index c3ae265d..6d9eec01 100644 --- a/demo-app/src/main/assets/uikit/stories_sample.json +++ b/demo-app/src/main/assets/uikit/stories_sample.json @@ -82,6 +82,13 @@ "duration": 6, "background": "", "elements": [ + { + "type": "text_block", + "text_input": "Ваш промокод SOUND10", + "promocode": "SOUND10", + "font_size": 20, + "y_offset": 10 + }, { "type": "product", "title": " ", diff --git a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt index 5f7e2853..572ed4e7 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Showcase.kt @@ -47,7 +47,8 @@ internal fun StoriesV2Showcase(storiesCode: String, shopId: String) { } StoriesV2ComposeExhibit(storiesCode = storiesCode, shopId = shopId) Exhibit( - "Stories V2 — sample block: GIF slide (8 s dial over a 5 s duration), fitted photo with " + + "Stories V2 — sample block: GIF slide (8 s dial over a 5 s duration), product with the promo " + + "code of its text block (SOUND10), fitted photo with " + "letterbox, Retry, product video slide with buttons + carousel + sound, text-block promo " + "code, two-line labels" ) { ctx -> ctx.sampleStories() } From 52d9dd5be8bbb67d3d7b01b0863fec0da501df9f Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 7 Oct 2026 14:17:14 +0400 Subject: [PATCH 30/31] fix(ui): story price keeps the promo caption and code whole without an old price The row took its height from the price column alone, so with a single price line the promo block cut its caption and code. --- .../components/PersonalizationStoryPrice.kt | 17 +++++++++++- .../PersonalizationStoryComponentsTest.kt | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt index 85b76124..80517394 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryPrice.kt @@ -98,6 +98,7 @@ class PersonalizationStoryPrice @JvmOverloads constructor( private val priceView = AppCompatTextView(context) private val discountView = AppCompatTextView(context) private val promoBox = FrameLayout(context) + private val promoColumn = LinearLayout(context) private val promoCaptionView = AppCompatTextView(context) private val promoCodeView = AppCompatTextView(context) private val copyIcon = AppCompatImageView(context) @@ -126,7 +127,7 @@ class PersonalizationStoryPrice @JvmOverloads constructor( discountView.setPadding(dp(16), 0, dp(16), 0) discountView.background = endRounded(PersonalizationTheme.color(context, R.color.personalization_brand_primary)) - val promoColumn = LinearLayout(context).apply { + promoColumn.apply { orientation = VERTICAL gravity = Gravity.CENTER setPadding(dp(16), dp(12), dp(16), dp(12)) @@ -181,9 +182,23 @@ class PersonalizationStoryPrice @JvmOverloads constructor( val params = promoBox.layoutParams as LayoutParams if (params.width != width) params.width = width } + // Чёрный блок тянется по высоте ряда, а ряд меряется по колонке цены: без старой цены + // она ниже подписи с кодом, и те обрезались. Колонка цены не ниже промокода. + priceColumn.minimumHeight = if (promoBox.visibility == View.VISIBLE) promoHeight() else 0 super.onMeasure(widthMeasureSpec, heightMeasureSpec) } + private fun promoHeight(): Int { + val width = (promoBox.layoutParams as LayoutParams).width + val widthSpec = if (width > 0) { + MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY) + } else { + MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED) + } + promoColumn.measure(widthSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)) + return promoColumn.measuredHeight + } + private fun render() { val currencyPx = spPx(14f) val old = oldPrice?.takeIf { it.isNotEmpty() } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt index acca84e6..049042db 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationStoryComponentsTest.kt @@ -105,6 +105,32 @@ class PersonalizationStoryComponentsTest { assertEquals(View.VISIBLE, promo.visibility) } + @Test + fun `without an old price the row is tall enough for the promo caption and code`() { + val price = PersonalizationStoryPrice(activity).apply { + type = PersonalizationStoryPrice.Type.PROMO_CODE + this.price = "7 490 ₽" + promoCode = "SOUND10" + } + price.measure( + View.MeasureSpec.makeMeasureSpec(dp(370), View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + ) + price.layout(0, 0, price.measuredWidth, price.measuredHeight) + + val promo = rightBlocks(price).second as ViewGroup + val column = promo.getChildAt(0) + // Measured inside the box the column is clamped to it; ask what it needs unclamped. + column.measure( + View.MeasureSpec.makeMeasureSpec(column.width, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + ) + assertTrue( + "promo column ${column.measuredHeight} must fit the box ${promo.height}", + column.measuredHeight <= promo.height + ) + } + @Test fun `tapping the promo code copies it and reports`() { val content: ViewGroup = activity.findViewById(android.R.id.content) From 2b93cc66d9c16083cf7445c8c8109c1a757e2133 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 7 Oct 2026 15:29:59 +0400 Subject: [PATCH 31/31] fix(ui): stories v2 product picture no longer opens the product The picture took most of the tap zones, so a tap meant to page the story opened the shop instead. A tap on it now pages like anywhere on the slide; the buttons open the product. --- .../ui/widgets/StorySlideContent.kt | 5 ++-- .../ui/widgets/StorySlideViewTest.kt | 25 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt index c6f3101f..21093b7b 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StorySlideContent.kt @@ -14,7 +14,8 @@ import com.personalization.ui.components.PersonalizationToast /** * Карточка товарного слайда (C8): бренд, название, фото, цена. Кнопки рисует слайд — - * все кнопки админки, а не одну кнопку карточки. Фото нажимается, как кнопка товара (F8). + * все кнопки админки, а не одну кнопку карточки. Фото не нажимается (I1): тап по нему — + * тап по слайду, листание по зонам; товар открывают только кнопки (I2). */ internal object StoryProductCard { @@ -26,8 +27,6 @@ internal object StoryProductCard { subtitle = product.name if (product.image.isNotEmpty()) host.loadImage(imageView, product.image) imageView.contentDescription = product.name - // Тап по фото — как кнопка товара: клик, просмотр закрывается, товар открывается (F8). - onImageClick = { host.onProduct(product) } this.price.type = price.type this.price.price = price.price this.price.oldPrice = price.oldPrice diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt index 82a71aae..75308f92 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/StorySlideViewTest.kt @@ -56,14 +56,25 @@ class StorySlideViewTest { } @Test - fun `the product picture opens the product like the product button`() { + fun `a tap on the product picture pages the story and does not open the product`() { val view = laidOut(productSlide()) val card = view.first(PersonalizationStoryCard::class.java)!! val picture = card.imageView.parent as View + assertFalse(picture.isClickable) + + // The right edge of the picture lies in the right third of the slide: a tap there pages forward. + val slideAt = IntArray(2).also(view::getLocationOnScreen) + val pictureAt = IntArray(2).also(picture::getLocationOnScreen) + val x = (pictureAt[0] - slideAt[0] + picture.width - 2).toFloat() + val y = (pictureAt[1] - slideAt[1] + picture.height / 2).toFloat() + assertTrue("the picture must reach the right third", x > view.width * 2 / 3f) + val now = SystemClock.uptimeMillis() + view.dispatchTouchEvent(MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, x, y, 0)) + view.dispatchTouchEvent(MotionEvent.obtain(now, now + 50, MotionEvent.ACTION_UP, x, y, 0)) - assertTrue(picture.isClickable) - picture.performClick() - assertEquals(listOf("p1"), host.products.map { it.id }) + assertEquals(1, host.taps.size) + assertEquals(StoriesViewerState.Zone.NEXT, StoriesViewerState.zone(host.taps[0], view.width, false)) + assertTrue(host.products.isEmpty()) } @Test @@ -180,7 +191,11 @@ class StorySlideViewTest { ) { slideImages += url } - override fun onTap(x: Float, width: Int, rtl: Boolean) = Unit + val taps = mutableListOf() + + override fun onTap(x: Float, width: Int, rtl: Boolean) { + taps += x + } override fun onHold(hold: Boolean) = Unit override fun onOutsideSheetTap() = Unit override fun onSheet(open: Boolean) = Unit