From e10dd383ba84bd5b4531090facd31872fe0387d7 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 11:54:57 +0400 Subject: [PATCH 01/65] feat(sdk): product deeplinks and discount percent The product of every listing now carries deeplink_android, deeplink_ios and discount_percent. products/get sends "discount": false for a product without a discount, so discount and discount_percent are read leniently instead of failing the whole response. Parsing is covered on saved live answers of recommendations, category, full search and products/get. --- .../responses/product/LenientIntAdapter.kt | 33 +++ .../api/responses/product/Product.kt | 13 +- .../kotlin/com/personalization/Fixtures.kt | 8 + .../responses/product/ProductParsingTest.kt | 79 ++++++ .../src/test/resources/fixtures/category.json | 217 +++++++++++++++++ .../test/resources/fixtures/product_info.json | 126 ++++++++++ .../src/test/resources/fixtures/products.json | 226 ++++++++++++++++++ .../fixtures/recommend_extended.json | 151 ++++++++++++ .../test/resources/fixtures/search_full.json | 217 +++++++++++++++++ 9 files changed, 1069 insertions(+), 1 deletion(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientIntAdapter.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/Fixtures.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt create mode 100644 personalization-sdk/src/test/resources/fixtures/category.json create mode 100644 personalization-sdk/src/test/resources/fixtures/product_info.json create mode 100644 personalization-sdk/src/test/resources/fixtures/products.json create mode 100644 personalization-sdk/src/test/resources/fixtures/recommend_extended.json create mode 100644 personalization-sdk/src/test/resources/fixtures/search_full.json diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientIntAdapter.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientIntAdapter.kt new file mode 100644 index 00000000..f368145f --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientIntAdapter.kt @@ -0,0 +1,33 @@ +package com.personalization.api.responses.product + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonToken +import com.google.gson.stream.JsonWriter + +/** + * Reads an optional integer the API does not always send as a number. + * + * `products/get` answers `"discount": false` for a product without a discount, while the + * listings send the number of percent. A boolean (or anything else that is not a number) + * becomes `null` instead of failing the whole response. + */ +internal class LenientIntAdapter : TypeAdapter() { + + override fun write(out: JsonWriter, value: Int?) { + if (value == null) out.nullValue() else out.value(value) + } + + override fun read(reader: JsonReader): Int? = when (reader.peek()) { + JsonToken.NUMBER -> reader.nextDouble().toInt() + JsonToken.STRING -> reader.nextString().trim().toDoubleOrNull()?.toInt() + JsonToken.NULL -> { + reader.nextNull() + null + } + else -> { + reader.skipValue() + null + } + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt index 6bc947ad..25dac46e 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt @@ -1,5 +1,6 @@ package com.personalization.api.responses.product +import com.google.gson.annotations.JsonAdapter import com.google.gson.annotations.SerializedName data class Product( @@ -50,9 +51,19 @@ data class Product( @SerializedName("oldprice_formatted") val oldPriceFormatted: String? = null, @SerializedName("discount") + @JsonAdapter(LenientIntAdapter::class) val discount: Int? = null, @SerializedName("discount_formatted") val discountFormatted: String? = null, @SerializedName("is_new") - val isNew: Boolean? = null + val isNew: Boolean? = null, + /** Link that opens the product in the Android app; `null` when the shop does not send one. */ + @SerializedName("deeplink_android") + val deeplinkAndroid: String? = null, + /** Link that opens the product in the iOS app; `null` when the shop does not send one. */ + @SerializedName("deeplink_ios") + val deeplinkIos: String? = null, + @SerializedName("discount_percent") + @JsonAdapter(LenientIntAdapter::class) + val discountPercent: Int? = null ) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/Fixtures.kt b/personalization-sdk/src/test/kotlin/com/personalization/Fixtures.kt new file mode 100644 index 00000000..77b50275 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/Fixtures.kt @@ -0,0 +1,8 @@ +package com.personalization + +/** Live API answers saved under `src/test/resources/fixtures`. */ +internal object Fixtures { + fun read(name: String): String = + requireNotNull(Fixtures::class.java.classLoader?.getResource("fixtures/$name")) { "no fixture $name" } + .readText() +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt new file mode 100644 index 00000000..3bc43a92 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt @@ -0,0 +1,79 @@ +package com.personalization.api.responses.product + +import com.google.gson.Gson +import com.personalization.Fixtures +import com.personalization.api.responses.category.CategoryResponse +import com.personalization.api.responses.recommendation.GetExtendedRecommendationResponse +import com.personalization.api.responses.search.SearchFullResponse +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +/** The product shape every listing shares, read from live answers of the API. */ +class ProductParsingTest { + + private val gson = Gson() + + @Test + fun `a discounted recommendation carries old price, discount and deeplinks`() { + val response = gson.fromJson(Fixtures.read("recommend_extended.json"), GetExtendedRecommendationResponse::class.java) + val product = response.products.first() + + assertEquals(164990.0, product.price, 0.0) + assertEquals("164 990 ₽", product.priceFormatted) + assertEquals(174990.0, product.oldPrice!!, 0.0) + assertEquals("174 990 ₽", product.oldPriceFormatted) + assertEquals(6, product.discount) + assertEquals("6%", product.discountFormatted) + assertEquals(5, product.discountPercent) + assertEquals("https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", product.deeplinkAndroid) + assertEquals("https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", product.deeplinkIos) + assertTrue(product.picture.startsWith("https://pictures.rees46.ru/resize-images/180/")) + assertTrue(product.url.startsWith("https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173")) + } + + @Test + fun `a product without a discount leaves the discount fields empty`() { + val response = gson.fromJson(Fixtures.read("recommend_extended.json"), GetExtendedRecommendationResponse::class.java) + val product = response.products[1] + + assertNull(product.oldPrice) + assertNull(product.oldPriceFormatted) + assertNull(product.discount) + assertNull(product.discountFormatted) + assertNull(product.discountPercent) + assertEquals("https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", product.deeplinkAndroid) + } + + @Test + fun `product info reads a boolean discount as none and a quoted price as a number`() { + val product = gson.fromJson(Fixtures.read("product_info.json"), Product::class.java) + + assertEquals("868", product.id) + assertEquals(14990.0, product.price, 0.0) + assertNull(product.discount) + assertNull(product.oldPrice) + assertEquals("https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", product.deeplinkAndroid) + assertEquals("https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", product.deeplinkIos) + } + + @Test + fun `category and full search products carry deeplinks`() { + val category = gson.fromJson(Fixtures.read("category.json"), CategoryResponse::class.java) + val search = gson.fromJson(Fixtures.read("search_full.json"), SearchFullResponse::class.java) + + assertTrue(category.products.isNotEmpty()) + assertTrue(category.products.all { !it.deeplinkAndroid.isNullOrEmpty() && !it.deeplinkIos.isNullOrEmpty() }) + assertTrue(search.products.isNotEmpty()) + assertTrue(search.products.all { !it.deeplinkAndroid.isNullOrEmpty() && !it.deeplinkIos.isNullOrEmpty() }) + } + + @Test + fun `a numeric string discount is read as a number`() { + val product = gson.fromJson("""{"id":"1","discount":"12","discount_percent":7.0}""", Product::class.java) + + assertEquals(12, product.discount) + assertEquals(7, product.discountPercent) + } +} diff --git a/personalization-sdk/src/test/resources/fixtures/category.json b/personalization-sdk/src/test/resources/fixtures/category.json new file mode 100644 index 00000000..67287c38 --- /dev/null +++ b/personalization-sdk/src/test/resources/fixtures/category.json @@ -0,0 +1,217 @@ +{ + "products_total": 2320, + "products": [ + { + "name": "Наушники накладные HONOR CHOICE Headphones Lite Gray (5504ADGF)", + "url": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=listing", + "deeplink_android": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "deeplink_ios": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "category_ids": [ + "smartfony-i-gadzhety", + "naushniki", + "vse-naushniki" + ], + "barcode": "300252", + "vendor_code": "5504ADGF", + "brand": "Honor", + "model": "5504ADGF", + "sales_rate": 6755, + "relative_sales_rate": 100, + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "categories": [ + { + "id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=listing", + "name": "Смартфоны и гаджеты", + "level": "1", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=listing" + }, + { + "id": "naushniki", + "parent_id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing", + "name": "Смартфоны и гаджеты - Наушники", + "level": "2", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing" + }, + { + "id": "vse-naushniki", + "parent_id": "naushniki", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing", + "name": "Наушники - Все наушники", + "level": "3", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing" + } + ], + "price_formatted": "15 990 ₽", + "price_full_formatted": "15 990.00 ₽", + "price": 15990, + "price_full": 15990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg", + "image_url_handle": "/f3/api/v1/images/300252_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/146384.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/146384.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/146384.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/146384.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/146384.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/146384.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/146384.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg" + }, + "url_handle": "/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=listing", + "currency": "₽", + "_id": "146384", + "id": "300252", + "stock_quantity": 999999, + "group_id": "_146384_" + }, + { + "name": "Гарнитура Накладная Logitech H150, White, 981-000350", + "url": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868?recommended_by=listing", + "deeplink_android": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", + "deeplink_ios": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", + "category_ids": [ + "smartfony-i-gadzhety", + "naushniki", + "vse-naushniki" + ], + "barcode": "868", + "vendor_code": "981-000350", + "brand": "Logitech", + "model": "981-000350", + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/131887.jpg", + "categories": [ + { + "id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=listing", + "name": "Смартфоны и гаджеты", + "level": "1", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=listing" + }, + { + "id": "naushniki", + "parent_id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing", + "name": "Смартфоны и гаджеты - Наушники", + "level": "2", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing" + }, + { + "id": "vse-naushniki", + "parent_id": "naushniki", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing", + "name": "Наушники - Все наушники", + "level": "3", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing" + } + ], + "price_formatted": "14 990 ₽", + "price_full_formatted": "14 990.00 ₽", + "price": 14990, + "price_full": 14990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg", + "image_url_handle": "/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/131887.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/131887.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/131887.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/131887.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/131887.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/131887.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/131887.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/131887.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg" + }, + "url_handle": "/p/garnitura-nakladnaa-logitech-h-white-868?recommended_by=listing", + "currency": "₽", + "_id": "131887", + "id": "868", + "stock_quantity": 999999, + "group_id": "_131887_" + } + ], + "price_range": { + "min": 190, + "max": 1863890 + }, + "price_ranges": [ + { + "to": 10000, + "count": 501 + }, + { + "from": 10000, + "to": 25000, + "count": 378 + }, + { + "from": 25000, + "to": 50000, + "count": 415 + } + ], + "price_median": 35000, + "filters": { + "NFC": { + "count": 6, + "values": { + "Нет": 6 + } + }, + "has_gift": { + "count": 81, + "values": { + "1": 81 + }, + "ranges": { + "min": 1, + "max": 1 + } + }, + "is_preorder": { + "count": 2320, + "values": { + "False": 2320 + } + } + }, + "brands": [ + { + "name": "A-Case", + "count": 1 + }, + { + "name": "ACEFAST", + "count": 21 + }, + { + "name": "AULA", + "count": 3 + } + ], + "categories": [ + { + "id": "smartfony-i-gadzhety", + "name": "Смартфоны и гаджеты", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=listing", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=listing", + "count": 2320 + }, + { + "id": "brendy", + "name": "Бренды", + "url": "https://www.technodom.kz/catalog/brendy?recommended_by=listing", + "url_handle": "/catalog/brendy?recommended_by=listing", + "count": 77 + }, + { + "id": "tv-audio-foto-video", + "name": "ТВ, аудио, фото, видео", + "url": "https://www.technodom.kz/catalog/tv-audio-foto-video?recommended_by=listing", + "url_handle": "/catalog/tv-audio-foto-video?recommended_by=listing", + "count": 21 + } + ] +} \ No newline at end of file diff --git a/personalization-sdk/src/test/resources/fixtures/product_info.json b/personalization-sdk/src/test/resources/fixtures/product_info.json new file mode 100644 index 00000000..dc7608de --- /dev/null +++ b/personalization-sdk/src/test/resources/fixtures/product_info.json @@ -0,0 +1,126 @@ +{ + "name": "Гарнитура Накладная Logitech H150, White, 981-000350", + "is_available": true, + "description": "", + "price": "14990.0", + "price_full": 14990.0, + "currency": "₽", + "url": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", + "url_handle": "/p/garnitura-nakladnaa-logitech-h-white-868", + "picture": "https://api.technodom.kz/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg", + "image_url": "https://api.technodom.kz/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg", + "image_url_handle": "/f3/api/v1/images/garnitura_nakladnaa_logitech_h_white_868_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/131887.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/131887.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/131887.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/131887.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/131887.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/131887.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/131887.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/131887.jpg" + }, + "category_ids": [ + "smartfony-i-gadzhety", + "naushniki", + "vse-naushniki" + ], + "brand": "Logitech", + "sales_rate": null, + "relative_sales_rate": null, + "price_formatted": "14 990 ₽", + "price_full_formatted": "14 990.00 ₽", + "categories": [ + { + "id": "smartfony-i-gadzhety", + "name": "Смартфоны и гаджеты", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety", + "branch": 1, + "level": 1, + "name_with_parent": "Смартфоны и гаджеты", + "url_handle": "/catalog/smartfony-i-gadzhety" + }, + { + "parent_id": "smartfony-i-gadzhety", + "id": "naushniki", + "name": "Наушники", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki", + "branch": 1, + "level": 2, + "name_with_parent": "Смартфоны и гаджеты - Наушники", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki" + }, + { + "parent_id": "naushniki", + "id": "vse-naushniki", + "name": "Все наушники", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki", + "branch": 1, + "level": 3, + "name_with_parent": "Наушники - Все наушники", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki" + } + ], + "group_id": null, + "id": "868", + "uniqid": "868", + "widgetable": true, + "ignored": false, + "locations": { + "7": { + "price": 14990, + "stock_quantity": 9999 + }, + "10": { + "price": 14990, + "stock_quantity": 9999 + }, + "30": { + "price": 14990, + "stock_quantity": 1 + }, + "39": { + "price": 14990, + "stock_quantity": 9999 + }, + "47": { + "price": 14990, + "stock_quantity": 9999 + }, + "58": { + "price": 14990, + "stock_quantity": 9999 + }, + "None": { + "price": 14990, + "stock_quantity": 9999 + } + }, + "type_prefix": "все наушники барлық құлаққап ақ", + "vendor_code": "981-000350", + "model": "981-000350", + "barcode": "868", + "location_ids": [ + "39", + "47", + "None", + "7", + "30", + "58", + "10" + ], + "price_margin": 2, + "brand_downcase": "logitech", + "discount": false, + "tags": [ + "все", + "наушники", + "барлық", + "құлаққап", + "ақ" + ], + "image_download_start_at": "2026-10-18T15:28:29.000Z", + "stock_quantity": 999999, + "deeplink_android": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", + "deeplink_ios": "https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868" +} \ No newline at end of file diff --git a/personalization-sdk/src/test/resources/fixtures/products.json b/personalization-sdk/src/test/resources/fixtures/products.json new file mode 100644 index 00000000..8dade24f --- /dev/null +++ b/personalization-sdk/src/test/resources/fixtures/products.json @@ -0,0 +1,226 @@ +{ + "products_total": 10000, + "products": [ + { + "name": "Наушники накладные HONOR CHOICE Headphones Lite Gray (5504ADGF)", + "url": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=listing", + "deeplink_android": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "deeplink_ios": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "category_ids": [ + "smartfony-i-gadzhety", + "naushniki", + "vse-naushniki" + ], + "barcode": "300252", + "vendor_code": "5504ADGF", + "brand": "Honor", + "model": "5504ADGF", + "sales_rate": 6755, + "relative_sales_rate": 100, + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "categories": [ + { + "id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=listing", + "name": "Смартфоны и гаджеты", + "level": "1", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=listing" + }, + { + "id": "naushniki", + "parent_id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing", + "name": "Смартфоны и гаджеты - Наушники", + "level": "2", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki?recommended_by=listing" + }, + { + "id": "vse-naushniki", + "parent_id": "naushniki", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing", + "name": "Наушники - Все наушники", + "level": "3", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=listing" + } + ], + "price_formatted": "15 990 ₽", + "price_full_formatted": "15 990.00 ₽", + "price": 15990, + "price_full": 15990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg", + "image_url_handle": "/f3/api/v1/images/300252_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/146384.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/146384.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/146384.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/146384.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/146384.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/146384.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/146384.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg" + }, + "url_handle": "/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=listing", + "currency": "₽", + "_id": "146384", + "id": "300252", + "stock_quantity": 999999, + "group_id": "_146384_" + }, + { + "name": "Двухкамерный холодильник Beko RDSK-240M00W", + "url": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173?recommended_by=listing", + "deeplink_android": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", + "deeplink_ios": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", + "category_ids": [ + "bytovaja-tehnika", + "holodil-niki", + "hranenie-produktov-i-napitkov" + ], + "barcode": "52173", + "vendor_code": "RDSK-240M00W", + "brand": "Beko", + "model": "RDSK-240M00W", + "sales_rate": 3969, + "relative_sales_rate": 58.76, + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/132229.jpg", + "categories": [ + { + "id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=listing", + "name": "Бытовая техника", + "level": "1", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=listing" + }, + { + "id": "hranenie-produktov-i-napitkov", + "parent_id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov?recommended_by=listing", + "name": "Бытовая техника - Хранение продуктов и напитков", + "level": "2", + "url_handle": "/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov?recommended_by=listing" + }, + { + "id": "holodil-niki", + "parent_id": "hranenie-produktov-i-napitkov", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov/holodil-niki?recommended_by=listing", + "name": "Хранение продуктов и напитков - Холодильники", + "level": "3", + "url_handle": "/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov/holodil-niki?recommended_by=listing" + } + ], + "discount_percent": 5, + "price_formatted": "164 990 ₽", + "price_full_formatted": "164 990.00 ₽", + "price": 164990, + "price_full": 164990, + "oldprice_formatted": "174 990 ₽", + "oldprice_full_formatted": "174 990.00 ₽", + "oldprice": 174990, + "oldprice_full": 174990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg", + "image_url_handle": "/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/132229.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/132229.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/132229.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/132229.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/132229.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/132229.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/132229.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/132229.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg" + }, + "url_handle": "/p/holodilnik-beko-rdsk-mw-52173?recommended_by=listing", + "discount": 6, + "discount_formatted": "6%", + "currency": "₽", + "_id": "132229", + "id": "52173", + "stock_quantity": 999999, + "group_id": "_132229_" + } + ], + "price_range": { + "min": 10, + "max": 8000000 + }, + "price_ranges": [ + { + "to": 10000, + "count": 3107 + }, + { + "from": 10000, + "to": 25000, + "count": 2497 + }, + { + "from": 25000, + "to": 50000, + "count": 2399 + } + ], + "price_median": 37000, + "filters": { + "\"Сухой\" ТЭН": { + "count": 2, + "values": { + "Да": 2 + } + }, + "AC выход": { + "count": 1, + "values": { + "3600 Вт (Скачки 7200 Вт)": 1 + } + }, + "AC гнезда": { + "count": 1, + "values": { + "4": 1 + }, + "ranges": { + "min": 4, + "max": 4 + } + } + }, + "brands": [ + { + "name": "1STPLAYER", + "count": 11 + }, + { + "name": "2E", + "count": 31 + }, + { + "name": "70mai", + "count": 1 + } + ], + "categories": [ + { + "id": "noutbuki-i-komp-jutery", + "name": "Ноутбуки и компьютеры", + "url": "https://www.technodom.kz/catalog/noutbuki-i-komp-jutery?recommended_by=listing", + "url_handle": "/catalog/noutbuki-i-komp-jutery?recommended_by=listing", + "count": 3240 + }, + { + "id": "bytovaja-tehnika", + "name": "Бытовая техника", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=listing", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=listing", + "count": 2818 + }, + { + "id": "tehnika-dlja-kuhni", + "name": "Техника для кухни", + "url": "https://www.technodom.kz/catalog/tehnika-dlja-kuhni?recommended_by=listing", + "url_handle": "/catalog/tehnika-dlja-kuhni?recommended_by=listing", + "count": 2428 + } + ] +} \ No newline at end of file diff --git a/personalization-sdk/src/test/resources/fixtures/recommend_extended.json b/personalization-sdk/src/test/resources/fixtures/recommend_extended.json new file mode 100644 index 00000000..1e7b23bd --- /dev/null +++ b/personalization-sdk/src/test/resources/fixtures/recommend_extended.json @@ -0,0 +1,151 @@ +{ + "id": 877, + "title": "Популярные", + "recommends": [ + { + "name": "Двухкамерный холодильник Beko RDSK-240M00W", + "url": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "deeplink_android": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", + "deeplink_ios": "https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", + "category_ids": [ + "bytovaja-tehnika", + "holodil-niki", + "hranenie-produktov-i-napitkov" + ], + "barcode": "52173", + "vendor_code": "RDSK-240M00W", + "brand": "Beko", + "model": "RDSK-240M00W", + "sales_rate": 3969, + "relative_sales_rate": 58.76, + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/132229.jpg", + "categories": [ + { + "id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Бытовая техника", + "level": "1", + "name_with_parent": "Бытовая техника", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + }, + { + "id": "hranenie-produktov-i-napitkov", + "parent_id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Хранение продуктов и напитков", + "level": "2", + "name_with_parent": "Бытовая техника - Хранение продуктов и напитков", + "url_handle": "/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + }, + { + "id": "holodil-niki", + "parent_id": "hranenie-produktov-i-napitkov", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov/holodil-niki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Холодильники", + "level": "3", + "name_with_parent": "Хранение продуктов и напитков - Холодильники", + "url_handle": "/catalog/bytovaja-tehnika/hranenie-produktov-i-napitkov/holodil-niki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + } + ], + "discount_percent": 5, + "price_formatted": "164 990 ₽", + "price_full_formatted": "164 990.00 ₽", + "price": 164990, + "price_full": 164990, + "oldprice_formatted": "174 990 ₽", + "oldprice_full_formatted": "174 990.00 ₽", + "oldprice": 174990, + "oldprice_full": 174990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg", + "image_url_handle": "/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/132229.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/132229.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/132229.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/132229.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/132229.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/132229.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/132229.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/132229.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/holodilnik_beko_rdsk_mw_52173_1.jpg" + }, + "url_handle": "/p/holodilnik-beko-rdsk-mw-52173?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "discount": 6, + "discount_formatted": "6%", + "currency": "₽", + "_id": "132229", + "id": "52173", + "stock_quantity": 999999, + "group_id": "_132229_" + }, + { + "name": "Наушники накладные HONOR CHOICE Headphones Lite Gray (5504ADGF)", + "url": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "deeplink_android": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "deeplink_ios": "https://www.technodom.kz/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252", + "category_ids": [ + "smartfony-i-gadzhety", + "naushniki", + "vse-naushniki" + ], + "barcode": "300252", + "vendor_code": "5504ADGF", + "brand": "Honor", + "model": "5504ADGF", + "sales_rate": 6755, + "relative_sales_rate": 100, + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "categories": [ + { + "id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Смартфоны и гаджеты", + "level": "1", + "name_with_parent": "Смартфоны и гаджеты", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + }, + { + "id": "naushniki", + "parent_id": "smartfony-i-gadzhety", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Наушники", + "level": "2", + "name_with_parent": "Смартфоны и гаджеты - Наушники", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + }, + { + "id": "vse-naushniki", + "parent_id": "naushniki", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "name": "Все наушники", + "level": "3", + "name_with_parent": "Наушники - Все наушники", + "url_handle": "/catalog/smartfony-i-gadzhety/naushniki/vse-naushniki?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962" + } + ], + "price_formatted": "15 990 ₽", + "price_full_formatted": "15 990.00 ₽", + "price": 15990, + "price_full": 15990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg", + "image_url_handle": "/f3/api/v1/images/300252_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/146384.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/146384.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/146384.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/146384.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/146384.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/146384.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/146384.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/146384.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/300252_1.jpg" + }, + "url_handle": "/p/naushniki-nakladnye-honor-choice-headphones-lite-gray-5504adgf-300252?recommended_by=dynamic&recommended_code=e6249bb15043644bf25b135006149962", + "currency": "₽", + "_id": "146384", + "id": "300252", + "stock_quantity": 999999, + "group_id": "_146384_" + } + ] +} \ No newline at end of file diff --git a/personalization-sdk/src/test/resources/fixtures/search_full.json b/personalization-sdk/src/test/resources/fixtures/search_full.json new file mode 100644 index 00000000..db8a2f8a --- /dev/null +++ b/personalization-sdk/src/test/resources/fixtures/search_full.json @@ -0,0 +1,217 @@ +{ + "search_query": "samsung", + "search_query_original": "samsung", + "collections": [], + "products_total": 833, + "products": [ + { + "name": "Стиральная машина Samsung WW60AK4S00CELT", + "url": "https://www.technodom.kz/p/stiralnaya-mashina-samsung-ww60ak4s00celt-292523?recommended_by=full_search&recommended_code=samsung", + "deeplink_android": "https://www.technodom.kz/p/stiralnaya-mashina-samsung-ww60ak4s00celt-292523", + "deeplink_ios": "https://www.technodom.kz/p/stiralnaya-mashina-samsung-ww60ak4s00celt-292523", + "category_ids": [ + "bytovaja-tehnika", + "stiral-nye-mashiny", + "uhod-za-odezhdoj" + ], + "barcode": "292523", + "vendor_code": "WW60AK4S00CELT", + "brand": "Samsung", + "model": "WW60AK4S00CELT", + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/143748.jpg", + "categories": [ + { + "id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung", + "name": "Бытовая техника", + "level": "1", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung" + }, + { + "id": "uhod-za-odezhdoj", + "parent_id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/uhod-za-odezhdoj?recommended_by=full_search&recommended_code=samsung", + "name": "Бытовая техника - Уход за одеждой", + "level": "2", + "url_handle": "/catalog/bytovaja-tehnika/uhod-za-odezhdoj?recommended_by=full_search&recommended_code=samsung" + }, + { + "id": "stiral-nye-mashiny", + "parent_id": "uhod-za-odezhdoj", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/uhod-za-odezhdoj/stiral-nye-mashiny?recommended_by=full_search&recommended_code=samsung", + "name": "Уход за одеждой - Стиральные машины", + "level": "3", + "url_handle": "/catalog/bytovaja-tehnika/uhod-za-odezhdoj/stiral-nye-mashiny?recommended_by=full_search&recommended_code=samsung" + } + ], + "price_formatted": "179 990 ₽", + "price_full_formatted": "179 990.00 ₽", + "price": 179990, + "price_full": 179990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/292523_1.jpg", + "image_url_handle": "/f3/api/v1/images/292523_1.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/143748.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/143748.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/143748.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/143748.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/143748.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/143748.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/143748.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/143748.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/292523_1.jpg" + }, + "url_handle": "/p/stiralnaya-mashina-samsung-ww60ak4s00celt-292523?recommended_by=full_search&recommended_code=samsung", + "currency": "₽", + "_id": "143748", + "id": "292523", + "stock_quantity": 999999, + "group_id": "_143748_" + }, + { + "name": "Пылесос с контейнером Samsung VC-C4520S3R", + "url": "https://www.technodom.kz/p/pylesos-samsung-vc-c4520s3r-22510?recommended_by=full_search&recommended_code=samsung", + "deeplink_android": "https://www.technodom.kz/p/pylesos-samsung-vc-c4520s3r-22510", + "deeplink_ios": "https://www.technodom.kz/p/pylesos-samsung-vc-c4520s3r-22510", + "category_ids": [ + "bytovaja-tehnika", + "pylesosy", + "uhod-za-domom" + ], + "barcode": "22510", + "vendor_code": "VC-C4520S3R", + "brand": "Samsung", + "model": "VC-C4520S3R", + "picture": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/133215.jpg", + "categories": [ + { + "id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung", + "name": "Бытовая техника", + "level": "1", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung" + }, + { + "id": "uhod-za-domom", + "parent_id": "bytovaja-tehnika", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/uhod-za-domom?recommended_by=full_search&recommended_code=samsung", + "name": "Бытовая техника - Уход за домом", + "level": "2", + "url_handle": "/catalog/bytovaja-tehnika/uhod-za-domom?recommended_by=full_search&recommended_code=samsung" + }, + { + "id": "pylesosy", + "parent_id": "uhod-za-domom", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika/uhod-za-domom/pylesosy?recommended_by=full_search&recommended_code=samsung", + "name": "Уход за домом - Пылесосы", + "level": "3", + "url_handle": "/catalog/bytovaja-tehnika/uhod-za-domom/pylesosy?recommended_by=full_search&recommended_code=samsung" + } + ], + "price_formatted": "41 990 ₽", + "price_full_formatted": "41 990.00 ₽", + "price": 41990, + "price_full": 41990, + "image_url": "https://api.technodom.kz/f3/api/v1/images/22510_2.jpg", + "image_url_handle": "/f3/api/v1/images/22510_2.jpg", + "image_url_resized": { + "120": "https://pictures.rees46.ru/resize-images/120/c1140c8254976de297c3caf971701a/133215.jpg", + "140": "https://pictures.rees46.ru/resize-images/140/c1140c8254976de297c3caf971701a/133215.jpg", + "160": "https://pictures.rees46.ru/resize-images/160/c1140c8254976de297c3caf971701a/133215.jpg", + "180": "https://pictures.rees46.ru/resize-images/180/c1140c8254976de297c3caf971701a/133215.jpg", + "200": "https://pictures.rees46.ru/resize-images/200/c1140c8254976de297c3caf971701a/133215.jpg", + "220": "https://pictures.rees46.ru/resize-images/220/c1140c8254976de297c3caf971701a/133215.jpg", + "310": "https://pictures.rees46.ru/resize-images/310/c1140c8254976de297c3caf971701a/133215.jpg", + "520": "https://pictures.rees46.ru/resize-images/520/c1140c8254976de297c3caf971701a/133215.jpg", + "original": "https://api.technodom.kz/f3/api/v1/images/22510_2.jpg" + }, + "url_handle": "/p/pylesos-samsung-vc-c4520s3r-22510?recommended_by=full_search&recommended_code=samsung", + "currency": "₽", + "_id": "133215", + "id": "22510", + "stock_quantity": 999999, + "group_id": "_133215_" + } + ], + "price_range": { + "min": 990, + "max": 6999990 + }, + "price_ranges": [ + { + "to": 100000, + "count": 346 + }, + { + "from": 100000, + "to": 250000, + "count": 150 + }, + { + "from": 250000, + "to": 500000, + "count": 151 + } + ], + "price_median": 161000, + "filters": { + "is_preorder": { + "count": 833, + "values": { + "False": 833 + } + }, + "merchant": { + "count": 833, + "values": { + "Technodom": 833 + } + }, + "product_type": { + "count": 833, + "values": { + "regular": 833 + } + } + }, + "brands": [ + { + "name": "Samsung", + "count": 801 + }, + { + "name": "Topperr", + "count": 9 + }, + { + "name": "Ozone", + "count": 1 + } + ], + "categories": [ + { + "id": "smartfony-i-gadzhety", + "name": "Смартфоны и гаджеты", + "url": "https://www.technodom.kz/catalog/smartfony-i-gadzhety?recommended_by=full_search&recommended_code=samsung", + "url_handle": "/catalog/smartfony-i-gadzhety?recommended_by=full_search&recommended_code=samsung", + "count": 422 + }, + { + "id": "bytovaja-tehnika", + "name": "Бытовая техника", + "url": "https://www.technodom.kz/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung", + "url_handle": "/catalog/bytovaja-tehnika?recommended_by=full_search&recommended_code=samsung", + "count": 209 + }, + { + "id": "tv-audio-foto-video", + "name": "ТВ, аудио, фото, видео", + "url": "https://www.technodom.kz/catalog/tv-audio-foto-video?recommended_by=full_search&recommended_code=samsung", + "url_handle": "/catalog/tv-audio-foto-video?recommended_by=full_search&recommended_code=samsung", + "count": 148 + } + ], + "clarification": false, + "requests_count": 1, + "html": "" +} \ No newline at end of file From 7742e80d03a4cb5a2dc40052a7630a654251608a Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 11:55:32 +0400 Subject: [PATCH 02/65] fix(sdk): products list sends filters under the filters key getProductsList put the filters JSON under an empty parameter name, so the server never saw them. iOS already sends them as filters. --- .../products/impl/ProductsManagerImpl.kt | 2 +- .../products/impl/ProductsManagerImplTest.kt | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt index 87381645..c7725816 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt @@ -113,6 +113,6 @@ internal class ProductsManagerImpl @Inject constructor( private const val MERCHANTS_KEY = "merchants" private const val CATEGORIES_KEY = "categories" private const val ITEM_ID_KEY = "item_id" - private const val FILTERS_KEY = "" + private const val FILTERS_KEY = "filters" } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt index aa8d7732..d8ec9c93 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt @@ -11,6 +11,7 @@ import io.mockk.slot import io.mockk.verify import org.json.JSONObject import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test @@ -89,4 +90,26 @@ class ProductsManagerImplTest { assertEquals(404, code) assertTrue(msg!!.contains("not found")) } + + @Test + fun getProductsList_sendsFiltersAsJsonUnderFiltersKey() { + val paramsSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(any(), capture(paramsSlot), any()) + } just Runs + + impl.getProductsList( + brands = null, + merchants = null, + categories = null, + locations = null, + limit = null, + page = null, + filters = mapOf("color" to listOf("red")) + ) + + val body = paramsSlot.captured + assertFalse(body.has("")) + assertEquals("""{"color":["red"]}""", body.getString("filters")) + } } From d78e8b1ef9831d88d22cb32996465c45320a3f36 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 11:57:20 +0400 Subject: [PATCH 03/65] feat(sdk): typed getProductInfo and getProductsList New overloads next to the listener-based ones, in the style of CategoryManager.getCategory: getProductInfo hands over a Product, getProductsList a ProductsListResponse with total, products, brands, categories, facets and price range built from the full search classes. An answer that cannot be read goes to onError. --- .../api/managers/ProductsManager.kt | 46 ++++++++++ .../products/ProductsListResponse.kt | 34 ++++++++ .../products/impl/ProductsManagerImpl.kt | 81 ++++++++++++++++++ .../products/impl/ProductsManagerImplTest.kt | 84 +++++++++++++++++++ 4 files changed, 245 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/ProductsListResponse.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt index a0951d99..79ff01e9 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt @@ -1,6 +1,8 @@ package com.personalization.api.managers import com.personalization.api.OnApiCallbackListener +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.products.ProductsListResponse import com.personalization.api.responses.products.counters.ProductCountersResponse interface ProductsManager { @@ -16,11 +18,55 @@ interface ProductsManager { listener: OnApiCallbackListener? = null ) + /** + * Fetch a product listing (`GET /products`) parsed into [ProductsListResponse]. + * + * Same request as the listener-based [getProductsList]; the answer has the shape of a full + * search: products, total and facets. + * + * @param brands Comma-separated brand filter + * @param merchants Comma-separated merchant filter + * @param categories Comma-separated category filter + * @param locations Comma-separated locations filter + * @param limit Max products to return + * @param page Page number + * @param filters Arbitrary facet filters + * @param onSuccess Callback with the parsed listing + * @param onError Callback for error + */ + fun getProductsList( + brands: String? = null, + merchants: String? = null, + categories: String? = null, + locations: String? = null, + limit: Int? = null, + page: Int? = null, + filters: Map? = null, + onSuccess: (ProductsListResponse) -> Unit, + onError: (Int, String?) -> Unit = { _: Int, _: String? -> } + ) + fun getProductInfo( itemId: String, listener: OnApiCallbackListener? ) + /** + * Fetch one product (`GET /products/get`) parsed into [Product]. + * + * Same request as the listener-based [getProductInfo]. An answer that is not a product + * goes to [onError]. + * + * @param itemId Product item id + * @param onSuccess Callback with the parsed product + * @param onError Callback for error + */ + fun getProductInfo( + itemId: String, + onSuccess: (Product) -> Unit, + onError: (Int, String?) -> Unit = { _: Int, _: String? -> } + ) + /** * Fetch view/cart/purchase counters and trigger counts for a product * (`GET /products/counters`). diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/ProductsListResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/ProductsListResponse.kt new file mode 100644 index 00000000..acd83c89 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/ProductsListResponse.kt @@ -0,0 +1,34 @@ +package com.personalization.api.responses.products + +import com.google.gson.annotations.SerializedName +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.search.Brand +import com.personalization.api.responses.search.Category +import com.personalization.api.responses.search.PriceRange +import com.personalization.api.responses.search.PriceRanges +import com.personalization.api.responses.search.SearchFilter + +/** + * Response for the `GET /products` request. + * + * Has the shape of a full search and of a category: the page of products plus faceting + * metadata, so the same classes describe it. Facets in [filters] are keyed by name. + */ +data class ProductsListResponse( + @SerializedName("products_total") + val productsTotal: Int = 0, + @SerializedName("products") + val products: List = emptyList(), + @SerializedName("brands") + val brands: List = emptyList(), + @SerializedName("filters") + val filters: Map? = null, + @SerializedName("price_range") + val priceRange: PriceRange? = null, + @SerializedName("categories") + val categories: List = emptyList(), + @SerializedName("price_ranges") + val priceRanges: List = emptyList(), + @SerializedName("price_median") + val priceMedian: Double? = null +) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt index c7725816..19de0914 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt @@ -1,9 +1,12 @@ package com.personalization.features.products.impl import com.google.gson.Gson +import com.google.gson.JsonParseException import com.personalization.Params import com.personalization.api.OnApiCallbackListener import com.personalization.api.managers.ProductsManager +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.products.ProductsListResponse import com.personalization.api.responses.products.counters.ProductCountersResponse import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase import org.json.JSONObject @@ -38,6 +41,34 @@ internal class ProductsManagerImpl @Inject constructor( ) } + override fun getProductsList( + brands: String?, + merchants: String?, + categories: String?, + locations: String?, + limit: Int?, + page: Int?, + filters: Map?, + onSuccess: (ProductsListResponse) -> Unit, + onError: (Int, String?) -> Unit + ) { + getProductsList( + brands = brands, + merchants = merchants, + categories = categories, + locations = locations, + limit = limit, + page = page, + filters = filters, + listener = parsingListener( + method = GET_PRODUCT_LIST_REQUEST, + parse = { json -> Gson().fromJson(json, ProductsListResponse::class.java) ?: ProductsListResponse() }, + onSuccess = onSuccess, + onError = onError + ) + ) + } + override fun getProductInfo( itemId: String, listener: OnApiCallbackListener? @@ -51,6 +82,28 @@ internal class ProductsManagerImpl @Inject constructor( ) } + override fun getProductInfo( + itemId: String, + onSuccess: (Product) -> Unit, + onError: (Int, String?) -> Unit + ) { + getProductInfo( + itemId = itemId, + listener = parsingListener( + method = GET_PRODUCT_INFO_REQUEST, + parse = { json -> + // Gson leaves non-null fields empty when the answer lacks them: no id — no product. + Gson().fromJson(json, Product::class.java)?.takeIf { product -> + val id: String? = product.id + !id.isNullOrEmpty() + } + }, + onSuccess = onSuccess, + onError = onError + ) + ) + } + override fun getProductCounters( item: String, onSuccess: (ProductCountersResponse) -> Unit, @@ -75,6 +128,31 @@ internal class ProductsManagerImpl @Inject constructor( ) } + /** + * Parses the answer with [parse] off the raw JSON. A malformed answer, or one [parse] rejects + * with `null`, goes to [onError] instead of throwing on the network thread. + */ + private fun parsingListener( + method: String, + parse: (String) -> T?, + onSuccess: (T) -> Unit, + onError: (Int, String?) -> Unit + ): OnApiCallbackListener = object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + val parsed = try { + parse(response?.toString() ?: "{}") + } catch (e: JsonParseException) { + onError(PARSE_ERROR_CODE, "$method: ${e.message}") + return + } + if (parsed != null) onSuccess(parsed) else onError(PARSE_ERROR_CODE, "$method: unexpected answer") + } + + override fun onError(code: Int, msg: String?) { + onError(code, msg) + } + } + private fun Params.buildParams( itemId: String? = null, brands: String? = null, @@ -104,6 +182,9 @@ internal class ProductsManagerImpl @Inject constructor( const val GET_PRODUCT_INFO_REQUEST = "products/get" const val GET_PRODUCT_COUNTERS_REQUEST = "products/counters" + /** The answer came but could not be read as the expected model. */ + const val PARSE_ERROR_CODE = -1 + private const val ITEM_KEY = "item" private const val LIMIT_KEY = "limit" diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt index d8ec9c93..bb7381a3 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt @@ -1,6 +1,9 @@ package com.personalization.features.products.impl +import com.personalization.Fixtures import com.personalization.api.OnApiCallbackListener +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.products.ProductsListResponse import com.personalization.api.responses.products.counters.ProductCountersResponse import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase import io.mockk.Runs @@ -12,6 +15,8 @@ import io.mockk.verify import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test @@ -112,4 +117,83 @@ class ProductsManagerImplTest { assertFalse(body.has("")) assertEquals("""{"color":["red"]}""", body.getString("filters")) } + + @Test + fun getProductsList_typed_parsesListingWithFacets() { + val methodSlot = slot() + val paramsSlot = slot() + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(capture(methodSlot), capture(paramsSlot), capture(listenerSlot)) + } just Runs + + var result: ProductsListResponse? = null + impl.getProductsList(brands = "Beko", limit = 2, page = 1, onSuccess = { result = it }) + listenerSlot.captured.onSuccess(JSONObject(Fixtures.read("products.json"))) + + assertEquals(ProductsManagerImpl.GET_PRODUCT_LIST_REQUEST, methodSlot.captured) + assertEquals("Beko", paramsSlot.captured.getString("brands")) + assertEquals(2, paramsSlot.captured.getInt("limit")) + val listing = result!! + assertTrue(listing.productsTotal > 0) + assertEquals(2, listing.products.size) + assertTrue(listing.brands.isNotEmpty()) + assertEquals(2, listing.filters!!.getValue("\"Сухой\" ТЭН").values.getValue("Да")) + assertEquals(10.0, listing.priceRange!!.min, 0.0) + val discounted = listing.products[1] + assertEquals("174 990 ₽", discounted.oldPriceFormatted) + assertEquals(5, discounted.discountPercent) + assertNotNull(discounted.deeplinkAndroid) + } + + @Test + fun getProductInfo_typed_parsesProduct() { + val methodSlot = slot() + val paramsSlot = slot() + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(capture(methodSlot), capture(paramsSlot), capture(listenerSlot)) + } just Runs + + var result: Product? = null + impl.getProductInfo(itemId = "868", onSuccess = { result = it }) + listenerSlot.captured.onSuccess(JSONObject(Fixtures.read("product_info.json"))) + + assertEquals(ProductsManagerImpl.GET_PRODUCT_INFO_REQUEST, methodSlot.captured) + assertEquals("868", paramsSlot.captured.getString("item_id")) + assertEquals("868", result?.id) + assertEquals("14 990 ₽", result?.priceFormatted) + assertNull(result?.discount) + assertEquals("https://www.technodom.kz/p/garnitura-nakladnaa-logitech-h-white-868", result?.deeplinkAndroid) + } + + @Test + fun getProductInfo_typed_reportsAnswerWithoutProductAsError() { + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot)) + } just Runs + + var success = false + var code = 0 + impl.getProductInfo(itemId = "868", onSuccess = { success = true }, onError = { c, _ -> code = c }) + listenerSlot.captured.onSuccess(JSONObject("{}")) + + assertFalse(success) + assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, code) + } + + @Test + fun getProductInfo_typed_forwardsError() { + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot)) + } just Runs + + var code = 0 + impl.getProductInfo(itemId = "868", onSuccess = {}, onError = { c, _ -> code = c }) + listenerSlot.captured.onError(400, "bad request") + + assertEquals(400, code) + } } From 8812b86061e49f3fd192fa3cb8d638b427ca5a43 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 11:59:01 +0400 Subject: [PATCH 04/65] feat(sdk): notification history with the shop secret GET /notifications authenticates the shop by shop_secret and answers 400 "Incorrect shop credentials" without it, while the SDK stopped adding any secret to requests. GetAllNotificationsUseCase gets variants with shopSecret that send it as shop_secret; the variants without it stay as they were and are deprecated in favour of the new ones. --- .../GetAllNotificationsUseCase.kt | 120 +++++++++++++++--- .../GetAllNotificationsUseCaseTest.kt | 90 +++++++++++++ 2 files changed, 191 insertions(+), 19 deletions(-) create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCaseTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCase.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCase.kt index d68326cb..bd5c4530 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCase.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCase.kt @@ -18,6 +18,13 @@ class GetAllNotificationsUseCase @Inject constructor( private val networkRepository: NetworkRepository ) { + /** + * Notification history of a user (`GET /notifications`). + * + * The endpoint authenticates the shop by its secret key; without [shopSecret] the API + * answers 400 "Incorrect shop credentials". [shopSecret] comes after the paging + * parameters so that a call written for the variant without it can never bind here. + */ fun invoke( email: String? = null, phone: String? = null, @@ -28,8 +35,89 @@ class GetAllNotificationsUseCase @Inject constructor( channels: NotificationChannels, page: Int = DEFAULT_PAGE, limit: Int = DEFAULT_LIMIT, + shopSecret: String, onGetAllNotifications: (GetAllNotificationsResponse) -> Unit, onError: (Int, String?) -> Unit = { _: Int, _: String? -> } + ) { + request( + email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, + shopSecret, onGetAllNotifications, onError + ) + } + + /** [invoke] with the result as a flow. */ + fun invoke( + email: String? = null, + phone: String? = null, + loyaltyId: String? = null, + externalId: String? = null, + dateFrom: String, + types: NotificationTypes, + channels: NotificationChannels, + page: Int = DEFAULT_PAGE, + limit: Int = DEFAULT_LIMIT, + shopSecret: String + ): StateFlow> = + requestFlow(email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, shopSecret) + + @Deprecated( + message = "The API rejects the request without the shop secret. Use the variant with shopSecret.", + replaceWith = ReplaceWith( + "invoke(email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, " + + "shopSecret, onGetAllNotifications, onError)" + ) + ) + fun invoke( + email: String? = null, + phone: String? = null, + loyaltyId: String? = null, + externalId: String? = null, + dateFrom: String, + types: NotificationTypes, + channels: NotificationChannels, + page: Int = DEFAULT_PAGE, + limit: Int = DEFAULT_LIMIT, + onGetAllNotifications: (GetAllNotificationsResponse) -> Unit, + onError: (Int, String?) -> Unit = { _: Int, _: String? -> } + ) { + request( + email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, + null, onGetAllNotifications, onError + ) + } + + @Deprecated( + message = "The API rejects the request without the shop secret. Use the variant with shopSecret.", + replaceWith = ReplaceWith( + "invoke(email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, shopSecret)" + ) + ) + fun invoke( + email: String? = null, + phone: String? = null, + loyaltyId: String? = null, + externalId: String? = null, + dateFrom: String, + types: NotificationTypes, + channels: NotificationChannels, + page: Int = DEFAULT_PAGE, + limit: Int = DEFAULT_LIMIT + ): StateFlow> = + requestFlow(email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, null) + + private fun request( + email: String?, + phone: String?, + loyaltyId: String?, + externalId: String?, + dateFrom: String, + types: NotificationTypes, + channels: NotificationChannels, + page: Int, + limit: Int, + shopSecret: String?, + onGetAllNotifications: (GetAllNotificationsResponse) -> Unit, + onError: (Int, String?) -> Unit ) { val type = EnumUtils.getEnumsString(types) val channel = EnumUtils.getEnumsString(channels) @@ -45,6 +133,7 @@ class GetAllNotificationsUseCase @Inject constructor( page = page, limit = limit ) + shopSecret?.let { params.put(SHOP_SECRET_PARAM, it) } val listener = notificationRepository.getAllNotificationListener( onGetAllNotifications = onGetAllNotifications, @@ -58,16 +147,17 @@ class GetAllNotificationsUseCase @Inject constructor( ) } - fun invoke( - email: String? = null, - phone: String? = null, - loyaltyId: String? = null, - externalId: String? = null, + private fun requestFlow( + email: String?, + phone: String?, + loyaltyId: String?, + externalId: String?, dateFrom: String, types: NotificationTypes, channels: NotificationChannels, - page: Int = DEFAULT_PAGE, - limit: Int = DEFAULT_LIMIT + page: Int, + limit: Int, + shopSecret: String? ): StateFlow> { val resultFlow = MutableStateFlow(ResponseResult()) @@ -92,18 +182,9 @@ class GetAllNotificationsUseCase @Inject constructor( } } - invoke( - email = email, - phone = phone, - loyaltyId = loyaltyId, - externalId = externalId, - dateFrom = dateFrom, - types = types, - channels = channels, - page = page, - limit = limit, - onGetAllNotifications = onGetAllNotifications, - onError = onError + request( + email, phone, loyaltyId, externalId, dateFrom, types, channels, page, limit, + shopSecret, onGetAllNotifications, onError ) return resultFlow @@ -111,6 +192,7 @@ class GetAllNotificationsUseCase @Inject constructor( companion object { private const val GET_ALL_NOTIFICATIONS_REQUEST = "notifications" + private const val SHOP_SECRET_PARAM = "shop_secret" private const val DEFAULT_PAGE = 1 private const val DEFAULT_LIMIT = 20 diff --git a/personalization-sdk/src/test/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCaseTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCaseTest.kt new file mode 100644 index 00000000..31be3bd5 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/sdk/domain/usecases/notification/GetAllNotificationsUseCaseTest.kt @@ -0,0 +1,90 @@ +package com.personalization.sdk.domain.usecases.notification + +import com.personalization.api.params.NotificationChannel +import com.personalization.api.params.NotificationChannels +import com.personalization.api.params.NotificationType +import com.personalization.api.params.NotificationTypes +import com.personalization.sdk.domain.repositories.NetworkRepository +import com.personalization.sdk.domain.repositories.NotificationRepository +import io.mockk.Runs +import io.mockk.every +import io.mockk.just +import io.mockk.mockk +import io.mockk.slot +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +/** `GET /notifications` authenticates the shop by its secret: it has to travel with the request. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class GetAllNotificationsUseCaseTest { + + private lateinit var notificationRepository: NotificationRepository + private lateinit var networkRepository: NetworkRepository + private lateinit var useCase: GetAllNotificationsUseCase + private val methodSlot = slot() + private val paramsSlot = slot() + + @Before + fun setUp() { + notificationRepository = mockk(relaxed = true) + networkRepository = mockk(relaxed = true) + every { + notificationRepository.getAllNotificationsParams(any(), any(), any(), any(), any(), any(), any(), any(), any()) + } answers { JSONObject().put("date_from", arg(4)) } + every { networkRepository.getSecretAsync(capture(methodSlot), capture(paramsSlot), any()) } just Runs + useCase = GetAllNotificationsUseCase(notificationRepository, networkRepository) + } + + @Test + fun `the request carries the shop secret`() { + useCase.invoke( + email = "user@example.com", + dateFrom = "2026-01-01", + types = types(), + channels = channels(), + shopSecret = "secret", + onGetAllNotifications = {} + ) + + assertEquals("notifications", methodSlot.captured) + assertEquals("secret", paramsSlot.captured.getString("shop_secret")) + assertEquals("2026-01-01", paramsSlot.captured.getString("date_from")) + } + + @Test + fun `the flow variant carries the shop secret`() { + useCase.invoke( + dateFrom = "2026-01-01", + types = types(), + channels = channels(), + shopSecret = "secret" + ) + + assertEquals("secret", paramsSlot.captured.getString("shop_secret")) + } + + @Test + @Suppress("DEPRECATION") + fun `the variant without a secret still sends what it sent`() { + useCase.invoke( + dateFrom = "2026-01-01", + types = types(), + channels = channels(), + onGetAllNotifications = {} + ) + + assertFalse(paramsSlot.captured.has("shop_secret")) + assertEquals("2026-01-01", paramsSlot.captured.getString("date_from")) + } + + private fun types(): NotificationTypes = NotificationTypes.of(NotificationType.BULK) + + private fun channels(): NotificationChannels = NotificationChannels.of(NotificationChannel.EMAIL) +} From 077731a687f23251b4f113b27df193a87aac25c6 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:00:27 +0400 Subject: [PATCH 05/65] feat(ui): product card data carries url and deeplink PersonalizationProduct gets the product page url and the in-app deeplink so a host can open the product it got from a tap. --- .../ui/components/PersonalizationProduct.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt index 070f946d..8f248657 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt @@ -9,6 +9,10 @@ import com.personalization.ui.InternalPersonalizationUiApi * форматирование и локализация остаются за интегратором. * Изображение по [imageUrl] компонент не грузит: раскладки отдают хосту * `ImageView` через свой `imageLoader`. + * + * [url] и [deeplink] карточка не открывает сама — их получает хост вместе с нажатием, + * чтобы перейти на товар: [deeplink] ведёт в приложение (`deeplink_android` из ответа), + * [url] — на страницу товара на сайте. */ @InternalPersonalizationUiApi data class PersonalizationProduct( @@ -21,5 +25,7 @@ data class PersonalizationProduct( val reviews: Int = 0, val oldPrice: CharSequence? = null, val discount: CharSequence? = null, - val actionText: CharSequence? = null + val actionText: CharSequence? = null, + val url: String? = null, + val deeplink: String? = null ) From b76ae34fe41e637f4d74964dd811186c65d9ff9c Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:00:27 +0400 Subject: [PATCH 06/65] feat(ui): one mapping from the API product to the kit card Replaces the search mapper and serves every data widget: formatted price or number with currency, old price only above the price, discount only with an old price, picture or the original image, brand, url and the Android deeplink. Search shows what it showed. --- .../PersonalizationInstantSearchField.kt | 2 +- .../PersonalizationSearchResultsScreen.kt | 2 +- .../ui/widgets/ProductMapping.kt | 47 +++++++++++ .../ui/widgets/SearchSupport.kt | 28 ------- .../ui/widgets/ProductMappingTest.kt | 82 +++++++++++++++++++ 5 files changed, 131 insertions(+), 30 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt index a4ec85d2..9d67866d 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt @@ -332,7 +332,7 @@ class PersonalizationInstantSearchField @JvmOverloads constructor( } private fun Product.toSuggestion(): PersonalizationInstantSearch.Suggestion { - val card = toCardProduct(actionText = null) + val card = toPersonalizationProduct() return PersonalizationInstantSearch.Suggestion( id = id, title = name, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt index 70f9a361..8304dcc4 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt @@ -430,7 +430,7 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( // --- Раскладка ------------------------------------------------------------------------------ private fun renderProducts() { - catalog.products = loaded.map { it.toCardProduct(productActionText) } + catalog.products = loaded.map { it.toPersonalizationProduct(productActionText) } title.setResults(foundPrefix, total, foundSuffix) if (loaded.isEmpty()) catalog.setCount(null, 0, countSeparator, 0) else catalog.setCount(countPrefix, loaded.size, countSeparator, total) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt new file mode 100644 index 00000000..be128ecd --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt @@ -0,0 +1,47 @@ +package com.personalization.ui.widgets + +import com.personalization.api.responses.product.Product +import com.personalization.ui.components.PersonalizationProduct + +/** + * Товар ответа API → данные карточки кита. Один маппер на все виджеты с данными: товар + * одной формы приходит в поиске, категории, коллекции, `products`, `products/get` и + * рекомендациях (`recommends`). + * + * Строки берутся уже отформатированными сервером: + * - цена — `price_formatted`, иначе число с валютой; + * - старая цена — `oldprice_formatted`, только когда `oldprice` больше цены; + * - скидка — только вместе со старой ценой: `discount_formatted`, иначе `discount%`, + * со знаком «-»; + * - картинка — `picture` (уменьшенная копия), иначе оригинал `image_url`; + * - ссылка в приложение — `deeplink_android`, на сайт — `url`. + * + * Рейтинга в API нет, поэтому у карточки его нет тоже. + */ +internal fun Product.toPersonalizationProduct(actionText: CharSequence? = null): PersonalizationProduct { + // Gson кладёт null в поля без значения даже при non-null типе — читаем через nullable копии. + val productId: String? = id + val title: String? = name + val priceText: String? = priceFormatted + val currencyText: String? = currency + val pictureUrl: String? = picture + val originalUrl: String? = imageUrl + val brandName: String? = brand + val pageUrl: String? = url + val hasOldPrice = (oldPrice ?: 0.0) > price && !oldPriceFormatted.isNullOrEmpty() + val discountText = discountFormatted?.takeIf { it.isNotEmpty() && hasOldPrice } + ?: discount?.takeIf { it > 0 && hasOldPrice }?.let { "$it%" } + return PersonalizationProduct( + id = productId.orEmpty(), + name = title.orEmpty(), + price = priceText?.takeIf { it.isNotEmpty() } + ?: listOfNotNull(price.toString(), currencyText?.takeIf { it.isNotEmpty() }).joinToString(" "), + imageUrl = pictureUrl?.takeIf { it.isNotEmpty() } ?: originalUrl?.takeIf { it.isNotEmpty() }, + brand = brandName?.takeIf { it.isNotEmpty() }, + oldPrice = if (hasOldPrice) oldPriceFormatted else null, + discount = discountText?.let { if (it.startsWith("-")) it else "-$it" }, + actionText = actionText, + url = pageUrl?.takeIf { it.isNotEmpty() }, + deeplink = deeplinkAndroid?.takeIf { it.isNotEmpty() } + ) +} 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 95e3b19a..bd85a9ee 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 @@ -7,9 +7,7 @@ import android.widget.ImageView import androidx.core.view.doOnLayout import com.bumptech.glide.Glide import com.personalization.SDK -import com.personalization.api.responses.product.Product import com.personalization.ui.InternalPersonalizationUiApi -import com.personalization.ui.components.PersonalizationProduct import org.json.JSONArray /** @@ -102,29 +100,3 @@ internal object SearchImages { } } } - -/** - * Товар ответа поиска → данные карточки кита. Строки берутся уже отформатированными - * сервером (`price_formatted`, `oldprice_formatted`, `discount_formatted`); картинка — - * `picture` (уменьшенная копия), иначе оригинал. - */ -internal fun Product.toCardProduct(actionText: CharSequence?): PersonalizationProduct { - // Gson кладёт null в поля без значения даже при non-null типе — читаем через nullable копии. - val priceText: String? = priceFormatted - val pictureUrl: String? = picture - val originalUrl: String? = imageUrl - val brandName: String? = brand - val hasOldPrice = (oldPrice ?: 0.0) > price && !oldPriceFormatted.isNullOrEmpty() - val discountText = discountFormatted?.takeIf { it.isNotEmpty() && hasOldPrice } - ?: discount?.takeIf { it > 0 && hasOldPrice }?.let { "$it%" } - return PersonalizationProduct( - id = id, - name = name, - price = priceText?.takeIf { it.isNotEmpty() } ?: "$price $currency", - imageUrl = pictureUrl?.takeIf { it.isNotEmpty() } ?: originalUrl, - brand = brandName?.takeIf { it.isNotEmpty() }, - oldPrice = if (hasOldPrice) oldPriceFormatted else null, - discount = discountText?.let { if (it.startsWith("-")) it else "-$it" }, - actionText = actionText - ) -} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt new file mode 100644 index 00000000..3a9eb471 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt @@ -0,0 +1,82 @@ +package com.personalization.ui.widgets + +import com.google.gson.Gson +import com.personalization.Fixtures +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.recommendation.GetExtendedRecommendationResponse +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +/** One mapping from the API product to the kit card, shared by every data widget. */ +class ProductMappingTest { + + private val gson = Gson() + + private val recommended: List by lazy { + gson.fromJson(Fixtures.read("recommend_extended.json"), GetExtendedRecommendationResponse::class.java).products + } + + @Test + fun `a discounted product shows the old price, the discount and its links`() { + val card = recommended[0].toPersonalizationProduct(actionText = "Add to cart") + + assertEquals("164 990 ₽", card.price) + assertEquals("174 990 ₽", card.oldPrice) + assertEquals("-6%", card.discount) + assertEquals("Beko", card.brand) + assertEquals(recommended[0].picture, card.imageUrl) + assertEquals(recommended[0].url, card.url) + assertEquals("https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", card.deeplink) + assertEquals("Add to cart", card.actionText) + assertNull(card.ratingValue) + } + + @Test + fun `a product without a discount shows the price only`() { + val card = recommended[1].toPersonalizationProduct() + + assertEquals("15 990 ₽", card.price) + assertNull(card.oldPrice) + assertNull(card.discount) + assertNull(card.actionText) + } + + @Test + fun `an old price not above the price is not shown, and neither is the discount`() { + val card = product("""{"id":"1","name":"A","price":100,"oldprice":100,"oldprice_formatted":"100 ₽","discount":5}""") + .toPersonalizationProduct() + + assertNull(card.oldPrice) + assertNull(card.discount) + } + + @Test + fun `without a formatted discount the percent number is used`() { + val card = product("""{"id":"1","name":"A","price":90,"oldprice":100,"oldprice_formatted":"100 ₽","discount":10}""") + .toPersonalizationProduct() + + assertEquals("100 ₽", card.oldPrice) + assertEquals("-10%", card.discount) + } + + @Test + fun `without formatted strings the price is the number with the currency`() { + val card = product("""{"id":"1","name":"A","price":90.5,"currency":"₽"}""").toPersonalizationProduct() + + assertEquals("90.5 ₽", card.price) + } + + @Test + fun `without a picture the original image is used, and empty links are none`() { + val card = product("""{"id":"1","name":"A","price":1,"picture":"","image_url":"https://img/1.jpg","url":"","deeplink_android":""}""") + .toPersonalizationProduct() + + assertEquals("https://img/1.jpg", card.imageUrl) + assertNull(card.url) + assertNull(card.deeplink) + assertNull(card.brand) + } + + private fun product(json: String): Product = gson.fromJson(json, Product::class.java) +} From e9d7828d834410a0413fc262f1bdc5a5f3ec1913 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:01:28 +0400 Subject: [PATCH 07/65] feat(ui): showRating flag on the search results screen The API sends no rating, so the screen keeps it off by default and passes the flag down to the catalog and its cards; a card with the flag off hides the rating row even when the product has a rating. Presentational components keep showing a rating they are given. --- .../ui/components/PersonalizationCatalog.kt | 8 ++++++ .../PersonalizationProductsCarousel.kt | 10 ++++++- .../PersonalizationSearchResultsScreen.kt | 11 ++++++++ .../components/PersonalizationCatalogTest.kt | 28 +++++++++++++++++++ .../PersonalizationSearchResultsScreenTest.kt | 10 +++++++ 5 files changed, 66 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt index 733a738a..7431571f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt @@ -101,6 +101,13 @@ class PersonalizationCatalog @JvmOverloads constructor( productsAdapter.imageAspect = value } + /** Рисовать ли рейтинг на карточках; выключенный прячет его, даже если оценка есть. */ + var showRating: Boolean + get() = productsAdapter.showRating + set(value) { + productsAdapter.showRating = value + } + /** * Во фреймах с лоадером (296:3544, 299:6606) счётчика и кнопки нет — на время * загрузки лоадер встаёт на их место. @@ -184,6 +191,7 @@ class PersonalizationCatalog @JvmOverloads constructor( it.onAction = previous.onAction it.onClick = previous.onClick it.imageAspect = previous.imageAspect + it.showRating = previous.showRating } concat.removeAdapter(previous) concat.addAdapter(1, productsAdapter) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt index 85185d62..0d559057 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt @@ -132,6 +132,14 @@ internal class PersonalizationProductsAdapter( notifyDataSetChanged() } + /** Рисовать ли рейтинг товара; выключенный прячет ряд, даже если оценка есть. */ + var showRating: Boolean = true + set(value) { + if (field == value) return + field = value + notifyDataSetChanged() + } + class Holder(val card: PersonalizationProductCard) : RecyclerView.ViewHolder(card) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder { @@ -163,7 +171,7 @@ internal class PersonalizationProductsAdapter( oldPrice = product.oldPrice discount = product.discount actionText = product.actionText - setRating(product.ratingValue, product.reviews) + setRating(if (showRating) product.ratingValue else null, product.reviews) onAction = { this@PersonalizationProductsAdapter.onAction?.invoke(product) } onClick = this@PersonalizationProductsAdapter.onClick?.let { click -> { click(product) } } image.imageView.setImageDrawable(null) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt index 8304dcc4..4846e7e5 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt @@ -144,6 +144,16 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( title.selectedViewIndex = if (value == PersonalizationProductsGrid.View.GRID) 0 else 1 } + /** + * Рейтинг на карточках. Оценки в ответе API пока нет, поэтому по умолчанию выключен; + * включённый рисует её, когда она у товара есть. + */ + var showRating: Boolean = false + set(value) { + field = value + catalog.showRating = value + } + var imageAspect: PersonalizationProductImage.Aspect get() = catalog.imageAspect set(value) { @@ -244,6 +254,7 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( val background = PersonalizationTheme.color(context, R.color.personalization_background_generic) catalog.setHeader(title) + catalog.showRating = showRating catalog.setPadding(padding, padding, padding, padding) catalog.imageLoader = { imageView, product -> loadImage(imageView, product.imageUrl) } catalog.onProductClick = { card -> loaded.firstOrNull { it.id == card.id }?.let { productTapped(it) } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt index 9b347fdc..5b560e9f 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt @@ -109,6 +109,34 @@ class PersonalizationCatalogTest { assertFalse(catalog.canScrollVertically(1)) } + @Test + fun `cards draw the rating unless it is switched off`() { + val rated = (0 until 4).map { PersonalizationProduct(id = "$it", name = "Item $it", price = "$it", ratingValue = "4,5", reviews = 10) } + val catalog = PersonalizationCatalog(context).apply { products = rated } + layOut(catalog) + assertTrue(descendants(catalog).any { it.visibility == View.VISIBLE }) + + catalog.showRating = false + layOut(catalog) + + assertTrue(descendants(catalog).none { it.visibility == View.VISIBLE }) + } + + @Test + fun `switching to the list keeps the rating switched off`() { + val rated = (0 until 4).map { PersonalizationProduct(id = "$it", name = "Item $it", price = "$it", ratingValue = "4,5", reviews = 10) } + val catalog = PersonalizationCatalog(context).apply { + products = rated + showRating = false + } + + catalog.view = PersonalizationProductsGrid.View.LIST + layOut(catalog) + + assertFalse(catalog.showRating) + assertTrue(descendants(catalog).none { it.visibility == View.VISIBLE }) + } + private fun layOut(view: View) { view.measure( View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY), diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt index e640a8fa..127865c0 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt @@ -139,6 +139,16 @@ class PersonalizationSearchResultsScreenTest { verify(exactly = 2) { search.searchFull(any(), any(), any(), any()) } } + @Test + fun `the rating is off unless the host switches it on`() { + assertFalse(screen.showRating) + assertFalse(screen.catalog.showRating) + + screen.showRating = true + + assertTrue(screen.catalog.showRating) + } + private fun idle() = shadowOf(Looper.getMainLooper()).idle() private fun layOut(view: View) { From 21875220d4a961f53d7c265dbbbc6bd6f960439f Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:02:33 +0400 Subject: [PATCH 08/65] feat(ui): in-process response cache for data widgets Keyed by shop, request kind and parameters; answers live 10 minutes, at most 32 are kept and the oldest go first. Identical requests in flight share one call, errors are not kept. Nothing uses it yet. --- .../ui/widgets/ResponseCache.kt | 115 ++++++++++++++++++ .../ui/widgets/ResponseCacheTest.kt | 115 ++++++++++++++++++ 2 files changed, 230 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt new file mode 100644 index 00000000..b1144b1c --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt @@ -0,0 +1,115 @@ +package com.personalization.ui.widgets + +import android.os.SystemClock +import com.personalization.Cancellable + +/** + * Кэш ответов для виджетов с данными — в памяти процесса. + * + * Ключ — магазин, вид запроса и его параметры ([Key]). Ответ живёт [ttlMillis] (10 минут), + * записей не больше [capacity] (32): при переполнении уходят самые старые. Одинаковые + * запросы, пока первый в полёте, в сеть второй раз не идут — все ждут его ответа. + * Ошибки не кэшируются: следующий такой же запрос снова идёт в сеть. + * + * Колбэки зовутся там, где пришёл ответ: из кэша — сразу, на потоке вызова, из сети — + * на её потоке. На главный поток перекладывает виджет. + */ +internal class ResponseCache( + private val ttlMillis: Long = TTL_MILLIS, + private val capacity: Int = CAPACITY, + private val clock: () -> Long = { SystemClock.elapsedRealtime() } +) { + + /** [kind] — вид запроса (`recommendation`, `category`…), [params] — всё, от чего зависит ответ. */ + data class Key(val shopId: String, val kind: String, val params: Map = emptyMap()) + + private class Entry(val value: Any, val storedAt: Long) + + private class Waiter(val onSuccess: (Any) -> Unit, val onError: (Int, String?) -> Unit) + + private val lock = Any() + + // Порядок записи: первая — самая старая, её и вытесняем. + private val entries = LinkedHashMap() + private val inFlight = HashMap>() + + /** + * Ответ по [key]: свежий из кэша, ожидание уже идущего запроса или новый запрос [load]. + * + * Ручка отписывает колбэки этого вызова; сам запрос при этом доходит до конца, и его + * ответ попадает в кэш — он пригодится следующему показу. + */ + fun get( + key: Key, + load: (onSuccess: (T) -> Unit, onError: (Int, String?) -> Unit) -> Unit, + onSuccess: (T) -> Unit, + onError: (Int, String?) -> Unit + ): Cancellable { + @Suppress("UNCHECKED_CAST") + val waiter = Waiter({ onSuccess(it as T) }, onError) + var cached: Any? = null + var start = false + synchronized(lock) { + cached = fresh(key) + if (cached == null) { + val waiting = inFlight[key] + if (waiting != null) { + waiting += waiter + } else { + inFlight[key] = mutableListOf(waiter) + start = true + } + } + } + cached?.let { + waiter.onSuccess(it) + return Cancellable.NOOP + } + if (start) { + try { + load({ value -> succeed(key, value) }, { code, message -> fail(key, code, message) }) + } catch (throwable: Throwable) { + fail(key, ERROR_CODE, throwable.message) + } + } + return Cancellable { synchronized(lock) { inFlight[key]?.remove(waiter) } } + } + + /** Забыть все ответы; запросы в полёте доходят как обычно. */ + fun clear() { + synchronized(lock) { entries.clear() } + } + + private fun fresh(key: Key): Any? { + val entry = entries[key] ?: return null + if (clock() - entry.storedAt < ttlMillis) return entry.value + entries.remove(key) + return null + } + + private fun succeed(key: Key, value: Any) { + val waiters = synchronized(lock) { + entries.remove(key) + entries[key] = Entry(value, clock()) + while (entries.size > capacity) entries.remove(entries.keys.first()) + inFlight.remove(key).orEmpty() + } + waiters.forEach { it.onSuccess(value) } + } + + private fun fail(key: Key, code: Int, message: String?) { + val waiters = synchronized(lock) { inFlight.remove(key).orEmpty() } + waiters.forEach { it.onError(code, message) } + } + + companion object { + const val TTL_MILLIS = 10 * 60 * 1000L + const val CAPACITY = 32 + + /** Запрос упал, не дойдя до сети. */ + const val ERROR_CODE = -1 + + /** Общий кэш процесса для всех виджетов. */ + val shared = ResponseCache() + } +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt new file mode 100644 index 00000000..a3759125 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt @@ -0,0 +1,115 @@ +package com.personalization.ui.widgets + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +/** The in-process cache of widget responses: lifetime, size, shared requests and errors. */ +class ResponseCacheTest { + + private var now = 0L + private val cache = ResponseCache(ttlMillis = 1_000, capacity = 3, clock = { now }) + private val loads = mutableListOf Unit, (Int, String?) -> Unit>>() + private val results = mutableListOf() + private val errors = mutableListOf() + + @Test + fun `a repeated request within the lifetime is served from memory`() { + request(key("a")) + loads.last().first("first") + + request(key("a")) + + assertEquals(1, loads.size) + assertEquals(listOf("first", "first"), results) + } + + @Test + fun `an answer older than the lifetime is fetched again`() { + request(key("a")) + loads.last().first("first") + + now += 1_000 + request(key("a")) + + assertEquals(2, loads.size) + } + + @Test + fun `shop, kind and parameters all make the key`() { + request(key("a")) + loads.last().first("a") + + request(ResponseCache.Key("other-shop", "recommendation", mapOf("code" to "a"))) + request(ResponseCache.Key("shop", "category", mapOf("code" to "a"))) + request(key("b")) + + assertEquals(4, loads.size) + } + + @Test + fun `beyond the capacity the oldest answer goes`() { + listOf("a", "b", "c", "d").forEach { code -> + request(key(code)) + loads.last().first(code) + } + + request(key("b")) + assertEquals(4, loads.size) + request(key("a")) + assertEquals(5, loads.size) + } + + @Test + fun `identical requests in flight share one call`() { + request(key("a")) + request(key("a")) + + assertEquals(1, loads.size) + loads.single().first("shared") + + assertEquals(listOf("shared", "shared"), results) + } + + @Test + fun `errors reach every waiter and are not kept`() { + request(key("a")) + request(key("a")) + loads.single().second(500, "server error") + + assertEquals(listOf(500, 500), errors) + + request(key("a")) + assertEquals(2, loads.size) + } + + @Test + fun `a cancelled waiter hears nothing, but the answer is still kept`() { + val handle = request(key("a")) + handle.cancel() + loads.single().first("late") + + assertTrue(results.isEmpty()) + request(key("a")) + assertEquals(listOf("late"), results) + assertEquals(1, loads.size) + } + + @Test + fun `a request that throws is an error and does not block the next one`() { + cache.get(key("a"), { _, _ -> throw IllegalStateException("boom") }, { results += it }, { code, _ -> errors += code }) + + assertEquals(listOf(ResponseCache.ERROR_CODE), errors) + request(key("a")) + assertEquals(1, loads.size) + } + + private fun key(code: String) = ResponseCache.Key("shop", "recommendation", mapOf("code" to code)) + + private fun request(key: ResponseCache.Key) = cache.get( + key, + load = { onSuccess, onError -> loads += onSuccess to onError }, + onSuccess = { results += it }, + onError = { code, _ -> errors += code } + ) +} From a51dc6a5ab1ca55e41b14f8b0d94dc28b6445fe2 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:03:23 +0400 Subject: [PATCH 09/65] feat(ui): loading state for data widgets Idle, Loading, Content, Empty and Error, driven by a controller that runs a request, retries the last one and drops answers of a request already replaced. Not wired to a widget yet. --- .../personalization/ui/widgets/LoadState.kt | 78 +++++++++++++++++++ .../ui/widgets/LoadStateTest.kt | 72 +++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt new file mode 100644 index 00000000..dfb61b50 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt @@ -0,0 +1,78 @@ +package com.personalization.ui.widgets + +/** Ошибка запроса виджета: код и текст из колбэка SDK. */ +internal data class LoadError(val code: Int, val message: String?) + +/** + * Состояние загрузки виджета с данными: ещё не грузили, грузим, есть данные, сервер + * ответил пусто, запрос упал. Пустой ответ — отдельное состояние, а не [Content] с пустым + * списком: виджет показывает на нём пустое состояние или прячется. + */ +internal sealed class LoadState { + object Idle : LoadState() + object Loading : LoadState() + data class Content(val data: T) : LoadState() + object Empty : LoadState() + data class Error(val error: LoadError) : LoadState() +} + +/** + * Ведёт [LoadState] одного запроса: [load] запускает его, [retry] повторяет последний, + * [reset] возвращает в [LoadState.Idle]. + * + * Ответ запроса, который уже сменился следующим (или сброшен), отбрасывается — состояние + * всегда про последний запрос. Пустой по [isEmpty] ответ — [LoadState.Empty]. + * Колбэки запроса приходят с любого потока; новое состояние [onChange] получает через + * [post] — по умолчанию на главном потоке. + */ +internal class LoadController( + private val isEmpty: (T) -> Boolean = { false }, + private val post: (() -> Unit) -> Unit = MainThread::run, + private val onChange: (LoadState) -> Unit +) { + + var state: LoadState = LoadState.Idle + private set + + private var request: LoadRequest? = null + private var sequence = 0 + + /** Запустить [request] вместо прежнего. */ + fun load(request: LoadRequest) { + this.request = request + start(request) + } + + /** Повторить последний запрос, например по кнопке на ошибке. Без запроса — ничего. */ + fun retry() { + request?.let(::start) + } + + /** Забыть запрос; его поздний ответ отбросится. */ + fun reset() { + sequence++ + request = null + set(LoadState.Idle) + } + + private fun start(request: LoadRequest) { + val current = ++sequence + set(LoadState.Loading) + request( + { data -> + post { if (current == sequence) set(if (isEmpty(data)) LoadState.Empty else LoadState.Content(data)) } + }, + { code, message -> + post { if (current == sequence) set(LoadState.Error(LoadError(code, message))) } + } + ) + } + + private fun set(next: LoadState) { + state = next + onChange(next) + } +} + +/** Запрос данных в форме колбэков SDK. */ +internal typealias LoadRequest = (onSuccess: (T) -> Unit, onError: (Int, String?) -> Unit) -> Unit diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt new file mode 100644 index 00000000..f4ec607b --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt @@ -0,0 +1,72 @@ +package com.personalization.ui.widgets + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** The loading state of a data widget follows its latest request, and an error can be retried. */ +class LoadStateTest { + + private val states = mutableListOf>>() + private val calls = mutableListOf) -> Unit, (Int, String?) -> Unit>>() + private val controller = LoadController>( + isEmpty = { it.isEmpty() }, + post = { it() }, + onChange = { states += it } + ) + private val request: LoadRequest> = { onSuccess, onError -> calls += onSuccess to onError } + + @Test + fun `it starts idle`() { + assertEquals(LoadState.Idle, controller.state) + } + + @Test + fun `an answer with data is content`() { + controller.load(request) + calls.last().first(listOf("a")) + + assertEquals(listOf(LoadState.Loading, LoadState.Content(listOf("a"))), states) + } + + @Test + fun `an empty answer is empty`() { + controller.load(request) + calls.last().first(emptyList()) + + assertEquals(LoadState.Empty, controller.state) + } + + @Test + fun `a failed request is an error, and retry repeats it`() { + controller.load(request) + calls.last().second(500, "server error") + assertEquals(LoadState.Error(LoadError(500, "server error")), controller.state) + + controller.retry() + calls.last().first(listOf("a")) + + assertEquals(2, calls.size) + assertEquals(LoadState.Content(listOf("a")), controller.state) + } + + @Test + fun `a late answer of a replaced request is dropped`() { + controller.load(request) + controller.load(request) + calls[1].first(listOf("new")) + calls[0].first(listOf("old")) + + assertEquals(LoadState.Content(listOf("new")), controller.state) + } + + @Test + fun `reset goes back to idle and drops the answer in flight`() { + controller.load(request) + controller.reset() + calls.last().first(listOf("late")) + + assertEquals(LoadState.Idle, controller.state) + controller.retry() + assertEquals(1, calls.size) + } +} From be6845d449e9ad85546dc722fe5d1c9439c812ec Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:06:31 +0400 Subject: [PATCH 10/65] feat(ui): search results show request errors with a retry A first page that fails no longer leaves an empty screen: the catalog shows errorText with a retryText button, built from the kit empty state and button, and the tap asks for the first page again. A next page that fails turns load more into a retry of that page and stops infinite scroll from asking for it on every gesture. onError is called as before; both texts are parameters like the other texts of the screen. --- .../ui/components/PersonalizationCatalog.kt | 50 ++++++++++- .../PersonalizationSearchResultsScreen.kt | 47 +++++++++- .../components/PersonalizationCatalogTest.kt | 22 +++++ .../PersonalizationSearchResultsScreenTest.kt | 87 +++++++++++++++++++ 4 files changed, 203 insertions(+), 3 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt index 7431571f..05d13860 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt @@ -8,6 +8,8 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.isVisible import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -29,6 +31,10 @@ import com.personalization.ui.InternalPersonalizationUiApi * заголовок тот же, вместо плитки [PersonalizationEmptyState]. Показывается, когда * задан [emptyText] и товаров нет. * + * Ошибка загрузки в макете не нарисована: на её месте тот же [PersonalizationEmptyState] + * с текстом [errorText] и под ним кнопка повтора [retryText] в виде «загрузить ещё». + * Показывается вместо пустого состояния, когда задан [errorText] и товаров нет. + * * Весь каталог — одна лента [RecyclerView]: заголовок, карточки и нижние элементы — * её строки. Поэтому его не вкладывают в прокрутку, он прокручивается сам: карточки * создаются только под видимую часть и переиспользуются, сколько бы страниц ни @@ -46,6 +52,9 @@ class PersonalizationCatalog @JvmOverloads constructor( private val loader = PersonalizationLoader(context) private val count = PersonalizationCount(context) private val loadMoreButton = PersonalizationButton(context) + private val errorState = PersonalizationEmptyState(context) + private val retryButton = PersonalizationButton(context) + private val errorView = LinearLayout(context) private val header = SlotsAdapter() private var productsAdapter = PersonalizationProductsAdapter(PersonalizationProductCard.Type.GRID) @@ -75,6 +84,25 @@ class PersonalizationCatalog @JvmOverloads constructor( applySlots() } + /** Текст ошибки загрузки. `null` — без ошибки; при товарах не показывается. */ + var errorText: CharSequence? = null + set(value) { + field = value + errorState.text = value + applySlots() + } + + /** Подпись кнопки повтора под ошибкой. `null` — без кнопки. */ + var retryText: CharSequence? = null + set(value) { + field = value + retryButton.text = value + retryButton.isVisible = !value.isNullOrEmpty() + } + + /** Нажатие на кнопку повтора под ошибкой. */ + var onRetry: (() -> Unit)? = null + var imageLoader: ((ImageView, PersonalizationProduct) -> Unit)? get() = productsAdapter.imageLoader set(value) { @@ -150,6 +178,22 @@ class PersonalizationCatalog @JvmOverloads constructor( loadMoreButton.iconStart = R.drawable.personalization_ic_arrow_rotate_cw loadMoreButton.setOnClickListener { onLoadMore?.invoke() } + // Текст ошибки — с отступом пустого состояния сверху, кнопка под ним, тот же отступ снизу. + errorState.setPadding( + errorState.paddingLeft, errorState.paddingTop, errorState.paddingRight, + resources.getDimensionPixelSize(R.dimen.personalization_spacing_xl) + ) + retryButton.size = PersonalizationButton.Size.MD + retryButton.buttonView = PersonalizationButton.ButtonView.SECONDARY + retryButton.iconStart = R.drawable.personalization_ic_arrow_rotate_cw + retryButton.isVisible = false + retryButton.setOnClickListener { onRetry?.invoke() } + errorView.orientation = LinearLayout.VERTICAL + errorView.gravity = Gravity.CENTER_HORIZONTAL + errorView.setPadding(0, 0, 0, errorState.paddingTop) + errorView.addView(errorState, LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + errorView.addView(retryButton, LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)) + applySlots() } @@ -167,8 +211,11 @@ class PersonalizationCatalog @JvmOverloads constructor( } private fun applySlots() { - val empty = productsAdapter.items.isEmpty() && !emptyText.isNullOrEmpty() + val noProducts = productsAdapter.items.isEmpty() + val failed = noProducts && !errorText.isNullOrEmpty() + val empty = noProducts && !failed && !emptyText.isNullOrEmpty() footer.slots = buildList { + if (failed) add(Slot(TYPE_ERROR, errorView)) if (empty) add(Slot(TYPE_EMPTY, emptyState)) // Лоадер в макете — по центру строки; на всю ширину он бы прижал кольцо к левому краю. if (isLoading) add(Slot(TYPE_LOADER, loader, centered = true)) @@ -285,5 +332,6 @@ class PersonalizationCatalog @JvmOverloads constructor( const val TYPE_LOADER = 3 const val TYPE_COUNT = 4 const val TYPE_LOAD_MORE = 5 + const val TYPE_ERROR = 6 } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt index 4846e7e5..c86860ee 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt @@ -51,6 +51,11 @@ import java.util.Locale * нарисован), выбранное хост кладёт в [sortBy] / [sortDir]. Каждый новый запрос * трекается событием `search`; нажатие на карточку запоминает источник `full_search` * и отдаёт товар хосту через [onProductClick], кнопка карточки — через [onProductAction]. + * + * Ошибка запроса уходит хосту в [onError] и видна на экране. Не загрузилась первая + * страница — вместо пустой выдачи текст [errorText] с кнопкой [retryText], которая + * повторяет запрос. Не загрузилась следующая — кнопка «загрузить ещё» становится + * кнопкой повтора этой страницы, и бесконечная прокрутка сама её больше не просит. */ @InternalPersonalizationUiApi class PersonalizationSearchResultsScreen @JvmOverloads constructor( @@ -189,6 +194,17 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( field = value applyEmpty() } + var errorText: CharSequence? = "Something went wrong. Check your connection and try again." + set(value) { + field = value + applyEmpty() + } + var retryText: CharSequence? = "Retry" + set(value) { + field = value + catalog.retryText = value + applyLoadMore() + } var filtersTitle: CharSequence? = "Filters" var resetText: CharSequence? = "Reset" var applyText: CharSequence? = "Apply" @@ -233,6 +249,9 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( private var total = 0 private var page = 0 private var loading = false + + // Упал запрос страницы page + 1: первой, если товаров нет, иначе следующей. + private var failed = false private var facetSource: SearchFullResponse? = null private var requestSeq = 0 @@ -260,6 +279,8 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( catalog.onProductClick = { card -> loaded.firstOrNull { it.id == card.id }?.let { productTapped(it) } } catalog.onProductAction = { card -> loaded.firstOrNull { it.id == card.id }?.let { onProductAction?.invoke(it) } } catalog.onLoadMore = { loadMore() } + catalog.retryText = retryText + catalog.onRetry = { retry() } // Каталог прокручивается сам, а не во внешнем скролле: там его лента раскладывалась бы // целиком, и каждая догруженная страница оставалась бы в памяти всеми карточками. catalog.setBackgroundColor(background) @@ -268,7 +289,8 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( // Следующая страница — за полэкрана до конца ленты. val left = recyclerView.computeVerticalScrollRange() - recyclerView.computeVerticalScrollOffset() - recyclerView.computeVerticalScrollExtent() - if (infiniteScroll && dy > 0 && left <= recyclerView.height / 2) loadMore() + // После ошибки страницу повторяет только кнопка, иначе каждый жест слал бы запрос заново. + if (infiniteScroll && !failed && dy > 0 && left <= recyclerView.height / 2) loadMore() } }) addView(catalog, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)) @@ -365,6 +387,7 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( requestSeq++ loading = false catalog.isLoading = false + failed = false answered = false loaded = emptyList() total = 0 @@ -385,10 +408,21 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( request(sdk, text, nextPage = page + 1) } + /** Повторить упавший запрос: первую страницу или следующую. */ + fun retry() { + val sdk = sdk ?: return + val text = query?.trim().orEmpty() + if (text.isEmpty() || loading || !failed) return + request(sdk, text, nextPage = page + 1) + } + private fun request(sdk: SDK, text: String, nextPage: Int) { val seq = ++requestSeq loading = true + failed = false catalog.isLoading = true + applyLoadMore() + applyEmpty() sdk.searchManager.searchFull( query = text, searchParams = buildParams(nextPage), @@ -412,7 +446,10 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( MainThread.run { if (seq != requestSeq) return@run loading = false + failed = true catalog.isLoading = false + applyLoadMore() + applyEmpty() onError?.invoke(code, message) } } @@ -452,11 +489,17 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( private fun applyEmpty() { catalog.emptyText = if (answered && loaded.isEmpty()) emptyText else null + catalog.errorText = if (failed && loaded.isEmpty()) errorText else null } private fun applyLoadMore() { val hasMore = loaded.isNotEmpty() && loaded.size < total - catalog.loadMoreText = if (hasMore && !infiniteScroll) loadMoreText else null + catalog.loadMoreText = when { + !hasMore -> null + failed -> retryText ?: loadMoreText + infiniteScroll -> null + else -> loadMoreText + } } private fun renderAppliedTags() { diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt index 5b560e9f..41f0d5e8 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt @@ -79,6 +79,28 @@ class PersonalizationCatalogTest { assertTrue(header.isAttachedToWindow || header.parent != null) } + @Test + fun `an error replaces the empty state and its button retries`() { + var retries = 0 + val catalog = PersonalizationCatalog(context).apply { + emptyText = "Nothing found" + errorText = "Something went wrong" + retryText = "Retry" + onRetry = { retries++ } + } + layOut(catalog) + + assertEquals(listOf("Something went wrong"), descendants(catalog).map { it.text.toString() }) + descendants(catalog).single { it.text == "Retry" }.performClick() + assertEquals(1, retries) + + catalog.products = products(2) + layOut(catalog) + + assertTrue(descendants(catalog).isEmpty()) + assertTrue(descendants(catalog).none { it.text == "Retry" }) + } + @Test fun `switching to the list keeps the products`() { val catalog = PersonalizationCatalog(context).apply { products = products(6) } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt index 127865c0..d2c8e659 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt @@ -8,8 +8,11 @@ import androidx.test.core.app.ApplicationProvider import com.personalization.SDK import com.personalization.api.managers.SearchManager import com.personalization.api.managers.TrackingApi +import com.personalization.api.params.SearchParams import com.personalization.api.responses.product.Product import com.personalization.api.responses.search.SearchFullResponse +import com.personalization.ui.components.PersonalizationButton +import com.personalization.ui.components.PersonalizationEmptyState import com.personalization.ui.components.PersonalizationProductCard import io.mockk.Runs import io.mockk.every @@ -40,13 +43,17 @@ class PersonalizationSearchResultsScreenTest { private lateinit var tracking: TrackingApi private lateinit var screen: PersonalizationSearchResultsScreen private val answers = mutableListOf<(SearchFullResponse) -> Unit>() + private val failures = mutableListOf<(Int, String?) -> Unit>() + private val pages = mutableListOf() @Before fun setUp() { search = mockk(relaxed = true) tracking = mockk(relaxed = true) every { search.searchFull(any(), any(), any(), any()) } answers { + pages += secondArg().build().getInt("page") answers += thirdArg<(SearchFullResponse) -> Unit>() + failures += arg<(Int, String?) -> Unit>(3) } val sdk = mockk(relaxed = true) every { sdk.searchManager } returns search @@ -149,6 +156,86 @@ class PersonalizationSearchResultsScreenTest { assertTrue(screen.catalog.showRating) } + @Test + fun `a first page that fails shows the error and a retry instead of nothing`() { + val errors = mutableListOf() + screen.onError = { code, _ -> errors += code } + screen.query = "jacket" + idle() + + failures.last()(500, "server error") + layOut(screen) + + assertEquals(listOf(500), errors) + assertFalse(screen.catalog.isLoading) + assertNull(screen.catalog.emptyText) + assertEquals(screen.errorText, screen.catalog.errorText) + assertTrue(descendants(screen).any { it.text == screen.errorText }) + + retryButton().performClick() + + assertEquals(listOf(1, 1), pages) + assertNull(screen.catalog.errorText) + assertTrue(screen.catalog.isLoading) + verify(exactly = 1) { tracking.search("jacket", any(), any()) } + answers.last()(response(total = 40, page = 0)) + assertEquals(20, screen.products.size) + } + + @Test + fun `a next page that fails turns load more into a retry of that page`() { + screen.query = "jacket" + idle() + answers.last()(response(total = 60, page = 0)) + screen.loadMore() + + failures.last()(500, null) + layOut(screen) + + assertFalse(screen.catalog.isLoading) + assertNull(screen.catalog.errorText) + assertEquals(screen.retryText, screen.catalog.loadMoreText) + assertEquals(20, screen.products.size) + + screen.catalog.scrollToPosition(screen.catalog.adapter!!.itemCount - 1) + layOut(screen) + retryButton().performClick() + + assertEquals(listOf(1, 2, 2), pages) + answers.last()(response(total = 60, page = 1)) + assertEquals(40, screen.products.size) + assertEquals(screen.loadMoreText, screen.catalog.loadMoreText) + } + + @Test + fun `after a failed page infinite scroll waits for the retry button`() { + screen.infiniteScroll = true + screen.query = "jacket" + idle() + answers.last()(response(total = 200, page = 0)) + layOut(screen) + screen.catalog.scrollBy(0, 20_000) + failures.last()(500, null) + layOut(screen) + + screen.catalog.scrollBy(0, -2_000) + screen.catalog.scrollBy(0, 20_000) + + assertEquals(listOf(1, 2), pages) + assertEquals(screen.retryText, screen.catalog.loadMoreText) + } + + private fun retryButton(): PersonalizationButton = + descendants(screen).single { it.text == screen.retryText } + + private inline fun descendants(root: View): List = collect(root, T::class.java) + + private fun collect(root: View, type: Class): List = when { + type.isInstance(root) -> listOf(type.cast(root)!!) + root is ViewGroup -> (0 until root.childCount).flatMap { collect(root.getChildAt(it), type) } + else -> emptyList() + } + private fun idle() = shadowOf(Looper.getMainLooper()).idle() private fun layOut(view: View) { From 8d7c2eecaf021925e03253b8ce5ada574d131638 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 12:08:52 +0400 Subject: [PATCH 11/65] fix(ui): the rating flag rebinds the cards in place A range change instead of a full data set change: the cards stay the same, only their rating row follows the flag. --- .../ui/components/PersonalizationProductsCarousel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt index 0d559057..ed8337f0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt @@ -137,7 +137,8 @@ internal class PersonalizationProductsAdapter( set(value) { if (field == value) return field = value - notifyDataSetChanged() + // Набор карточек тот же — перепривязываются только они, без пересборки списка. + notifyItemRangeChanged(0, itemCount) } class Holder(val card: PersonalizationProductCard) : RecyclerView.ViewHolder(card) From 551aa0ece29f8da6c98e7fabeb8aa186d05bfc6b Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:17:11 +0400 Subject: [PATCH 12/65] fix(ui): discount badge only for a positive discount number The badge needs the old price and a positive discount, or else discount_percent; zero, booleans and junk show none. Its text is discount_formatted when it belongs to that number, otherwise number and percent sign, with exactly one leading minus, so -0% and -true% are gone. --- .../ui/widgets/ProductMapping.kt | 19 ++++++--- .../ui/widgets/ProductMappingTest.kt | 40 +++++++++++++++++++ 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt index be128ecd..0272d1af 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt @@ -11,8 +11,9 @@ import com.personalization.ui.components.PersonalizationProduct * Строки берутся уже отформатированными сервером: * - цена — `price_formatted`, иначе число с валютой; * - старая цена — `oldprice_formatted`, только когда `oldprice` больше цены; - * - скидка — только вместе со старой ценой: `discount_formatted`, иначе `discount%`, - * со знаком «-»; + * - скидка — только вместе со старой ценой и только при положительном числе скидки + * (`discount`, иначе `discount_percent`): текст `discount_formatted`, иначе «число%», + * ровно с одним «-» впереди. Ноль, `true`/`false` и мусор — без бейджа, «-0%» не бывает; * - картинка — `picture` (уменьшенная копия), иначе оригинал `image_url`; * - ссылка в приложение — `deeplink_android`, на сайт — `url`. * @@ -29,8 +30,16 @@ internal fun Product.toPersonalizationProduct(actionText: CharSequence? = null): val brandName: String? = brand val pageUrl: String? = url val hasOldPrice = (oldPrice ?: 0.0) > price && !oldPriceFormatted.isNullOrEmpty() - val discountText = discountFormatted?.takeIf { it.isNotEmpty() && hasOldPrice } - ?: discount?.takeIf { it > 0 && hasOldPrice }?.let { "$it%" } + // Числа скидки уже прочитаны терпимо: булево и мусор в ответе — null. + // `discount_formatted` — запись именно `discount`: при нулевом `discount` и числе из + // `discount_percent` там «0%», поэтому текст тогда собирается из процента. + val ownDiscount = discount?.takeIf { it > 0 } + val discountNumber = (ownDiscount ?: discountPercent?.takeIf { it > 0 })?.takeIf { hasOldPrice } + val discountText = discountNumber?.let { number -> + val formatted = discountFormatted?.takeIf { ownDiscount != null } + ?.trimStart { it == '-' || it.isWhitespace() } + "-" + (formatted?.takeIf { it.isNotEmpty() } ?: "$number%") + } return PersonalizationProduct( id = productId.orEmpty(), name = title.orEmpty(), @@ -39,7 +48,7 @@ internal fun Product.toPersonalizationProduct(actionText: CharSequence? = null): imageUrl = pictureUrl?.takeIf { it.isNotEmpty() } ?: originalUrl?.takeIf { it.isNotEmpty() }, brand = brandName?.takeIf { it.isNotEmpty() }, oldPrice = if (hasOldPrice) oldPriceFormatted else null, - discount = discountText?.let { if (it.startsWith("-")) it else "-$it" }, + discount = discountText, actionText = actionText, url = pageUrl?.takeIf { it.isNotEmpty() }, deeplink = deeplinkAndroid?.takeIf { it.isNotEmpty() } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt index 3a9eb471..37a9870f 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt @@ -60,6 +60,42 @@ class ProductMappingTest { assertEquals("-10%", card.discount) } + @Test + fun `a zero discount shows no badge, whatever its formatted text says`() { + val card = discounted(""""discount":0,"discount_formatted":"0%"""").toPersonalizationProduct() + + assertEquals("100 ₽", card.oldPrice) + assertNull(card.discount) + } + + @Test + fun `a boolean discount shows no badge`() { + val card = discounted(""""discount":true,"discount_formatted":"10%"""").toPersonalizationProduct() + + assertNull(card.discount) + } + + @Test + fun `without a discount the percent is used`() { + val card = discounted(""""discount_percent":"7"""").toPersonalizationProduct() + + assertEquals("-7%", card.discount) + } + + @Test + fun `a zero discount with a percent never reads minus zero`() { + val card = discounted(""""discount":0,"discount_formatted":"0%","discount_percent":5""").toPersonalizationProduct() + + assertEquals("-5%", card.discount) + } + + @Test + fun `a formatted discount that already has a minus keeps exactly one`() { + val card = discounted(""""discount":10,"discount_formatted":"-10%"""").toPersonalizationProduct() + + assertEquals("-10%", card.discount) + } + @Test fun `without formatted strings the price is the number with the currency`() { val card = product("""{"id":"1","name":"A","price":90.5,"currency":"₽"}""").toPersonalizationProduct() @@ -79,4 +115,8 @@ class ProductMappingTest { } private fun product(json: String): Product = gson.fromJson(json, Product::class.java) + + /** A product with an old price above the price, plus the given discount fields. */ + private fun discounted(fields: String): Product = + product("""{"id":"1","name":"A","price":90,"oldprice":100,"oldprice_formatted":"100 ₽",$fields}""") } From ec67768e08b95d11cdbf6a28b6ed4e26fc7dd622 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:18:31 +0400 Subject: [PATCH 13/65] fix(ui): a request in flight can no longer hold a cache key forever A request older than 30 seconds takes no new waiters and a new generation loads instead; the last waiter leaving and clear() free the key at once. An answer of an older generation, or one started before clear(), reaches its own waiters but is not kept. A forced load skips the kept answer and the running request, for Retry. A throwing waiter no longer keeps the answer from the others, a cancelled one is never called, and the key copies its parameters. --- .../ui/widgets/ResponseCache.kt | 140 ++++++++++++++---- .../ui/widgets/ResponseCacheTest.kt | 111 +++++++++++++- 2 files changed, 217 insertions(+), 34 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt index b1144b1c..7d4dafdd 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ResponseCache.kt @@ -11,73 +11,123 @@ import com.personalization.Cancellable * запросы, пока первый в полёте, в сеть второй раз не идут — все ждут его ответа. * Ошибки не кэшируются: следующий такой же запрос снова идёт в сеть. * + * Запрос в полёте не может навсегда занять ключ. Старше [flightTimeoutMillis] (30 секунд) + * он новых ожидающих не принимает — стартует новая загрузка, новое поколение; отписка + * последнего ожидающего и [clear] снимают его сразу. Ответ старого поколения доходит + * только до своих ожидающих и в кэш не идёт, если после его старта была новая загрузка + * того же ключа или [clear]. + * * Колбэки зовутся там, где пришёл ответ: из кэша — сразу, на потоке вызова, из сети — * на её потоке. На главный поток перекладывает виджет. */ internal class ResponseCache( private val ttlMillis: Long = TTL_MILLIS, private val capacity: Int = CAPACITY, + private val flightTimeoutMillis: Long = FLIGHT_TIMEOUT_MILLIS, private val clock: () -> Long = { SystemClock.elapsedRealtime() } ) { - /** [kind] — вид запроса (`recommendation`, `category`…), [params] — всё, от чего зависит ответ. */ - data class Key(val shopId: String, val kind: String, val params: Map = emptyMap()) + /** + * [kind] — вид запроса (`recommendation`, `category`…), [params] — всё, от чего зависит + * ответ. Параметры копируются: менять переданную карту после создания ключа безопасно. + */ + class Key(val shopId: String, val kind: String, params: Map = emptyMap()) { + val params: Map = params.toMap() - private class Entry(val value: Any, val storedAt: Long) + override fun equals(other: Any?): Boolean = + other is Key && other.shopId == shopId && other.kind == kind && other.params == params - private class Waiter(val onSuccess: (Any) -> Unit, val onError: (Int, String?) -> Unit) + override fun hashCode(): Int = (shopId.hashCode() * 31 + kind.hashCode()) * 31 + params.hashCode() + + override fun toString(): String = "Key($shopId, $kind, $params)" + } + + private class Entry(val value: Any, val storedAt: Long, val generation: Long) + + private class Waiter(val onSuccess: (Any) -> Unit, val onError: (Int, String?) -> Unit) { + // Отписанный ожидающий не зовётся, даже если ответ уже раздаётся. + @Volatile + var active = true + } + + private class Flight(val generation: Long, val startedAt: Long) { + val waiters = mutableListOf() + } private val lock = Any() // Порядок записи: первая — самая старая, её и вытесняем. private val entries = LinkedHashMap() - private val inFlight = HashMap>() + private val inFlight = HashMap() + private var generation = 0L + + // Поколения не новее этого стартовали до последнего clear(): их ответы не сохраняются. + private var clearedGeneration = 0L /** * Ответ по [key]: свежий из кэша, ожидание уже идущего запроса или новый запрос [load]. + * [force] — мимо готового ответа и мимо идущего запроса, сразу в сеть: так повторяет + * кнопка «Повторить». * - * Ручка отписывает колбэки этого вызова; сам запрос при этом доходит до конца, и его - * ответ попадает в кэш — он пригодится следующему показу. + * Ручка отписывает колбэки этого вызова. Если ждать больше некому, запрос перестаёт + * занимать ключ; его ответ всё равно сохранится, если более новой загрузки не было. */ fun get( key: Key, load: (onSuccess: (T) -> Unit, onError: (Int, String?) -> Unit) -> Unit, onSuccess: (T) -> Unit, - onError: (Int, String?) -> Unit + onError: (Int, String?) -> Unit, + force: Boolean = false ): Cancellable { @Suppress("UNCHECKED_CAST") val waiter = Waiter({ onSuccess(it as T) }, onError) var cached: Any? = null - var start = false + var joined: Flight? = null + var started: Flight? = null synchronized(lock) { - cached = fresh(key) + if (!force) cached = fresh(key) if (cached == null) { - val waiting = inFlight[key] - if (waiting != null) { - waiting += waiter + val running = inFlight[key] + val flight = if (!force && running != null && clock() - running.startedAt < flightTimeoutMillis) { + running } else { - inFlight[key] = mutableListOf(waiter) - start = true + Flight(++generation, clock()).also { + inFlight[key] = it + started = it + } } + flight.waiters += waiter + joined = flight } } cached?.let { waiter.onSuccess(it) return Cancellable.NOOP } - if (start) { + val flight = checkNotNull(joined) + started?.let { own -> try { - load({ value -> succeed(key, value) }, { code, message -> fail(key, code, message) }) + load({ value -> succeed(key, own, value) }, { code, message -> fail(key, own, code, message) }) } catch (throwable: Throwable) { - fail(key, ERROR_CODE, throwable.message) + fail(key, own, ERROR_CODE, throwable.message) + } + } + return Cancellable { + waiter.active = false + synchronized(lock) { + flight.waiters.remove(waiter) + if (flight.waiters.isEmpty() && inFlight[key] === flight) inFlight.remove(key) } } - return Cancellable { synchronized(lock) { inFlight[key]?.remove(waiter) } } } - /** Забыть все ответы; запросы в полёте доходят как обычно. */ + /** Забыть все ответы и запросы в полёте; ожидающие получат свои ответы, но в кэш они не лягут. */ fun clear() { - synchronized(lock) { entries.clear() } + synchronized(lock) { + entries.clear() + inFlight.clear() + clearedGeneration = generation + } } private fun fresh(key: Key): Any? { @@ -87,24 +137,54 @@ internal class ResponseCache( return null } - private fun succeed(key: Key, value: Any) { + private fun succeed(key: Key, flight: Flight, value: Any) { val waiters = synchronized(lock) { - entries.remove(key) - entries[key] = Entry(value, clock()) - while (entries.size > capacity) entries.remove(entries.keys.first()) - inFlight.remove(key).orEmpty() + val newerRunning = inFlight[key].let { it != null && it !== flight } + val newerStored = (entries[key]?.generation ?: 0L) > flight.generation + if (!newerRunning && !newerStored && flight.generation > clearedGeneration) { + entries.remove(key) + entries[key] = Entry(value, clock(), flight.generation) + while (entries.size > capacity) entries.remove(entries.keys.first()) + } + finish(key, flight) } - waiters.forEach { it.onSuccess(value) } + deliver(waiters) { it.onSuccess(value) } + } + + private fun fail(key: Key, flight: Flight, code: Int, message: String?) { + val waiters = synchronized(lock) { finish(key, flight) } + deliver(waiters) { it.onError(code, message) } + } + + /** Снимает запрос с ключа, если ключ всё ещё за ним, и отдаёт его ожидающих. */ + private fun finish(key: Key, flight: Flight): List { + if (inFlight[key] === flight) inFlight.remove(key) + val waiters = flight.waiters.toList() + flight.waiters.clear() + return waiters } - private fun fail(key: Key, code: Int, message: String?) { - val waiters = synchronized(lock) { inFlight.remove(key).orEmpty() } - waiters.forEach { it.onError(code, message) } + /** + * Раздаёт ответ всем ожидающим: колбэк, бросивший исключение, не лишает ответа + * остальных — исключение уходит дальше, когда раздача закончена. + */ + private fun deliver(waiters: List, call: (Waiter) -> Unit) { + var failure: Throwable? = null + waiters.forEach { waiter -> + if (!waiter.active) return@forEach + try { + call(waiter) + } catch (throwable: Throwable) { + failure?.addSuppressed(throwable) ?: run { failure = throwable } + } + } + failure?.let { throw it } } companion object { const val TTL_MILLIS = 10 * 60 * 1000L const val CAPACITY = 32 + const val FLIGHT_TIMEOUT_MILLIS = 30 * 1000L /** Запрос упал, не дойдя до сети. */ const val ERROR_CODE = -1 diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt index a3759125..e8a3803d 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ResponseCacheTest.kt @@ -1,6 +1,7 @@ package com.personalization.ui.widgets import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows import org.junit.Assert.assertTrue import org.junit.Test @@ -8,7 +9,7 @@ import org.junit.Test class ResponseCacheTest { private var now = 0L - private val cache = ResponseCache(ttlMillis = 1_000, capacity = 3, clock = { now }) + private val cache = ResponseCache(ttlMillis = 60_000, capacity = 3, flightTimeoutMillis = 30_000, clock = { now }) private val loads = mutableListOf Unit, (Int, String?) -> Unit>>() private val results = mutableListOf() private val errors = mutableListOf() @@ -29,7 +30,7 @@ class ResponseCacheTest { request(key("a")) loads.last().first("first") - now += 1_000 + now += 60_000 request(key("a")) assertEquals(2, loads.size) @@ -104,12 +105,114 @@ class ResponseCacheTest { assertEquals(1, loads.size) } + @Test + fun `a request silent for 30 seconds no longer holds the key`() { + request(key("a")) + now += 30_000 + + request(key("a")) + assertEquals(2, loads.size) + + loads[1].first("new") + loads[0].first("old") + assertEquals(listOf("new", "old"), results) + + request(key("a")) + assertEquals(2, loads.size) + assertEquals("new", results.last()) + } + + @Test + fun `an answer of an older generation is not kept`() { + request(key("a")) + now += 30_000 + request(key("a")) + + loads[0].first("old") + assertEquals(listOf("old"), results) + + request(key("a")) + assertEquals("joins the running request", 2, loads.size) + loads[1].first("new") + assertEquals(listOf("old", "new", "new"), results) + } + + @Test + fun `when every waiter leaves the key loads again`() { + val first = request(key("a")) + val second = request(key("a")) + first.cancel() + second.cancel() + + request(key("a")) + + assertEquals(2, loads.size) + } + + @Test + fun `clear during a request keeps its answer out of the cache`() { + request(key("a")) + cache.clear() + loads.single().first("before clear") + + assertEquals(listOf("before clear"), results) + request(key("a")) + assertEquals(2, loads.size) + } + + @Test + fun `clear frees a key held by a request in flight`() { + request(key("a")) + cache.clear() + + request(key("a")) + + assertEquals(2, loads.size) + } + + @Test + fun `a forced request skips both the kept answer and the request in flight`() { + request(key("a")) + loads.last().first("kept") + request(key("a"), force = true) + assertEquals(2, loads.size) + + request(key("a"), force = true) + assertEquals(3, loads.size) + + loads[2].first("fresh") + loads[1].first("stale") + request(key("a")) + assertEquals("fresh", results.last()) + } + + @Test + fun `a waiter that throws does not keep the answer from the others`() { + cache.get(key("a"), { onSuccess, onError -> loads += onSuccess to onError }, { error("host bug") }, { _, _ -> }) + request(key("a")) + + assertThrows(IllegalStateException::class.java) { loads.single().first("shared") } + + assertEquals(listOf("shared"), results) + } + + @Test + fun `the key keeps its parameters when the map changes later`() { + val params = mutableMapOf("code" to "a") + val stored = ResponseCache.Key("shop", "recommendation", params) + params["code"] = "b" + + assertEquals(key("a"), stored) + assertEquals(key("a").hashCode(), stored.hashCode()) + } + private fun key(code: String) = ResponseCache.Key("shop", "recommendation", mapOf("code" to code)) - private fun request(key: ResponseCache.Key) = cache.get( + private fun request(key: ResponseCache.Key, force: Boolean = false) = cache.get( key, load = { onSuccess, onError -> loads += onSuccess to onError }, onSuccess = { results += it }, - onError = { code, _ -> errors += code } + onError = { code, _ -> errors += code }, + force = force ) } From b25762654244f0de928038156e2cbc7efb43a3f8 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:19:01 +0400 Subject: [PATCH 14/65] fix(ui): search error and retry texts are never empty errorText and retryText given as null or an empty string fall back to the default texts: without them the error had no button and infinite scroll waited for a button that never came. --- .../PersonalizationSearchResultsScreen.kt | 21 +++++++++---- .../PersonalizationSearchResultsScreenTest.kt | 31 +++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt index c86860ee..1c4ca093 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt @@ -194,17 +194,23 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( field = value applyEmpty() } - var errorText: CharSequence? = "Something went wrong. Check your connection and try again." + + /** + * Текст ошибки и подпись кнопки повтора. Без них из ошибки не выйти, поэтому `null` + * и пустая строка заменяются текстами по умолчанию. + */ + var errorText: CharSequence? = DEFAULT_ERROR_TEXT set(value) { - field = value + field = value?.takeIf { it.isNotEmpty() } ?: DEFAULT_ERROR_TEXT applyEmpty() } - var retryText: CharSequence? = "Retry" + var retryText: CharSequence? = DEFAULT_RETRY_TEXT set(value) { - field = value - catalog.retryText = value + field = value?.takeIf { it.isNotEmpty() } ?: DEFAULT_RETRY_TEXT + catalog.retryText = field applyLoadMore() } + var filtersTitle: CharSequence? = "Filters" var resetText: CharSequence? = "Reset" var applyText: CharSequence? = "Apply" @@ -496,7 +502,7 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( val hasMore = loaded.isNotEmpty() && loaded.size < total catalog.loadMoreText = when { !hasMore -> null - failed -> retryText ?: loadMoreText + failed -> retryText infiniteScroll -> null else -> loadMoreText } @@ -624,6 +630,9 @@ class PersonalizationSearchResultsScreen @JvmOverloads constructor( } private companion object { + const val DEFAULT_ERROR_TEXT = "Something went wrong. Check your connection and try again." + const val DEFAULT_RETRY_TEXT = "Retry" + const val SECTION_PRICE = "price" const val SECTION_BRANDS = "brands" const val SECTION_COLORS = "colors" diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt index d2c8e659..5a1e822c 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt @@ -207,6 +207,37 @@ class PersonalizationSearchResultsScreenTest { assertEquals(screen.loadMoreText, screen.catalog.loadMoreText) } + @Test + fun `empty error and retry texts fall back to the defaults`() { + val errorDefault = screen.errorText + val retryDefault = screen.retryText + screen.errorText = "" + screen.retryText = null + screen.query = "jacket" + idle() + + failures.last()(500, null) + + assertEquals(errorDefault, screen.errorText) + assertEquals(retryDefault, screen.retryText) + assertEquals(errorDefault, screen.catalog.errorText) + assertEquals(retryDefault, screen.catalog.retryText) + } + + @Test + fun `with an empty retry text a failed page under infinite scroll still offers the button`() { + screen.infiniteScroll = true + screen.retryText = "" + screen.query = "jacket" + idle() + answers.last()(response(total = 60, page = 0)) + screen.loadMore() + + failures.last()(500, null) + + assertEquals("Retry", screen.catalog.loadMoreText) + } + @Test fun `after a failed page infinite scroll waits for the retry button`() { screen.infiniteScroll = true From 811f16a9f49abeed5c5827267279b7089cd97497 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:19:01 +0400 Subject: [PATCH 15/65] test(ui): retrying a search page sends no new search event Covered for the first page and for a next page. --- .../ui/widgets/PersonalizationSearchResultsScreenTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt index 5a1e822c..02871ad4 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreenTest.kt @@ -202,6 +202,7 @@ class PersonalizationSearchResultsScreenTest { retryButton().performClick() assertEquals(listOf(1, 2, 2), pages) + verify(exactly = 1) { tracking.search("jacket", any(), any()) } answers.last()(response(total = 60, page = 1)) assertEquals(40, screen.products.size) assertEquals(screen.loadMoreText, screen.catalog.loadMoreText) From 1665659eb918ebc3bd6ca586e3a960972f9a670e Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:20:50 +0400 Subject: [PATCH 16/65] fix(sdk): typed product methods have default bodies getProductInfo and getProductsList with callbacks were new abstract methods on the public ProductsManager, so an implementation written outside the SDK stopped compiling. They now have default bodies on top of the listener-based methods with the shared parsing, and the module builds interfaces with -Xjvm-default=all-compatibility so Java implementations get them as default methods too. --- personalization-sdk/build.gradle | 4 + .../api/managers/ProductsManager.kt | 19 ++++- .../products/impl/ProductsManagerImpl.kt | 80 +----------------- .../features/products/impl/ProductsParsing.kt | 72 ++++++++++++++++ .../api/managers/ProductsManagerJavaTest.java | 83 +++++++++++++++++++ 5 files changed, 175 insertions(+), 83 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt create mode 100644 personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java diff --git a/personalization-sdk/build.gradle b/personalization-sdk/build.gradle index 9c24c227..2e678ea6 100644 --- a/personalization-sdk/build.gradle +++ b/personalization-sdk/build.gradle @@ -54,6 +54,10 @@ android { jvmTarget = '17' // UI-кит дизайн-системы до релиза закрыт маркером opt-in; библиотека использует его сама. freeCompilerArgs += ['-opt-in=com.personalization.ui.InternalPersonalizationUiApi'] + // Interface methods with a body become Java default methods, so a Java implementation of a + // public interface does not break when a method with a default body is added to it. + // "compatibility" keeps the DefaultImpls classes that Kotlin code compiled earlier calls. + freeCompilerArgs += ['-Xjvm-default=all-compatibility'] } sourceSets { diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt index 79ff01e9..064fbe46 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt @@ -4,6 +4,7 @@ import com.personalization.api.OnApiCallbackListener import com.personalization.api.responses.product.Product import com.personalization.api.responses.products.ProductsListResponse import com.personalization.api.responses.products.counters.ProductCountersResponse +import com.personalization.features.products.impl.ProductsParsing interface ProductsManager { @@ -22,7 +23,9 @@ interface ProductsManager { * Fetch a product listing (`GET /products`) parsed into [ProductsListResponse]. * * Same request as the listener-based [getProductsList]; the answer has the shape of a full - * search: products, total and facets. + * search: products, total and facets. An answer without `products` goes to [onError]. + * Has a default body on top of the listener-based method, so existing implementations of + * this interface keep compiling. * * @param brands Comma-separated brand filter * @param merchants Comma-separated merchant filter @@ -44,7 +47,12 @@ interface ProductsManager { filters: Map? = null, onSuccess: (ProductsListResponse) -> Unit, onError: (Int, String?) -> Unit = { _: Int, _: String? -> } - ) + ) { + getProductsList( + brands, merchants, categories, locations, limit, page, filters, + ProductsParsing.listListener(onSuccess, onError) + ) + } fun getProductInfo( itemId: String, @@ -55,7 +63,8 @@ interface ProductsManager { * Fetch one product (`GET /products/get`) parsed into [Product]. * * Same request as the listener-based [getProductInfo]. An answer that is not a product - * goes to [onError]. + * goes to [onError]. Has a default body on top of the listener-based method, so existing + * implementations of this interface keep compiling. * * @param itemId Product item id * @param onSuccess Callback with the parsed product @@ -65,7 +74,9 @@ interface ProductsManager { itemId: String, onSuccess: (Product) -> Unit, onError: (Int, String?) -> Unit = { _: Int, _: String? -> } - ) + ) { + getProductInfo(itemId, ProductsParsing.productListener(onSuccess, onError)) + } /** * Fetch view/cart/purchase counters and trigger counts for a product diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt index 19de0914..816ac55b 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt @@ -1,12 +1,9 @@ package com.personalization.features.products.impl import com.google.gson.Gson -import com.google.gson.JsonParseException import com.personalization.Params import com.personalization.api.OnApiCallbackListener import com.personalization.api.managers.ProductsManager -import com.personalization.api.responses.product.Product -import com.personalization.api.responses.products.ProductsListResponse import com.personalization.api.responses.products.counters.ProductCountersResponse import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase import org.json.JSONObject @@ -41,34 +38,6 @@ internal class ProductsManagerImpl @Inject constructor( ) } - override fun getProductsList( - brands: String?, - merchants: String?, - categories: String?, - locations: String?, - limit: Int?, - page: Int?, - filters: Map?, - onSuccess: (ProductsListResponse) -> Unit, - onError: (Int, String?) -> Unit - ) { - getProductsList( - brands = brands, - merchants = merchants, - categories = categories, - locations = locations, - limit = limit, - page = page, - filters = filters, - listener = parsingListener( - method = GET_PRODUCT_LIST_REQUEST, - parse = { json -> Gson().fromJson(json, ProductsListResponse::class.java) ?: ProductsListResponse() }, - onSuccess = onSuccess, - onError = onError - ) - ) - } - override fun getProductInfo( itemId: String, listener: OnApiCallbackListener? @@ -82,28 +51,6 @@ internal class ProductsManagerImpl @Inject constructor( ) } - override fun getProductInfo( - itemId: String, - onSuccess: (Product) -> Unit, - onError: (Int, String?) -> Unit - ) { - getProductInfo( - itemId = itemId, - listener = parsingListener( - method = GET_PRODUCT_INFO_REQUEST, - parse = { json -> - // Gson leaves non-null fields empty when the answer lacks them: no id — no product. - Gson().fromJson(json, Product::class.java)?.takeIf { product -> - val id: String? = product.id - !id.isNullOrEmpty() - } - }, - onSuccess = onSuccess, - onError = onError - ) - ) - } - override fun getProductCounters( item: String, onSuccess: (ProductCountersResponse) -> Unit, @@ -128,31 +75,6 @@ internal class ProductsManagerImpl @Inject constructor( ) } - /** - * Parses the answer with [parse] off the raw JSON. A malformed answer, or one [parse] rejects - * with `null`, goes to [onError] instead of throwing on the network thread. - */ - private fun parsingListener( - method: String, - parse: (String) -> T?, - onSuccess: (T) -> Unit, - onError: (Int, String?) -> Unit - ): OnApiCallbackListener = object : OnApiCallbackListener() { - override fun onSuccess(response: JSONObject?) { - val parsed = try { - parse(response?.toString() ?: "{}") - } catch (e: JsonParseException) { - onError(PARSE_ERROR_CODE, "$method: ${e.message}") - return - } - if (parsed != null) onSuccess(parsed) else onError(PARSE_ERROR_CODE, "$method: unexpected answer") - } - - override fun onError(code: Int, msg: String?) { - onError(code, msg) - } - } - private fun Params.buildParams( itemId: String? = null, brands: String? = null, @@ -183,7 +105,7 @@ internal class ProductsManagerImpl @Inject constructor( const val GET_PRODUCT_COUNTERS_REQUEST = "products/counters" /** The answer came but could not be read as the expected model. */ - const val PARSE_ERROR_CODE = -1 + const val PARSE_ERROR_CODE = ProductsParsing.PARSE_ERROR_CODE private const val ITEM_KEY = "item" diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt new file mode 100644 index 00000000..d1101f48 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt @@ -0,0 +1,72 @@ +package com.personalization.features.products.impl + +import com.google.gson.Gson +import com.google.gson.JsonParseException +import com.personalization.api.OnApiCallbackListener +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.products.ProductsListResponse +import org.json.JSONObject + +/** + * Turns the raw answers of `products` and `products/get` into models for the typed + * [com.personalization.api.managers.ProductsManager] methods. + * + * Shared by the interface defaults, so an implementation that only has the listener-based + * methods gets the typed ones for free. + */ +internal object ProductsParsing { + + /** The answer came but could not be read as the expected model. */ + const val PARSE_ERROR_CODE = -1 + + fun listListener( + onSuccess: (ProductsListResponse) -> Unit, + onError: (Int, String?) -> Unit + ): OnApiCallbackListener = parsingListener( + method = ProductsManagerImpl.GET_PRODUCT_LIST_REQUEST, + parse = { json -> Gson().fromJson(json.toString(), ProductsListResponse::class.java) ?: ProductsListResponse() }, + onSuccess = onSuccess, + onError = onError + ) + + /** Gson leaves non-null fields empty when the answer lacks them: no id — no product. */ + fun productListener( + onSuccess: (Product) -> Unit, + onError: (Int, String?) -> Unit + ): OnApiCallbackListener = parsingListener( + method = ProductsManagerImpl.GET_PRODUCT_INFO_REQUEST, + parse = { json -> + Gson().fromJson(json.toString(), Product::class.java)?.takeIf { product -> + val id: String? = product.id + !id.isNullOrEmpty() + } + }, + onSuccess = onSuccess, + onError = onError + ) + + /** + * A malformed answer, or one [parse] rejects with `null`, goes to [onError] instead of + * throwing on the network thread. + */ + private fun parsingListener( + method: String, + parse: (JSONObject) -> T?, + onSuccess: (T) -> Unit, + onError: (Int, String?) -> Unit + ): OnApiCallbackListener = object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + val parsed = try { + response?.let(parse) + } catch (e: JsonParseException) { + onError(PARSE_ERROR_CODE, "$method: ${e.message}") + return + } + if (parsed != null) onSuccess(parsed) else onError(PARSE_ERROR_CODE, "$method: unexpected answer") + } + + override fun onError(code: Int, msg: String?) { + onError(code, msg) + } + } +} diff --git a/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java b/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java new file mode 100644 index 00000000..b5a5d990 --- /dev/null +++ b/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java @@ -0,0 +1,83 @@ +package com.personalization.api.managers; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import com.personalization.api.OnApiCallbackListener; +import com.personalization.api.responses.products.counters.ProductCountersResponse; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.util.Map; + +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; + +/** + * A Java implementation written before the typed product methods existed has to keep compiling, + * and gets the typed methods on top of its listener-based ones. + */ +@RunWith(RobolectricTestRunner.class) +@Config(sdk = 28) +public class ProductsManagerJavaTest { + + /** Implements only the methods the interface had before the typed ones. */ + private static final class ListenerOnlyManager implements ProductsManager { + String itemId; + OnApiCallbackListener listener; + + @Override + public void getProductsList(String brands, String merchants, String categories, String locations, + Integer limit, Integer page, Map filters, + OnApiCallbackListener listener) { + this.listener = listener; + } + + @Override + public void getProductInfo(String itemId, OnApiCallbackListener listener) { + this.itemId = itemId; + this.listener = listener; + } + + @Override + public void getProductCounters(String item, + Function1 onSuccess, + Function2 onError) { + } + } + + @Test + public void typedProductInfoGoesThroughTheListenerMethod() { + ListenerOnlyManager manager = new ListenerOnlyManager(); + int[] code = {0}; + + manager.getProductInfo("868", product -> Unit.INSTANCE, (c, message) -> { + code[0] = c; + return Unit.INSTANCE; + }); + assertEquals("868", manager.itemId); + assertNotNull(manager.listener); + manager.listener.onError(400, "bad request"); + + assertEquals(400, code[0]); + } + + @Test + public void typedProductsListGoesThroughTheListenerMethod() { + ListenerOnlyManager manager = new ListenerOnlyManager(); + int[] code = {0}; + + manager.getProductsList(null, null, null, null, null, null, null, listing -> Unit.INSTANCE, (c, message) -> { + code[0] = c; + return Unit.INSTANCE; + }); + assertNotNull(manager.listener); + manager.listener.onError(500, "server error"); + + assertEquals(500, code[0]); + } +} From 4d0dad1c70c171da86cfb09a34db014c2e50decf Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:21:22 +0400 Subject: [PATCH 17/65] fix(sdk): typed products list rejects answers that are not a listing A page that is not JSON reaches the listener as an empty object and used to come out as an empty listing; an answer without products is now an error. An array answer, which the listener-based method passed to a callback nobody overrode, is an error too instead of no answer at all. --- .../features/products/impl/ProductsParsing.kt | 19 ++++++++++-- .../api/managers/ProductsManagerJavaTest.java | 15 +++++++++ .../products/impl/ProductsManagerImplTest.kt | 31 +++++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt index d1101f48..68016922 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsParsing.kt @@ -5,6 +5,7 @@ import com.google.gson.JsonParseException import com.personalization.api.OnApiCallbackListener import com.personalization.api.responses.product.Product import com.personalization.api.responses.products.ProductsListResponse +import org.json.JSONArray import org.json.JSONObject /** @@ -19,12 +20,20 @@ internal object ProductsParsing { /** The answer came but could not be read as the expected model. */ const val PARSE_ERROR_CODE = -1 + private const val PRODUCTS_KEY = "products" + + /** + * A listing must carry `products`: a page that is not JSON reaches the listener as an + * empty object and is an error, not an empty listing. + */ fun listListener( onSuccess: (ProductsListResponse) -> Unit, onError: (Int, String?) -> Unit ): OnApiCallbackListener = parsingListener( method = ProductsManagerImpl.GET_PRODUCT_LIST_REQUEST, - parse = { json -> Gson().fromJson(json.toString(), ProductsListResponse::class.java) ?: ProductsListResponse() }, + parse = { json -> + if (json.has(PRODUCTS_KEY)) Gson().fromJson(json.toString(), ProductsListResponse::class.java) else null + }, onSuccess = onSuccess, onError = onError ) @@ -46,8 +55,8 @@ internal object ProductsParsing { ) /** - * A malformed answer, or one [parse] rejects with `null`, goes to [onError] instead of - * throwing on the network thread. + * A malformed answer, one [parse] rejects with `null`, or an array instead of an object + * goes to [onError] instead of throwing on the network thread or never answering. */ private fun parsingListener( method: String, @@ -65,6 +74,10 @@ internal object ProductsParsing { if (parsed != null) onSuccess(parsed) else onError(PARSE_ERROR_CODE, "$method: unexpected answer") } + override fun onSuccess(response: JSONArray) { + onError(PARSE_ERROR_CODE, "$method: an array instead of an object") + } + override fun onError(code: Int, msg: String?) { onError(code, msg) } diff --git a/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java b/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java index b5a5d990..49f15b18 100644 --- a/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java +++ b/personalization-sdk/src/test/java/com/personalization/api/managers/ProductsManagerJavaTest.java @@ -6,6 +6,7 @@ import com.personalization.api.OnApiCallbackListener; import com.personalization.api.responses.products.counters.ProductCountersResponse; +import org.json.JSONArray; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -80,4 +81,18 @@ public void typedProductsListGoesThroughTheListenerMethod() { assertEquals(500, code[0]); } + + @Test + public void typedProductsListReportsAnArrayAnswerAsAnError() { + ListenerOnlyManager manager = new ListenerOnlyManager(); + int[] code = {0}; + + manager.getProductsList(null, null, null, null, null, null, null, listing -> Unit.INSTANCE, (c, message) -> { + code[0] = c; + return Unit.INSTANCE; + }); + manager.listener.onSuccess(new JSONArray()); + + assertEquals(-1, code[0]); + } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt index bb7381a3..6469724c 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt @@ -12,6 +12,7 @@ import io.mockk.just import io.mockk.mockk import io.mockk.slot import io.mockk.verify +import org.json.JSONArray import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -196,4 +197,34 @@ class ProductsManagerImplTest { assertEquals(400, code) } + + @Test + fun getProductsList_typed_reportsAnswerWithoutProductsAsError() { + val result = typedListAnswer { it.onSuccess(JSONObject()) } + + assertEquals(null, result.first) + assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, result.second) + } + + @Test + fun getProductsList_typed_reportsArrayAnswerAsError() { + val result = typedListAnswer { it.onSuccess(JSONArray()) } + + assertEquals(null, result.first) + assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, result.second) + } + + /** Runs a typed listing request, feeds [answer] to its listener; the parsed listing and error code. */ + private fun typedListAnswer(answer: (OnApiCallbackListener) -> Unit): Pair { + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot)) + } just Runs + + var listing: ProductsListResponse? = null + var code = 0 + impl.getProductsList(onSuccess = { listing = it }, onError = { c, _ -> code = c }) + answer(listenerSlot.captured) + return listing to code + } } From 99d313503fdb774c22865f2db7e158a1f21755a0 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:21:22 +0400 Subject: [PATCH 18/65] test(sdk): malformed answers of the typed product methods are errors A listing or a product Gson cannot read reaches onError with the parse error code. --- .../products/impl/ProductsManagerImplTest.kt | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt index 6469724c..0c27e5ca 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt @@ -214,6 +214,30 @@ class ProductsManagerImplTest { assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, result.second) } + @Test + fun getProductsList_typed_reportsMalformedListingAsError() { + val result = typedListAnswer { it.onSuccess(JSONObject("""{"products":"not a list"}""")) } + + assertEquals(null, result.first) + assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, result.second) + } + + @Test + fun getProductInfo_typed_reportsMalformedProductAsError() { + val listenerSlot = slot() + every { + sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot)) + } just Runs + + var success = false + var code = 0 + impl.getProductInfo(itemId = "868", onSuccess = { success = true }, onError = { c, _ -> code = c }) + listenerSlot.captured.onSuccess(JSONObject("""{"id":"868","categories":"not a list"}""")) + + assertFalse(success) + assertEquals(ProductsManagerImpl.PARSE_ERROR_CODE, code) + } + /** Runs a typed listing request, feeds [answer] to its listener; the parsed listing and error code. */ private fun typedListAnswer(answer: (OnApiCallbackListener) -> Unit): Pair { val listenerSlot = slot() From 583d5909a0a03e55f40ee76b489a6c4c932b92ea Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:21:44 +0400 Subject: [PATCH 19/65] fix(sdk): old price of a product is read leniently products/get sends numbers as strings and an empty string for a missing old price, which failed the whole product. oldprice now reads a number or a numeric string and takes an empty string, a boolean or junk as no old price; it is written back as a plain number. --- .../responses/product/LenientDoubleAdapter.kt | 34 +++++++++++++++++++ .../api/responses/product/Product.kt | 1 + .../responses/product/ProductParsingTest.kt | 21 ++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientDoubleAdapter.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientDoubleAdapter.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientDoubleAdapter.kt new file mode 100644 index 00000000..9b710872 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/LenientDoubleAdapter.kt @@ -0,0 +1,34 @@ +package com.personalization.api.responses.product + +import com.google.gson.TypeAdapter +import com.google.gson.stream.JsonReader +import com.google.gson.stream.JsonToken +import com.google.gson.stream.JsonWriter + +/** + * Reads an optional number the API does not always send as a number. + * + * `products/get` sends numbers as strings, and an empty string where there is no value + * (`"oldprice": ""`). A number or a numeric string is read; an empty string, a boolean or + * anything else becomes `null` instead of failing the whole response. Written back as a + * plain number, so the model survives a round trip through Gson. + */ +internal class LenientDoubleAdapter : TypeAdapter() { + + override fun write(out: JsonWriter, value: Double?) { + if (value == null) out.nullValue() else out.value(value) + } + + override fun read(reader: JsonReader): Double? = when (reader.peek()) { + JsonToken.NUMBER -> reader.nextDouble() + JsonToken.STRING -> reader.nextString().trim().toDoubleOrNull()?.takeIf { it.isFinite() } + JsonToken.NULL -> { + reader.nextNull() + null + } + else -> { + reader.skipValue() + null + } + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt index 25dac46e..efd55c2b 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/product/Product.kt @@ -47,6 +47,7 @@ data class Product( @SerializedName("url_handle") val urlHandle: String, @SerializedName("oldprice") + @JsonAdapter(LenientDoubleAdapter::class) val oldPrice: Double? = null, @SerializedName("oldprice_formatted") val oldPriceFormatted: String? = null, diff --git a/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt index 3bc43a92..7b19d5cd 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt @@ -76,4 +76,25 @@ class ProductParsingTest { assertEquals(12, product.discount) assertEquals(7, product.discountPercent) } + + @Test + fun `an empty old price string is no old price, a numeric one is read`() { + val empty = gson.fromJson("""{"id":"1","price":"100","oldprice":""}""", Product::class.java) + val quoted = gson.fromJson("""{"id":"1","price":"100","oldprice":"174990.0"}""", Product::class.java) + val junk = gson.fromJson("""{"id":"1","price":"100","oldprice":false}""", Product::class.java) + + assertNull(empty.oldPrice) + assertEquals(174990.0, quoted.oldPrice!!, 0.0) + assertNull(junk.oldPrice) + } + + @Test + fun `the old price survives a round trip through Gson`() { + val product = gson.fromJson("""{"id":"1","price":90,"oldprice":"100.5"}""", Product::class.java) + + val again = gson.fromJson(gson.toJson(product), Product::class.java) + + assertEquals(100.5, again.oldPrice!!, 0.0) + assertNull(gson.fromJson(gson.toJson(gson.fromJson("""{"id":"1"}""", Product::class.java)), Product::class.java).oldPrice) + } } From 1df59355b9b546aeefff62be1109ece11ba4edcc Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:21:51 +0400 Subject: [PATCH 20/65] test(sdk): discount numbers survive a round trip through Gson --- .../responses/product/ProductParsingTest.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt index 7b19d5cd..947e5832 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/api/responses/product/ProductParsingTest.kt @@ -97,4 +97,26 @@ class ProductParsingTest { assertEquals(100.5, again.oldPrice!!, 0.0) assertNull(gson.fromJson(gson.toJson(gson.fromJson("""{"id":"1"}""", Product::class.java)), Product::class.java).oldPrice) } + + @Test + fun `discount numbers survive a round trip through Gson`() { + val product = gson.fromJson("""{"id":"1","discount":"12","discount_percent":7}""", Product::class.java) + + val json = gson.toJson(product) + val again = gson.fromJson(json, Product::class.java) + + assertTrue(json, json.contains("\"discount\":12") && json.contains("\"discount_percent\":7")) + assertEquals(12, again.discount) + assertEquals(7, again.discountPercent) + } + + @Test + fun `a boolean discount is written back as no discount`() { + val product = gson.fromJson("""{"id":"1","discount":false}""", Product::class.java) + + val again = gson.fromJson(gson.toJson(product), Product::class.java) + + assertNull(again.discount) + assertNull(again.discountPercent) + } } From 03a5bb8acc2f73a040e18e4a39136e522647864e Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:22:16 +0400 Subject: [PATCH 21/65] fix(ui): switching the rating rebinds only the rating row The change goes out with a payload, and a card that gets only that payload updates its rating row instead of being bound anew, so pictures are not reloaded and do not blink. --- .../PersonalizationProductsCarousel.kt | 23 ++++++++++++++++--- .../components/PersonalizationCatalogTest.kt | 19 +++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt index ed8337f0..e49abbeb 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt @@ -137,8 +137,9 @@ internal class PersonalizationProductsAdapter( set(value) { if (field == value) return field = value - // Набор карточек тот же — перепривязываются только они, без пересборки списка. - notifyItemRangeChanged(0, itemCount) + // Меняется только ряд рейтинга: с пометкой карточка не перепривязывается целиком + // и не перезапрашивает картинку. + notifyItemRangeChanged(0, itemCount, PAYLOAD_RATING) } class Holder(val card: PersonalizationProductCard) : RecyclerView.ViewHolder(card) @@ -162,6 +163,14 @@ internal class PersonalizationProductsAdapter( override fun getItemCount(): Int = items.size + override fun onBindViewHolder(holder: Holder, position: Int, payloads: MutableList) { + if (payloads.isNotEmpty() && payloads.all { it == PAYLOAD_RATING }) { + bindRating(holder.card, items[position]) + } else { + onBindViewHolder(holder, position) + } + } + override fun onBindViewHolder(holder: Holder, position: Int) { val product = items[position] holder.card.apply { @@ -172,11 +181,19 @@ internal class PersonalizationProductsAdapter( oldPrice = product.oldPrice discount = product.discount actionText = product.actionText - setRating(if (showRating) product.ratingValue else null, product.reviews) + bindRating(this, product) onAction = { this@PersonalizationProductsAdapter.onAction?.invoke(product) } onClick = this@PersonalizationProductsAdapter.onClick?.let { click -> { click(product) } } image.imageView.setImageDrawable(null) imageLoader?.invoke(image.imageView, product) } } + + private fun bindRating(card: PersonalizationProductCard, product: PersonalizationProduct) { + card.setRating(if (showRating) product.ratingValue else null, product.reviews) + } + + private companion object { + const val PAYLOAD_RATING = "rating" + } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt index 41f0d5e8..361960e2 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/components/PersonalizationCatalogTest.kt @@ -144,6 +144,25 @@ class PersonalizationCatalogTest { assertTrue(descendants(catalog).none { it.visibility == View.VISIBLE }) } + @Test + fun `switching the rating rebinds the rating row, not the pictures`() { + var loads = 0 + val rated = (0 until 4).map { PersonalizationProduct(id = "$it", name = "Item $it", price = "$it", ratingValue = "4,5", reviews = 10) } + val catalog = PersonalizationCatalog(context).apply { + products = rated + imageLoader = { _, _ -> loads++ } + } + layOut(catalog) + val before = loads + assertTrue(before > 0) + + catalog.showRating = false + layOut(catalog) + + assertEquals(before, loads) + assertTrue(descendants(catalog).none { it.visibility == View.VISIBLE }) + } + @Test fun `switching to the list keeps the rating switched off`() { val rated = (0 until 4).map { PersonalizationProduct(id = "$it", name = "Item $it", price = "$it", ratingValue = "4,5", reviews = 10) } From 36ce1fe59d289cb9fbb9bf35bab6a9eab7a99399 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:22:29 +0400 Subject: [PATCH 22/65] fix(ui): fallback price reads as a plain number Without price_formatted the card printed the double as is: 1.6499E7 for large prices and a trailing .0 for whole ones. --- .../com/personalization/ui/widgets/ProductMapping.kt | 9 +++++++-- .../com/personalization/ui/widgets/ProductMappingTest.kt | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt index 0272d1af..4959396f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/ProductMapping.kt @@ -2,6 +2,7 @@ package com.personalization.ui.widgets import com.personalization.api.responses.product.Product import com.personalization.ui.components.PersonalizationProduct +import java.math.BigDecimal /** * Товар ответа API → данные карточки кита. Один маппер на все виджеты с данными: товар @@ -9,7 +10,7 @@ import com.personalization.ui.components.PersonalizationProduct * рекомендациях (`recommends`). * * Строки берутся уже отформатированными сервером: - * - цена — `price_formatted`, иначе число с валютой; + * - цена — `price_formatted`, иначе число с валютой: без экспоненты и хвоста «.0»; * - старая цена — `oldprice_formatted`, только когда `oldprice` больше цены; * - скидка — только вместе со старой ценой и только при положительном числе скидки * (`discount`, иначе `discount_percent`): текст `discount_formatted`, иначе «число%», @@ -44,7 +45,7 @@ internal fun Product.toPersonalizationProduct(actionText: CharSequence? = null): id = productId.orEmpty(), name = title.orEmpty(), price = priceText?.takeIf { it.isNotEmpty() } - ?: listOfNotNull(price.toString(), currencyText?.takeIf { it.isNotEmpty() }).joinToString(" "), + ?: listOfNotNull(plainNumber(price), currencyText?.takeIf { it.isNotEmpty() }).joinToString(" "), imageUrl = pictureUrl?.takeIf { it.isNotEmpty() } ?: originalUrl?.takeIf { it.isNotEmpty() }, brand = brandName?.takeIf { it.isNotEmpty() }, oldPrice = if (hasOldPrice) oldPriceFormatted else null, @@ -54,3 +55,7 @@ internal fun Product.toPersonalizationProduct(actionText: CharSequence? = null): deeplink = deeplinkAndroid?.takeIf { it.isNotEmpty() } ) } + +/** `1.6499E7` → `16499000`, `90.0` → `90`, `90.5` → `90.5`. */ +private fun plainNumber(value: Double): String = + if (value.isFinite()) BigDecimal.valueOf(value).stripTrailingZeros().toPlainString() else value.toString() diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt index 37a9870f..5d1dfc42 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/ProductMappingTest.kt @@ -103,6 +103,15 @@ class ProductMappingTest { assertEquals("90.5 ₽", card.price) } + @Test + fun `the fallback price has no exponent and no trailing zero`() { + val large = product("""{"id":"1","name":"A","price":16499000,"currency":"₽"}""").toPersonalizationProduct() + val whole = product("""{"id":"1","name":"A","price":"90.0","currency":"₽"}""").toPersonalizationProduct() + + assertEquals("16499000 ₽", large.price) + assertEquals("90 ₽", whole.price) + } + @Test fun `without a picture the original image is used, and empty links are none`() { val card = product("""{"id":"1","name":"A","price":1,"picture":"","image_url":"https://img/1.jpg","url":"","deeplink_android":""}""") From 33ccfe92a682f34f06a7715a776090d9cfc52831 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:22:56 +0400 Subject: [PATCH 23/65] fix(ui): load controller sets loading on the main thread too Loading and Idle now go through post like the answers, as the KDoc promised, and retry does nothing while the request is still running, so a double tap no longer sends the same request twice. --- .../personalization/ui/widgets/LoadState.kt | 29 ++++++++++++++----- .../ui/widgets/LoadStateTest.kt | 24 +++++++++++++++ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt index dfb61b50..b02e61e4 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/LoadState.kt @@ -22,8 +22,9 @@ internal sealed class LoadState { * * Ответ запроса, который уже сменился следующим (или сброшен), отбрасывается — состояние * всегда про последний запрос. Пустой по [isEmpty] ответ — [LoadState.Empty]. - * Колбэки запроса приходят с любого потока; новое состояние [onChange] получает через - * [post] — по умолчанию на главном потоке. + * Колбэки запроса приходят с любого потока; каждое новое состояние, и [LoadState.Loading] + * тоже, ставится через [post] — по умолчанию на главном потоке. Пока запрос идёт, [retry] + * ничего не делает: повтор не плодит второй такой же запрос. */ internal class LoadController( private val isEmpty: (T) -> Boolean = { false }, @@ -35,8 +36,14 @@ internal class LoadController( private set private var request: LoadRequest? = null + + @Volatile private var sequence = 0 + // От старта до ответа текущего запроса. + @Volatile + private var running = false + /** Запустить [request] вместо прежнего. */ fun load(request: LoadRequest) { this.request = request @@ -45,29 +52,37 @@ internal class LoadController( /** Повторить последний запрос, например по кнопке на ошибке. Без запроса — ничего. */ fun retry() { + if (running) return request?.let(::start) } /** Забыть запрос; его поздний ответ отбросится. */ fun reset() { - sequence++ + val current = ++sequence + running = false request = null - set(LoadState.Idle) + post { if (current == sequence) set(LoadState.Idle) } } private fun start(request: LoadRequest) { val current = ++sequence - set(LoadState.Loading) + running = true + post { if (current == sequence) set(LoadState.Loading) } request( { data -> - post { if (current == sequence) set(if (isEmpty(data)) LoadState.Empty else LoadState.Content(data)) } + post { if (current == sequence) finish(if (isEmpty(data)) LoadState.Empty else LoadState.Content(data)) } }, { code, message -> - post { if (current == sequence) set(LoadState.Error(LoadError(code, message))) } + post { if (current == sequence) finish(LoadState.Error(LoadError(code, message))) } } ) } + private fun finish(next: LoadState) { + running = false + set(next) + } + private fun set(next: LoadState) { state = next onChange(next) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt index f4ec607b..d52ecfb8 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/LoadStateTest.kt @@ -1,6 +1,7 @@ package com.personalization.ui.widgets import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue import org.junit.Test /** The loading state of a data widget follows its latest request, and an error can be retried. */ @@ -69,4 +70,27 @@ class LoadStateTest { controller.retry() assertEquals(1, calls.size) } + + @Test + fun `loading too is set through post, not on the calling thread`() { + val queue = mutableListOf<() -> Unit>() + val queued = LoadController>(post = { queue += it }, onChange = { states += it }) + + queued.load(request) + assertEquals(LoadState.Idle, queued.state) + assertTrue(states.isEmpty()) + + queue.toList().forEach { it() } + assertEquals(LoadState.Loading, queued.state) + } + + @Test + fun `retry while loading sends no second request`() { + controller.load(request) + + controller.retry() + + assertEquals(1, calls.size) + assertEquals(LoadState.Loading, controller.state) + } } From c219bd58b16184b74420bec6968861ed1a79469f Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:32:50 +0400 Subject: [PATCH 24/65] refactor(ui): presentational block becomes PersonalizationProductsBlock The name PersonalizationRecommenderBlock goes to the block that loads its own products. The presentational one keeps its parameters; the demo exhibits follow the rename. --- .../com/personalization/demo/UiKitPane.kt | 20 +++++++++---------- ...ock.kt => PersonalizationProductsBlock.kt} | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-) rename personalization-sdk/src/main/kotlin/com/personalization/ui/components/{PersonalizationRecommenderBlock.kt => PersonalizationProductsBlock.kt} (91%) 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 d6d19e8d..75a99f9c 100644 --- a/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt +++ b/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt @@ -66,9 +66,9 @@ import com.personalization.ui.components.PersonalizationLoyaltyCard import com.personalization.ui.components.PersonalizationProduct import com.personalization.ui.components.PersonalizationProductCard import com.personalization.ui.components.PersonalizationProductImage +import com.personalization.ui.components.PersonalizationProductsBlock import com.personalization.ui.components.PersonalizationProductsGrid import com.personalization.ui.components.PersonalizationRating -import com.personalization.ui.components.PersonalizationRecommenderBlock import com.personalization.ui.components.PersonalizationSearchResultsTitle import com.personalization.ui.components.PersonalizationTag import com.personalization.ui.components.PersonalizationTitle @@ -303,14 +303,14 @@ private fun BlocksShowcase() { }.toTypedArray() ) } - Exhibit("Recommender Block — carousel") { ctx -> - ctx.recommender(PersonalizationRecommenderBlock.Layout.CAROUSEL, "Recommended for you", DemoProducts.all) + Exhibit("Products Block — carousel") { ctx -> + ctx.productsBlock(PersonalizationProductsBlock.Layout.CAROUSEL, "Recommended for you", DemoProducts.all) } - Exhibit("Recommender Block — grid") { ctx -> - ctx.recommender(PersonalizationRecommenderBlock.Layout.GRID, "Similar products", DemoProducts.all.take(4)) + Exhibit("Products Block — grid") { ctx -> + ctx.productsBlock(PersonalizationProductsBlock.Layout.GRID, "Similar products", DemoProducts.all.take(4)) } - Exhibit("Recommender Block — list") { ctx -> - ctx.recommender(PersonalizationRecommenderBlock.Layout.LIST, "Recently viewed", DemoProducts.all.take(3)) + Exhibit("Products Block — list") { ctx -> + ctx.productsBlock(PersonalizationProductsBlock.Layout.LIST, "Recently viewed", DemoProducts.all.take(3)) } Exhibit("Instant Search — recent searches") { ctx -> ctx.instantSearch(typing = false, images = false) } Exhibit("Instant Search — typing, matches in bold") { ctx -> ctx.instantSearch(typing = true, images = false) } @@ -651,11 +651,11 @@ private fun Context.productCard(type: PersonalizationProductCard.Type, product: Glide.with(image.imageView).load(product.imageUrl).into(image.imageView) } -private fun Context.recommender( - layout: PersonalizationRecommenderBlock.Layout, +private fun Context.productsBlock( + layout: PersonalizationProductsBlock.Layout, title: String, items: List -): PersonalizationRecommenderBlock = PersonalizationRecommenderBlock(this).apply { +): PersonalizationProductsBlock = PersonalizationProductsBlock(this).apply { this.layout = layout text = title showAllText = "Show all" diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRecommenderBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt similarity index 91% rename from personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRecommenderBlock.kt rename to personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt index 6507eb5e..86c3d867 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRecommenderBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt @@ -9,7 +9,9 @@ import com.personalization.R import com.personalization.ui.InternalPersonalizationUiApi /** - * Блок рекомендаций: заголовок, товары, у карусели — точки. + * Блок товаров: заголовок, товары, у карусели — точки. Товары даёт хост; сам блок ничего + * не грузит. Блок, который сам грузит рекомендации или коллекцию, — + * [com.personalization.ui.widgets.PersonalizationRecommenderBlock], он собран на этом. * * Источник: Figma Mobile SDK UI Kit, секция Card — Recommender/Carousel (90:655), * Recommender/Grid (126:1944), Recommender/List (126:2551). @@ -20,7 +22,7 @@ import com.personalization.ui.InternalPersonalizationUiApi * [PersonalizationProductsCarousel] / [PersonalizationProductsGrid], [PersonalizationDots]. */ @InternalPersonalizationUiApi -class PersonalizationRecommenderBlock @JvmOverloads constructor( +class PersonalizationProductsBlock @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 From dd95d91beafcd5bde0834019eeef809a5effc55c Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:33:23 +0400 Subject: [PATCH 25/65] feat(ui): products block passes showRating and drops an empty title row Carousel and grid get the showRating flag the catalog already has, and the products block hands it to both. A block with no title text and no show-all button has no title row, so the list starts at the top. --- .../PersonalizationProductsBlock.kt | 37 ++++++++++++++++--- .../PersonalizationProductsCarousel.kt | 9 ++++- .../components/PersonalizationProductsGrid.kt | 8 ++++ 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt index 86c3d867..f6016f93 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt @@ -42,10 +42,12 @@ class PersonalizationProductsBlock @JvmOverloads constructor( rebuild() } + /** Заголовок. Пустой и без кнопки «показать все» — блок без строки заголовка. */ var text: CharSequence? get() = title.text set(value) { title.text = value + applyTitleRow() } /** Подпись кнопки «показать все» у карусели. `null` — без кнопки. */ @@ -53,7 +55,7 @@ class PersonalizationProductsBlock @JvmOverloads constructor( set(value) { field = value showAllButton.text = value - title.setTrailing(if (value.isNullOrEmpty() || layout != Layout.CAROUSEL) null else showAllButton) + applyTitleRow() } var onShowAll: (() -> Unit)? = null @@ -73,6 +75,14 @@ class PersonalizationProductsBlock @JvmOverloads constructor( dots.count = value.size } + /** Рисовать ли рейтинг на карточках; выключенный прячет его, даже если оценка есть. */ + var showRating: Boolean = true + set(value) { + field = value + carousel.showRating = value + grid.showRating = value + } + var imageLoader: ((ImageView, PersonalizationProduct) -> Unit)? = null set(value) { field = value @@ -115,10 +125,7 @@ class PersonalizationProductsBlock @JvmOverloads constructor( private fun rebuild() { removeAllViews() - val gap = resources.getDimensionPixelSize( - if (layout == Layout.CAROUSEL) R.dimen.personalization_spacing_xl else R.dimen.personalization_spacing_lg - ) - title.setTrailing(if (layout == Layout.CAROUSEL && !showAllText.isNullOrEmpty()) showAllButton else null) + val gap = gap() addView(title, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) val list = when (layout) { @@ -126,9 +133,27 @@ class PersonalizationProductsBlock @JvmOverloads constructor( Layout.GRID -> grid.also { it.view = PersonalizationProductsGrid.View.GRID } Layout.LIST -> grid.also { it.view = PersonalizationProductsGrid.View.LIST } } - addView(list, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { topMargin = gap }) + addView(list, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) dots.isVisible = showDots && layout == Layout.CAROUSEL addView(dots, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply { topMargin = gap }) + applyTitleRow() } + + /** + * Строка заголовка есть, когда в ней что-то есть: текст или кнопка «показать все». + * Без неё лента встаёт наверх блока, без отступа под заголовок. + */ + private fun applyTitleRow() { + val showAll = layout == Layout.CAROUSEL && !showAllText.isNullOrEmpty() + title.setTrailing(if (showAll) showAllButton else null) + title.isVisible = showAll || !title.text.isNullOrEmpty() + val list = getChildAt(1) ?: return + (list.layoutParams as LayoutParams).topMargin = if (title.isVisible) gap() else 0 + list.requestLayout() + } + + private fun gap(): Int = resources.getDimensionPixelSize( + if (layout == Layout.CAROUSEL) R.dimen.personalization_spacing_xl else R.dimen.personalization_spacing_lg + ) } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt index e49abbeb..da898f83 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt @@ -62,7 +62,14 @@ class PersonalizationProductsCarousel @JvmOverloads constructor( productsAdapter.imageAspect = value } - /** Индекс первой видимой карточки: по нему Recommender-блок двигает точки. */ + /** Рисовать ли рейтинг на карточках; выключенный прячет его, даже если оценка есть. */ + var showRating: Boolean + get() = productsAdapter.showRating + set(value) { + productsAdapter.showRating = value + } + + /** Индекс первой видимой карточки: по нему блок товаров двигает точки. */ var onFirstVisibleChanged: ((Int) -> Unit)? = null init { diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt index eedb6d17..8b20c4d3 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt @@ -72,6 +72,13 @@ class PersonalizationProductsGrid @JvmOverloads constructor( productsAdapter.imageAspect = value } + /** Рисовать ли рейтинг на карточках; выключенный прячет его, даже если оценка есть. */ + var showRating: Boolean + get() = productsAdapter.showRating + set(value) { + productsAdapter.showRating = value + } + init { isNestedScrollingEnabled = false rebuild() @@ -87,6 +94,7 @@ class PersonalizationProductsGrid @JvmOverloads constructor( it.onAction = previous.onAction it.onClick = previous.onClick it.imageAspect = previous.imageAspect + it.showRating = previous.showRating } adapter = productsAdapter From e35e83ecaf9a1860a15981c243b0c4cfa450e031 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:44:04 +0400 Subject: [PATCH 26/65] feat(ui): recommender block that loads its own products PersonalizationRecommenderBlock takes one source: a recommender code (getExtendedRecommendation, with item, category and locations) or a collection id (getCollection). It resolves the SDK like the search widgets (app:shop_id or attach), loads through the shared response cache, and draws the answer with the products block: title from the answer unless the host sets one, limit, minProducts, action text, show all, dots and the rating flag, off by default. No skeleton: the block is gone while it loads and appears with a short fade; a cached answer shows at once. Empty, too few products or an error hide it; onLoaded and onError report. reload() goes past the cache and keeps the shown block until the answer. A tap or the card button of a recommendation sets the dynamic source with the block code before the host callback. --- .../PersonalizationRecommenderBlock.kt | 444 ++++++++++++++++++ .../ui/widgets/RecommenderSupport.kt | 87 ++++ .../main/res/values/personalization_attrs.xml | 5 + 3 files changed, 536 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/RecommenderSupport.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt new file mode 100644 index 00000000..4f126b87 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt @@ -0,0 +1,444 @@ +package com.personalization.ui.widgets + +import android.content.Context +import android.os.Handler +import android.os.Looper +import android.util.AttributeSet +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import com.personalization.Cancellable +import com.personalization.R +import com.personalization.Rees46 +import com.personalization.SDK +import com.personalization.api.models.tracking.TrackingSource +import com.personalization.api.models.tracking.TrackingSourceType +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationProductImage +import com.personalization.ui.components.PersonalizationProductsBlock + +/** + * Блок рекомендаций с данными SDK: сам грузит товары и рисует их блоком товаров кита + * ([PersonalizationProductsBlock]) — каруселью, плиткой или списком. + * + * Паттерн Recommender из Figma: Card — Recommender/Carousel (90:655), Recommender/Grid + * (126:1944), Recommender/List (126:2551). Источник — ровно один: + * - [code] (атрибут `app:code`) — блок рекомендаций, `getExtendedRecommendation`: заголовок + * и товары. Для «похожих» и «с этим покупают» — [itemId] и [categoryId], ещё [locations]; + * - [collectionId] — коллекция, `getCollection`: товары без заголовка. + * + * Инстанс SDK: [shopId] (атрибут `app:shop_id`) или единственный зарегистрированный; + * резолвится при показе через [Rees46.awaitInstance], явный — через [attach]. + * + * Скелетона нет: пока блок грузится, он скрыт ([View.GONE]) и места не занимает; товары + * пришли — появляется с коротким fade. Скрыт он только на первой загрузке и при смене + * источника или параметров: [reload] оставляет показанный блок на месте до ответа. Пустой + * ответ или товаров меньше [minProducts] — блок скрыт, [onLoaded] получает 0. Ошибка, в том + * числе упавший [reload], — блок скрыт и зовёт [onError]. + * + * Ответы идут через общий кэш виджетов ([ResponseCache]): второй блок с теми же + * параметрами (лента пересоздала ячейку) показывает товары сразу, без запроса и без fade. + * [reload] идёт мимо кэша. Смена источника или его параметров — новая загрузка: свойства, + * выставленные подряд, стоят одного запроса. + * + * Нажатие на товар блока рекомендаций и на кнопку его карточки запоминает источник `dynamic` + * с кодом блока (`tracking.setSource`) и потом отдаёт товар хосту — в [onProductClick] и + * [onProductAction]; у коллекции источник не ставится. Кнопка карточки есть, только когда + * задан [actionText]. + */ +@InternalPersonalizationUiApi +class PersonalizationRecommenderBlock @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + /** Код блока рекомендаций. Задаётся он или [collectionId], не оба. */ + var code: String? = null + set(value) { + if (field == value) return + field = value + scheduleLoad() + } + + /** Id коллекции. Задаётся он или [code], не оба. */ + var collectionId: String? = null + set(value) { + if (field == value) return + field = value + scheduleLoad() + } + + /** Товар, к которому подбираются рекомендации («похожие», «с этим покупают»). */ + var itemId: String? = null + set(value) { + if (field == value) return + field = value + scheduleLoad() + } + + /** Категория, к которой подбираются рекомендации. */ + var categoryId: String? = null + set(value) { + if (field == value) return + field = value + scheduleLoad() + } + + /** Локации пользователя через запятую, как у `getExtendedRecommendation`. */ + var locations: String? = null + set(value) { + if (field == value) return + field = value + scheduleLoad() + } + + /** Магазин; `null` — единственный зарегистрированный. Менять до показа. */ + var shopId: String? = null + + var layout: PersonalizationProductsBlock.Layout + get() = productsBlock.layout + set(value) { + if (productsBlock.layout != value) productsBlock.layout = value + } + + /** + * Заголовок блока. `null` — из ответа (у коллекции заголовка нет), пустая строка — + * без заголовка. + */ + var title: CharSequence? = null + set(value) { + if (field == value) return + field = value + render() + } + + /** Сколько товаров показать из ответа; `null` — все. */ + var limit: Int? = null + set(value) { + if (field == value) return + field = value + render() + } + + /** Меньше товаров — блок скрыт. */ + var minProducts: Int = 1 + set(value) { + if (field == value) return + field = value + render() + } + + var imageAspect: PersonalizationProductImage.Aspect + get() = productsBlock.imageAspect + set(value) { + if (productsBlock.imageAspect != value) productsBlock.imageAspect = value + } + + /** Подпись кнопки на карточке; `null` — карточки без кнопки. */ + var actionText: CharSequence? = null + set(value) { + if (field == value) return + field = value + render() + } + + /** Подпись кнопки «показать все» у карусели; `null` — без кнопки. */ + var showAllText: CharSequence? + get() = productsBlock.showAllText + set(value) { + if (productsBlock.showAllText != value) productsBlock.showAllText = value + } + + var onShowAll: (() -> Unit)? + get() = productsBlock.onShowAll + set(value) { + productsBlock.onShowAll = value + } + + /** Точки под каруселью. */ + var showDots: Boolean + get() = productsBlock.showDots + set(value) { + if (productsBlock.showDots != value) productsBlock.showDots = value + } + + /** + * Рейтинг на карточках. Оценки в ответе API пока нет, поэтому по умолчанию выключен; + * включённый рисует её, когда она у товара есть. + */ + var showRating: Boolean = false + set(value) { + field = value + productsBlock.showRating = value + } + + /** Загрузчик картинок; `null` — Glide из SDK. */ + var imageLoader: ((ImageView, String) -> Unit)? = null + + /** + * Нажатие на карточку — открыть товар: [PersonalizationProduct.deeplink] ведёт в + * приложение, [PersonalizationProduct.url] — на сайт. + */ + var onProductClick: ((PersonalizationProduct) -> Unit)? = null + + /** Кнопка карточки ([actionText]); источник `dynamic` к этому моменту уже запомнен. */ + var onProductAction: ((PersonalizationProduct) -> Unit)? = null + + /** Ответ пришёл: сколько товаров показано; 0 — блок скрыт. */ + var onLoaded: ((count: Int) -> Unit)? = null + + /** Блок не загрузился: код ошибки (HTTP или -1) и сообщение. Блок при этом скрыт. */ + var onError: ((code: Int, message: String?) -> Unit)? = null + + /** Показанные товары; пусто, пока блок скрыт. */ + var products: List = emptyList() + private set + + /** Блок товаров, который рисует ответ. */ + internal val productsBlock = PersonalizationProductsBlock(context) + + /** Кэш ответов; тесты подменяют общий своим. */ + internal var cache: ResponseCache = ResponseCache.shared + + private var sdk: SDK? = null + private var instanceHandle: Cancellable? = null + private var requestHandle: Cancellable? = null + + // Запрос сняли при уходе с экрана, не дождавшись ответа, — при возвращении он повторится. + private var interrupted = false + + // Источник последней загрузки и источник ответа на экране: пока они равны, новая загрузка + // (повтор) не прячет показанные товары до ответа. + private var requested: RecommenderSource? = null + private var answered: RecommenderSource? = null + private var answer: RecommenderAnswer? = null + + // Ответ пришёл, не дав load() вернуться, — значит, из кэша: показываем без fade. + private var inLoadCall = false + private val controller = LoadController(onChange = ::onState) + private val handler = Handler(Looper.getMainLooper()) + private val scheduledLoad = Runnable { load(force = false) } + + init { + attrs?.let { + val array = context.obtainStyledAttributes(it, R.styleable.PersonalizationRecommenderBlock, defStyleAttr, 0) + try { + code = array.getString(R.styleable.PersonalizationRecommenderBlock_code) + shopId = array.getString(R.styleable.PersonalizationRecommenderBlock_shop_id) + } finally { + array.recycle() + } + } + productsBlock.showRating = showRating + productsBlock.imageLoader = { view, product -> loadImage(view, product.imageUrl) } + productsBlock.onProductClick = { product -> + markSource() + onProductClick?.invoke(product) + } + productsBlock.onProductAction = { product -> + markSource() + onProductAction?.invoke(product) + } + addView(productsBlock, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + visibility = View.GONE + } + + /** Явный инстанс SDK вместо резолва по [shopId]; блок загружается сразу. */ + fun attach(sdk: SDK) { + instanceHandle?.cancel() + instanceHandle = null + this.sdk = sdk + load(force = false) + } + + /** + * Загрузить блок заново — мимо кэша, сразу в сеть. Показанный блок остаётся на месте до + * ответа; не загрузился — скрывается и зовёт [onError]. + */ + fun reload() { + load(force = true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (sdk == null) { + instanceHandle = try { + Rees46.awaitInstance(shopId) { resolved -> MainThread.run { attach(resolved) } } + } catch (throwable: Throwable) { + fail( + ResponseCache.ERROR_CODE, + "PersonalizationRecommenderBlock: cannot resolve an SDK for shopId=$shopId — set " + + "app:shop_id to pick a shop when several are registered. ${throwable.message}" + ) + null + } + } else if (interrupted) { + load(force = false) + } + } + + override fun onDetachedFromWindow() { + instanceHandle?.cancel() + instanceHandle = null + if (controller.state == LoadState.Loading) { + requestHandle?.cancel() + requestHandle = null + interrupted = true + } + super.onDetachedFromWindow() + } + + /** Скрытый блок не занимает места и в Compose: `AndroidView` меряет вьюху сам. */ + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + if (visibility == View.GONE) { + setMeasuredDimension(0, 0) + return + } + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + } + + /** + * Источник и его параметры перезапрашивают на следующем проходе главного потока: хост, + * выставивший код, товар и категорию подряд, получает один запрос, а не три. + */ + private fun scheduleLoad() { + handler.removeCallbacks(scheduledLoad) + if (sdk != null) handler.post(scheduledLoad) + } + + private fun load(force: Boolean) { + handler.removeCallbacks(scheduledLoad) + val sdk = sdk ?: return + val source = source() ?: return + // Прежний запрос снимается после того, как встал новый: тот же ключ в полёте + // подхватывается, а не запрашивается заново. + val previous = requestHandle + interrupted = false + requested = source + val key = source.key(storageKey(sdk, shopId)) + val request = source.request(sdk) + inLoadCall = true + try { + controller.load { onSuccess, onError -> + requestHandle = cache.get(key, request, onSuccess, onError, force) + } + } finally { + inLoadCall = false + } + previous?.cancel() + } + + /** Источник из свойств; не задан или задан дважды — ошибка конфигурации. */ + private fun source(): RecommenderSource? { + val blockCode = code.clean() + val collection = collectionId.clean() + return when { + blockCode != null && collection != null -> { + fail(ResponseCache.ERROR_CODE, "PersonalizationRecommenderBlock: set either code or collectionId, not both") + null + } + blockCode != null -> RecommenderSource.Recommendation(blockCode, itemId.clean(), categoryId.clean(), locations.clean()) + collection != null -> RecommenderSource.Collection(collection) + else -> { + fail(ResponseCache.ERROR_CODE, "PersonalizationRecommenderBlock: code or collectionId is not set") + null + } + } + } + + private fun onState(state: LoadState) { + when (state) { + // Другой источник: прежние товары к нему не относятся. + LoadState.Loading -> if (answered != requested) { + answer = null + answered = null + render() + } + is LoadState.Content -> { + answer = state.data + answered = requested + render(animate = !inLoadCall) + onLoaded?.invoke(products.size) + } + // Упал и повтор показанного блока: товары, которые не удалось обновить, не остаются. + is LoadState.Error -> { + answer = null + answered = null + render() + report(state.error.code, state.error.message) + } + else -> Unit + } + } + + /** Ответ → карточки: обрезка по [limit], порог [minProducts], заголовок. */ + private fun render(animate: Boolean = false) { + val data = answer + val shown = data?.products.orEmpty() + .let { all -> limit?.let { all.take(it.coerceAtLeast(0)) } ?: all } + .map { it.toPersonalizationProduct(actionText) } + products = if (shown.isNotEmpty() && shown.size >= minProducts) shown else emptyList() + if (products.isEmpty()) { + hide() + return + } + productsBlock.text = title ?: data?.title + productsBlock.products = products + if (visibility == View.VISIBLE) return + visibility = View.VISIBLE + if (animate) { + alpha = 0f + animate().alpha(1f).setDuration(FADE_MS).start() + } + } + + private fun hide() { + animate().cancel() + alpha = 1f + visibility = View.GONE + } + + /** Ошибка конфигурации: поздний ответ уже не нужен, блок скрыт, хост узнаёт. */ + private fun fail(code: Int, message: String) { + handler.removeCallbacks(scheduledLoad) + requestHandle?.cancel() + requestHandle = null + interrupted = false + controller.reset() + requested = null + answered = null + answer = null + render() + report(code, message) + } + + private fun report(code: Int, message: String?) { + SDK.error("PersonalizationRecommenderBlock: $code $message") + onError?.invoke(code, message) + } + + /** + * Нажатие на товар или на кнопку карточки («в корзину» прямо из блока) запоминает, что + * товар пришёл из блока рекомендаций, — до колбэка хоста, чтобы его события уже несли + * источник. У коллекции источника нет. + */ + private fun markSource() { + (answered as? RecommenderSource.Recommendation)?.let { source -> + sdk?.tracking?.setSource(TrackingSource(TrackingSourceType.DYNAMIC, source.code)) + } + } + + private fun loadImage(imageView: ImageView, url: String?) { + val loader = imageLoader + if (loader != null && url != null) loader(imageView, url) else SearchImages.load(imageView, url) + } + + private fun String?.clean(): String? = this?.trim()?.takeIf { it.isNotEmpty() } + + private companion object { + /** Появление блока, когда пришёл ответ из сети. */ + const val FADE_MS = 150L + } +} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/RecommenderSupport.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/RecommenderSupport.kt new file mode 100644 index 00000000..f298e0d3 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/RecommenderSupport.kt @@ -0,0 +1,87 @@ +package com.personalization.ui.widgets + +import com.personalization.Params +import com.personalization.SDK +import com.personalization.api.responses.collection.CollectionResponse +import com.personalization.api.responses.product.Product +import com.personalization.api.responses.recommendation.GetExtendedRecommendationResponse + +/** + * Ответ блока рекомендаций: заголовок (у коллекции его нет) и товары API. + * В общем кэше лежит он, а не карточки: текст кнопки карточки у каждого блока свой. + */ +internal class RecommenderAnswer(val title: String?, val products: List) + +/** Источник блока рекомендаций — ровно один: блок по коду или коллекция. */ +internal sealed class RecommenderSource { + + /** Ключ общего кэша: магазин, вид запроса и всё, от чего зависит ответ. */ + abstract fun key(shopId: String): ResponseCache.Key + + abstract fun request(sdk: SDK): LoadRequest + + /** + * Блок рекомендаций `recommend/{code}` с товарами целиком (`extended`). + * Параметры — те же, что хост кладёт в [Params] для `getExtendedRecommendation`: + * товар (`item`), категория (`category_id`), локации (`locations`). + */ + data class Recommendation( + val code: String, + val itemId: String? = null, + val categoryId: String? = null, + val locations: String? = null + ) : RecommenderSource() { + + override fun key(shopId: String) = ResponseCache.Key( + shopId, + KIND_RECOMMEND, + mapOf("code" to code, "item" to itemId, "category" to categoryId, "locations" to locations) + ) + + override fun request(sdk: SDK): LoadRequest = { onSuccess, onError -> + val params = Params() + itemId?.let { params.put(Params.Parameter.ITEM, it) } + categoryId?.let { params.put(Params.Parameter.CATEGORY_ID, it) } + locations?.let { params.put(Params.Parameter.LOCATIONS, it) } + sdk.recommendationManager.getExtendedRecommendation( + recommenderCode = code, + params = params, + onGetExtendedRecommendation = { onSuccess(it.toAnswer()) }, + onError = onError + ) + } + } + + /** Коллекция `collection/{id}`: товары без заголовка. */ + data class Collection(val collectionId: String) : RecommenderSource() { + + override fun key(shopId: String) = + ResponseCache.Key(shopId, KIND_COLLECTION, mapOf("id" to collectionId)) + + override fun request(sdk: SDK): LoadRequest = { onSuccess, onError -> + sdk.collectionManager.getCollection( + collectionId = collectionId, + onSuccess = { onSuccess(it.toAnswer()) }, + onError = onError + ) + } + } + + companion object { + const val KIND_RECOMMEND = "recommend" + const val KIND_COLLECTION = "collection" + } +} + +// Gson кладёт null в поля без значения даже при non-null типе — читаем через nullable копии. + +internal fun GetExtendedRecommendationResponse.toAnswer(): RecommenderAnswer { + val heading: String? = title + val items: List? = products + return RecommenderAnswer(heading?.takeIf { it.isNotBlank() }, items.orEmpty().filterNotNull()) +} + +internal fun CollectionResponse.toAnswer(): RecommenderAnswer { + val items: List? = products + return RecommenderAnswer(null, items.orEmpty().filterNotNull()) +} diff --git a/personalization-sdk/src/main/res/values/personalization_attrs.xml b/personalization-sdk/src/main/res/values/personalization_attrs.xml index aa6a1a68..c0a514e7 100644 --- a/personalization-sdk/src/main/res/values/personalization_attrs.xml +++ b/personalization-sdk/src/main/res/values/personalization_attrs.xml @@ -91,5 +91,10 @@ + + + + + From 35a83363aec527ec0113f859bc638331b19ae371 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:44:04 +0400 Subject: [PATCH 27/65] test(ui): recommender block title, hiding, cache, reload and tracking --- .../PersonalizationProductsBlock.kt | 4 + .../PersonalizationRecommenderBlockTest.kt | 343 ++++++++++++++++++ 2 files changed, 347 insertions(+) create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockTest.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt index f6016f93..0b9c0dd2 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt @@ -153,6 +153,10 @@ class PersonalizationProductsBlock @JvmOverloads constructor( list.requestLayout() } + /** Есть ли строка заголовка — для тестов. */ + internal val hasTitleRow: Boolean + get() = title.isVisible + private fun gap(): Int = resources.getDimensionPixelSize( if (layout == Layout.CAROUSEL) R.dimen.personalization_spacing_xl else R.dimen.personalization_spacing_lg ) diff --git a/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockTest.kt new file mode 100644 index 00000000..2f28ec29 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockTest.kt @@ -0,0 +1,343 @@ +package com.personalization.ui.widgets + +import android.content.Context +import android.os.Looper +import android.view.View +import androidx.test.core.app.ApplicationProvider +import com.google.gson.Gson +import com.personalization.Fixtures +import com.personalization.Params +import com.personalization.SDK +import com.personalization.api.managers.CollectionManager +import com.personalization.api.managers.RecommendationManager +import com.personalization.api.managers.TrackingApi +import com.personalization.api.models.tracking.TrackingSource +import com.personalization.api.models.tracking.TrackingSourceType +import com.personalization.api.responses.collection.CollectionResponse +import com.personalization.api.responses.recommendation.GetExtendedRecommendationResponse +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify +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.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +/** + * The data-bound recommender block: where its title comes from, when it hides, what it reports, + * how it shares answers through the cache, and what a tap tracks. + */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class PersonalizationRecommenderBlockTest { + + private val context: Context = ApplicationProvider.getApplicationContext() + private val gson = Gson() + private val cache = ResponseCache() + private lateinit var recommendations: RecommendationManager + private lateinit var collections: CollectionManager + private lateinit var tracking: TrackingApi + private lateinit var sdk: SDK + + private val sent = mutableListOf>() + private val answers = mutableListOf<(GetExtendedRecommendationResponse) -> Unit>() + private val failures = mutableListOf<(Int, String?) -> Unit>() + private val collectionAnswers = mutableListOf<(CollectionResponse) -> Unit>() + private val loaded = mutableListOf() + private val errors = mutableListOf() + private val events = mutableListOf() + + @Before + fun setUp() { + recommendations = mockk(relaxed = true) + every { recommendations.getExtendedRecommendation(any(), any(), any(), any()) } answers { + sent += firstArg() to secondArg().build() + answers += thirdArg<(GetExtendedRecommendationResponse) -> Unit>() + failures += arg<(Int, String?) -> Unit>(3) + } + collections = mockk(relaxed = true) + every { collections.getCollection(any(), any(), any(), any(), any(), any(), any(), any()) } answers { + collectionAnswers += arg<(CollectionResponse) -> Unit>(6) + } + tracking = mockk(relaxed = true) + every { tracking.setSource(any()) } answers { events += "source ${firstArg().code}" } + sdk = mockk(relaxed = true) + every { sdk.recommendationManager } returns recommendations + every { sdk.collectionManager } returns collections + every { sdk.tracking } returns tracking + } + + @Test + fun `the title comes from the answer`() { + val block = block() + + answers.last()(recommendation()) + + assertEquals(View.VISIBLE, block.visibility) + assertEquals("Популярные", block.productsBlock.text.toString()) + assertTrue(block.productsBlock.hasTitleRow) + assertEquals(listOf(2), loaded) + } + + @Test + fun `a title of the host wins over the answer`() { + val block = block { code = CODE; title = "For you" } + + answers.last()(recommendation()) + + assertEquals("For you", block.productsBlock.text.toString()) + } + + @Test + fun `an empty title leaves the block without a title row`() { + val block = block { code = CODE; title = "" } + + answers.last()(recommendation()) + + assertEquals(View.VISIBLE, block.visibility) + assertFalse(block.productsBlock.hasTitleRow) + } + + @Test + fun `a collection has no title`() { + val block = block { collectionId = "summer" } + + collectionAnswers.last()(CollectionResponse(recommendation().products)) + + assertEquals(View.VISIBLE, block.visibility) + assertFalse(block.productsBlock.hasTitleRow) + assertEquals(listOf(2), loaded) + } + + @Test + fun `fewer products than the minimum hide the block and report zero`() { + val block = block { code = CODE; minProducts = 3 } + + answers.last()(recommendation()) + + assertEquals(View.GONE, block.visibility) + assertTrue(block.products.isEmpty()) + assertEquals(listOf(0), loaded) + } + + @Test + fun `an empty answer hides the block and reports zero`() { + val block = block() + + answers.last()(gson.fromJson("{}", GetExtendedRecommendationResponse::class.java)) + + assertEquals(View.GONE, block.visibility) + assertEquals(listOf(0), loaded) + } + + @Test + fun `the block is hidden while it loads and measures to nothing`() { + val block = block() + + block.measure(View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY), View.MeasureSpec.UNSPECIFIED) + + assertEquals(View.GONE, block.visibility) + assertEquals(0, block.measuredHeight) + } + + @Test + fun `an error hides the block and reaches onError`() { + val block = block() + + failures.last()(500, "boom") + + assertEquals(View.GONE, block.visibility) + assertEquals(listOf(500), errors) + assertTrue(loaded.isEmpty()) + } + + @Test + fun `reload keeps the shown block on screen until the answer`() { + val block = block() + answers.last()(recommendation()) + + block.reload() + + assertEquals(View.VISIBLE, block.visibility) + assertEquals(2, block.products.size) + answers.last()(gson.fromJson("{}", GetExtendedRecommendationResponse::class.java)) + assertEquals(View.GONE, block.visibility) + assertEquals(listOf(2, 0), loaded) + } + + @Test + fun `a failed reload hides the block and reaches onError`() { + val block = block() + answers.last()(recommendation()) + + block.reload() + failures.last()(504, "timeout") + + assertEquals(View.GONE, block.visibility) + assertTrue(block.products.isEmpty()) + assertEquals(listOf(504), errors) + } + + @Test + fun `a second block with the same parameters shows the cached answer without a request`() { + val first = block() + answers.last()(recommendation()) + + val second = block() + + verify(exactly = 1) { recommendations.getExtendedRecommendation(any(), any(), any(), any()) } + assertEquals(View.VISIBLE, second.visibility) + assertEquals(2, second.products.size) + // Из сети блок проявляется, из кэша — сразу, без fade. + assertEquals(0f, first.alpha, 0f) + assertEquals(1f, second.alpha, 0f) + assertEquals(listOf(2, 2), loaded) + } + + @Test + fun `reload goes to the network even with a cached answer`() { + val block = block() + answers.last()(recommendation()) + + block.reload() + + verify(exactly = 2) { recommendations.getExtendedRecommendation(any(), any(), any(), any()) } + } + + @Test + fun `limit trims the products`() { + val block = block { code = CODE; limit = 1 } + + answers.last()(recommendation()) + + assertEquals(1, block.products.size) + assertEquals(1, block.productsBlock.products.size) + assertEquals(listOf(1), loaded) + } + + @Test + fun `a tap on a recommendation sets the dynamic source with the block code, then tells the host`() { + val block = block { code = CODE; onProductClick = { events += "host ${it.id}" } } + answers.last()(recommendation()) + + block.productsBlock.onProductClick!!.invoke(block.products[0]) + + verify { tracking.setSource(TrackingSource(TrackingSourceType.DYNAMIC, CODE)) } + assertEquals(listOf("source $CODE", "host 52173"), events) + } + + @Test + fun `the card button of a recommendation sets the dynamic source too, then tells the host`() { + val block = block { code = CODE; actionText = "Add to cart"; onProductAction = { events += "action ${it.id}" } } + answers.last()(recommendation()) + + block.productsBlock.onProductAction!!.invoke(block.products[1]) + + verify { tracking.setSource(TrackingSource(TrackingSourceType.DYNAMIC, CODE)) } + assertEquals(listOf("source $CODE", "action ${block.products[1].id}"), events) + } + + @Test + fun `a tap or a card button on a collection product sets no source`() { + val block = block { + collectionId = "summer" + onProductClick = { events += "host ${it.id}" } + onProductAction = { events += "action ${it.id}" } + } + collectionAnswers.last()(CollectionResponse(recommendation().products)) + + block.productsBlock.onProductClick!!.invoke(block.products[0]) + block.productsBlock.onProductAction!!.invoke(block.products[0]) + + verify(exactly = 0) { tracking.setSource(any()) } + assertEquals(listOf("host 52173", "action 52173"), events) + } + + @Test + fun `a recommended product carries its discount, links and the action text`() { + val block = block { code = CODE; actionText = "Add to cart" } + + answers.last()(recommendation()) + + val card = block.products[0] + assertEquals("174 990 ₽", card.oldPrice) + assertEquals("-6%", card.discount) + assertEquals("https://www.technodom.kz/p/holodilnik-beko-rdsk-mw-52173", card.deeplink) + assertEquals(recommendation().products[0].url, card.url) + assertEquals("Add to cart", card.actionText) + assertNull(block.products[1].discount) + } + + @Test + fun `item, category and locations go into the request and the cache key`() { + block { code = CODE; itemId = "52173"; categoryId = "7"; locations = "1,2" } + answers.last()(recommendation()) + + block { code = CODE; itemId = "52174" } + + val (code, params) = sent.first() + assertEquals(CODE, code) + assertEquals("52173", params.getString("item")) + assertEquals("7", params.getString("category_id")) + assertEquals("1,2", params.getString("locations")) + assertEquals(2, sent.size) + } + + @Test + fun `parameters changed in a row cost one request, and the old products hide meanwhile`() { + val block = block() + answers.last()(recommendation()) + + block.itemId = "52173" + block.categoryId = "7" + idle() + + assertEquals(2, sent.size) + assertEquals(View.GONE, block.visibility) + answers.last()(recommendation()) + assertEquals(View.VISIBLE, block.visibility) + } + + @Test + fun `code and collection together are a configuration error`() { + val block = block { code = CODE; collectionId = "summer" } + + assertEquals(View.GONE, block.visibility) + assertEquals(listOf(ResponseCache.ERROR_CODE), errors) + assertTrue(sent.isEmpty()) + assertTrue(collectionAnswers.isEmpty()) + } + + @Test + fun `the rating is off by default`() { + val block = block() + + assertFalse(block.showRating) + assertFalse(block.productsBlock.showRating) + } + + private fun block(configure: PersonalizationRecommenderBlock.() -> Unit = { code = CODE }) = + PersonalizationRecommenderBlock(context).apply { + cache = this@PersonalizationRecommenderBlockTest.cache + onLoaded = { loaded += it } + onError = { code, _ -> errors += code } + configure() + attach(sdk) + } + + private fun recommendation(): GetExtendedRecommendationResponse = + gson.fromJson(Fixtures.read("recommend_extended.json"), GetExtendedRecommendationResponse::class.java) + + private fun idle() = shadowOf(Looper.getMainLooper()).idle() + + private companion object { + const val CODE = "e6249bb15043644bf25b135006149962" + } +} From f566bfe423040d820f24d328471d2cb8c9821c92 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:44:04 +0400 Subject: [PATCH 28/65] feat(ui): Compose wrapper for the recommender block PersonalizationRecommenderBlockWidget is an AndroidView over the block, like the stories widget; a hidden block has zero height. Source and parameters change on the same view with a new load; reload goes through PersonalizationRecommenderBlockController. --- .../PersonalizationRecommenderBlockWidget.kt | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt new file mode 100644 index 00000000..19a50bd5 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt @@ -0,0 +1,115 @@ +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.SDK +import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationProductImage +import com.personalization.ui.components.PersonalizationProductsBlock + +/** + * Управление блоком рекомендаций из Compose: то же, что [PersonalizationRecommenderBlock.reload]. + * Передаётся в [PersonalizationRecommenderBlockWidget]; без показанного блока ничего не делает. + */ +@InternalPersonalizationUiApi +class PersonalizationRecommenderBlockController { + + internal var view: PersonalizationRecommenderBlock? = null + + /** Загрузить блок заново — мимо кэша. */ + fun reload() { + view?.reload() + } +} + +/** + * Compose-обёртка над [PersonalizationRecommenderBlock] — те же параметры, что у вьюхи. + * Источник — ровно один: [code] (рекомендации) или [collectionId] (коллекция). + * Пока блок грузится, пуст или не загрузился, он нулевой высоты. + * + * Compose у SDK опциональный (`compileOnly`), как у [PersonalizationStoriesWidget]: хост + * подключает его сам. + * + * ```kotlin + * PersonalizationRecommenderBlockWidget(code = "BLOCK_CODE", onProductClick = { open(it) }) + * ``` + */ +@InternalPersonalizationUiApi +@Composable +fun PersonalizationRecommenderBlockWidget( + code: String? = null, + collectionId: String? = null, + modifier: Modifier = Modifier, + itemId: String? = null, + categoryId: String? = null, + locations: String? = null, + shopId: String? = null, + sdk: SDK? = null, + controller: PersonalizationRecommenderBlockController? = null, + layout: PersonalizationProductsBlock.Layout = PersonalizationProductsBlock.Layout.CAROUSEL, + title: CharSequence? = null, + limit: Int? = null, + minProducts: Int = 1, + imageAspect: PersonalizationProductImage.Aspect = PersonalizationProductImage.Aspect.SQUARE, + actionText: CharSequence? = null, + showAllText: CharSequence? = null, + onShowAll: (() -> Unit)? = null, + showDots: Boolean = true, + showRating: Boolean = false, + imageLoader: ((ImageView, String) -> Unit)? = null, + onProductClick: ((PersonalizationProduct) -> Unit)? = null, + onProductAction: ((PersonalizationProduct) -> Unit)? = null, + onLoaded: ((count: Int) -> Unit)? = null, + onError: ((code: Int, message: String?) -> Unit)? = null +) { + val currentOnLoaded = rememberUpdatedState(onLoaded) + val currentOnError = rememberUpdatedState(onError) + // Магазин и SDK задают, откуда грузить, — их смена пересоздаёт вьюху. Источник и его + // параметры вьюха меняет сама, с новой загрузкой. + key(shopId, sdk) { + AndroidView( + modifier = modifier, + factory = { context -> + PersonalizationRecommenderBlock(context).apply { + this.shopId = shopId + // Источник — до первой загрузки: блок из кэша появляется сразу, без запроса. + this.code = code + this.collectionId = collectionId + this.itemId = itemId + this.categoryId = categoryId + this.locations = locations + this.onLoaded = { count -> currentOnLoaded.value?.invoke(count) } + this.onError = { errorCode, message -> currentOnError.value?.invoke(errorCode, message) } + sdk?.let(::attach) + } + }, + update = { view -> + view.code = code + view.collectionId = collectionId + view.itemId = itemId + view.categoryId = categoryId + view.locations = locations + view.layout = layout + view.title = title + view.limit = limit + view.minProducts = minProducts + view.imageAspect = imageAspect + view.actionText = actionText + view.showAllText = showAllText + view.onShowAll = onShowAll + view.showDots = showDots + view.showRating = showRating + view.imageLoader = imageLoader + view.onProductClick = onProductClick + view.onProductAction = onProductAction + controller?.view = view + }, + onRelease = { view -> if (controller?.view === view) controller.view = null } + ) + } +} From 7bfddc4dc4340c8719c201ef5378e45b35667af7 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:44:04 +0400 Subject: [PATCH 29/65] feat(demo): live recommender blocks in the kit showcase The Blocks tab loads a recommender block of the demo shop as a carousel, the same code as a grid and through the Compose wrapper, each with its onLoaded / onError caption and a reload button. The static exhibits of the products block stay. --- .../demo/RecommenderShowcase.kt | 122 ++++++++++++++++++ .../com/personalization/demo/UiKitPane.kt | 32 +++-- 2 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 demo-app/src/main/java/com/personalization/demo/RecommenderShowcase.kt diff --git a/demo-app/src/main/java/com/personalization/demo/RecommenderShowcase.kt b/demo-app/src/main/java/com/personalization/demo/RecommenderShowcase.kt new file mode 100644 index 00000000..c6959170 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/RecommenderShowcase.kt @@ -0,0 +1,122 @@ +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.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import androidx.compose.ui.viewinterop.AndroidView +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationProductsBlock +import com.personalization.ui.widgets.PersonalizationRecommenderBlock +import com.personalization.ui.widgets.PersonalizationRecommenderBlockController +import com.personalization.ui.widgets.PersonalizationRecommenderBlockWidget + +/** A recommender block of the demo shop (c1140c…) that has products. */ +private const val DEMO_RECOMMENDER_CODE = "e6249bb15043644bf25b135006149962" + +/** + * The data-bound recommender block on the demo shop, the way a host drops it in: a code and a + * shopId, and the block loads, hides while it has nothing to show, and appears with the products. + * Its onLoaded / onError land in the caption under it; "Reload" goes past the cache. + * + * All three exhibits ask for the same code, so only the first goes to the network — the others + * come out of the kit's response cache at once. + */ +@Composable +internal fun LiveRecommenderExhibit(title: String, shopId: String, layout: PersonalizationProductsBlock.Layout, limit: Int? = null) { + var status by remember { mutableStateOf("Loading… (the block stays hidden until it has products)") } + var block by remember { mutableStateOf(null) } + + Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Caption(title) + AndroidView( + modifier = Modifier.fillMaxWidth(), + factory = { ctx -> + PersonalizationRecommenderBlock(ctx).apply { + this.shopId = shopId + code = DEMO_RECOMMENDER_CODE + this.layout = layout + this.limit = limit + actionText = "Add to cart" + showAllText = "Show all" + onShowAll = { ctx.toast("Show all") } + onProductClick = { product -> ctx.toast(product.describe()) } + onProductAction = { product -> ctx.toast("Add to cart: ${product.name}") } + onLoaded = { count -> status = "onLoaded: $count" } + onError = { code, message -> status = "onError $code: $message" } + block = this + } + } + ) + StatusRow(status) { + status = "Reloading…" + block?.reload() + } + } +} + +/** The same block through the Compose wrapper, reloaded through its controller. */ +@Composable +internal fun LiveRecommenderComposeExhibit(shopId: String) { + val context = LocalContext.current + val controller = remember { PersonalizationRecommenderBlockController() } + var status by remember { mutableStateOf("Loading… (zero height until it has products)") } + + Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Caption("Recommender Block — Compose PersonalizationRecommenderBlockWidget, list, own title") + PersonalizationRecommenderBlockWidget( + code = DEMO_RECOMMENDER_CODE, + modifier = Modifier.fillMaxWidth(), + shopId = shopId, + controller = controller, + layout = PersonalizationProductsBlock.Layout.LIST, + title = "Popular, from Compose", + limit = 3, + actionText = "Add to cart", + onProductClick = { product -> context.toast(product.describe()) }, + onProductAction = { product -> context.toast("Add to cart: ${product.name}") }, + onLoaded = { count -> status = "onLoaded: $count" }, + onError = { code, message -> status = "onError $code: $message" } + ) + StatusRow(status) { + status = "Reloading…" + controller.reload() + } + } +} + +@Composable +private fun Caption(text: String) { + Text( + text = text, + style = MaterialTheme.typography.caption, + color = MaterialTheme.colors.onBackground.copy(alpha = 0.6f) + ) +} + +@Composable +private fun StatusRow(status: String, onReload: () -> Unit) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OutlinedButton(onClick = onReload) { Text("Reload") } + Text(text = status, style = MaterialTheme.typography.caption) + } +} + +/** Where the host would navigate: the app deeplink first, the site page otherwise. */ +private fun PersonalizationProduct.describe(): String = "Product: $name\n${deeplink ?: url ?: "no link"}" + +private fun Context.toast(message: String) = Toast.makeText(this, message, 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 75a99f9c..d18e2a63 100644 --- a/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt +++ b/demo-app/src/main/java/com/personalization/demo/UiKitPane.kt @@ -80,15 +80,17 @@ import com.personalization.ui.widgets.PersonalizationSearchResultsScreen * "UI Kit" tab — the design system, one exhibit per component. * * "Components" walks through the primitives in every size, view and state the design file defines; - * "Blocks" shows the compositions built from them (product cards, recommender layouts, instant - * search, the catalogue, the filters screen). "Search" runs the two data-bound search widgets against - * the demo shop: the instant search field, and the results screen it opens on submit. "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]). + * "Blocks" shows the compositions built from them (product cards, the products block in its three + * layouts, instant search, the catalogue, the filters screen) and the recommender block loading a + * real block of the demo shop (see [LiveRecommenderExhibit]). "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 - * host — Glide here, through the components' `imageLoader` slot. + * data of the static exhibits is fixed: the presentational components do not fetch or format + * anything themselves, and images are loaded by the host — Glide here, through the components' + * `imageLoader` slot. */ @Composable fun UiKitPane(storiesCode: String, shopId: String) { @@ -114,7 +116,7 @@ fun UiKitPane(storiesCode: String, shopId: String) { } when (tab) { 0 -> ComponentsShowcase() - 1 -> BlocksShowcase() + 1 -> BlocksShowcase(shopId = shopId) 2 -> SearchShowcase(shopId = shopId) 3 -> ComposeStoriesPane(code = storiesCode, shopId = shopId) else -> StoriesV2Showcase(storiesCode = storiesCode, shopId = shopId) @@ -272,7 +274,7 @@ private fun ComponentsShowcase() { } @Composable -private fun BlocksShowcase() { +private fun BlocksShowcase(shopId: String) { Showcase { Exhibit("Product Card — carousel, grid, list") { ctx -> ctx.column( @@ -312,6 +314,18 @@ private fun BlocksShowcase() { Exhibit("Products Block — list") { ctx -> ctx.productsBlock(PersonalizationProductsBlock.Layout.LIST, "Recently viewed", DemoProducts.all.take(3)) } + LiveRecommenderExhibit( + title = "Recommender Block — live from the demo shop, carousel, title from the answer", + shopId = shopId, + layout = PersonalizationProductsBlock.Layout.CAROUSEL + ) + LiveRecommenderExhibit( + title = "Recommender Block — the same code as a grid, at most 4 products", + shopId = shopId, + layout = PersonalizationProductsBlock.Layout.GRID, + limit = 4 + ) + LiveRecommenderComposeExhibit(shopId = shopId) Exhibit("Instant Search — recent searches") { ctx -> ctx.instantSearch(typing = false, images = false) } Exhibit("Instant Search — typing, matches in bold") { ctx -> ctx.instantSearch(typing = true, images = false) } Exhibit("Instant Search — with images") { ctx -> ctx.instantSearch(typing = false, images = true) } From 192efd49a1b56aa76b9c370a536163623d6bcf5a Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Wed, 21 Oct 2026 20:45:20 +0400 Subject: [PATCH 30/65] fix(ui): modifier is the first optional parameter of the block widget --- .../ui/widgets/PersonalizationRecommenderBlockWidget.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt index 19a50bd5..4b1800d8 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt @@ -42,9 +42,9 @@ class PersonalizationRecommenderBlockController { @InternalPersonalizationUiApi @Composable fun PersonalizationRecommenderBlockWidget( + modifier: Modifier = Modifier, code: String? = null, collectionId: String? = null, - modifier: Modifier = Modifier, itemId: String? = null, categoryId: String? = null, locations: String? = null, From c7e28f246aa5d7788327e277a4a694c90b130e93 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Thu, 22 Oct 2026 09:51:23 +0400 Subject: [PATCH 31/65] feat(demo): product mapper and kit helpers for the demo shop --- .../personalization/demo/shop/ShopSupport.kt | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/ShopSupport.kt diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopSupport.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopSupport.kt new file mode 100644 index 00000000..c724c3db --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopSupport.kt @@ -0,0 +1,172 @@ +package com.personalization.demo.shop + +import android.content.Context +import android.graphics.Paint +import android.os.Handler +import android.os.Looper +import android.util.TypedValue +import android.view.Gravity +import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.view.isVisible +import androidx.core.widget.TextViewCompat +import com.bumptech.glide.Glide +import com.personalization.R as SdkR +import com.personalization.api.responses.product.Product +import com.personalization.ui.PersonalizationTheme +import com.personalization.ui.components.PersonalizationButton +import com.personalization.ui.components.PersonalizationEmptyState +import com.personalization.ui.components.PersonalizationLoader +import com.personalization.ui.components.PersonalizationProduct +import com.personalization.ui.components.PersonalizationTitle +import java.math.BigDecimal + +/** Recommender block of the demo shop (c1140c…) that has products: home carousel and "Similar products". */ +internal const val SHOP_BLOCK_CODE = "e6249bb15043644bf25b135006149962" + +internal const val ADD_TO_CART_TEXT = "Add to cart" +internal const val ERROR_TEXT = "Something went wrong. Check your connection and try again." +internal const val RETRY_TEXT = "Retry" + +/** + * API product → kit card. The kit's own mapper is internal to the SDK, so the demo keeps a small one + * by the same rules: + * - price — `price_formatted`, otherwise the number with the currency; + * - old price — `oldprice_formatted`, only when `oldprice` is greater than the price; + * - discount badge — only next to an old price and only for a positive number (`discount`, otherwise + * `discount_percent`): `discount_formatted` for `discount`, otherwise "N%", with exactly one "-"; + * - image — `picture` (resized copy), otherwise `image_url`; links — `deeplink_android` and `url`. + */ +internal fun Product.toCard(actionText: CharSequence? = ADD_TO_CART_TEXT): PersonalizationProduct { + // Gson leaves null in fields the answer lacks, the non-null types notwithstanding. + val productId: String? = id + val title: String? = name + val priceText: String? = priceFormatted + val currencyText: String? = currency + val brandName: String? = brand + val pictureUrl: String? = picture + val originalUrl: String? = imageUrl + val pageUrl: String? = url + val hasOldPrice = (oldPrice ?: 0.0) > price && !oldPriceFormatted.isNullOrEmpty() + val ownDiscount = discount?.takeIf { it > 0 } + val discountNumber = (ownDiscount ?: discountPercent?.takeIf { it > 0 })?.takeIf { hasOldPrice } + val discountText = discountNumber?.let { number -> + val formatted = discountFormatted?.takeIf { ownDiscount != null } + ?.trimStart { it == '-' || it.isWhitespace() } + ?.takeIf { it.isNotEmpty() } + "-" + (formatted ?: "$number%") + } + return PersonalizationProduct( + id = productId.orEmpty(), + name = title.orEmpty(), + price = priceText?.takeIf { it.isNotEmpty() } + ?: listOfNotNull(plainNumber(price), currencyText?.takeIf { it.isNotEmpty() }).joinToString(" "), + imageUrl = pictureUrl?.takeIf { it.isNotEmpty() } ?: originalUrl?.takeIf { it.isNotEmpty() }, + brand = brandName?.takeIf { it.isNotEmpty() }, + oldPrice = if (hasOldPrice) oldPriceFormatted else null, + discount = discountText, + actionText = actionText, + url = pageUrl?.takeIf { it.isNotEmpty() }, + deeplink = deeplinkAndroid?.takeIf { it.isNotEmpty() } + ) +} + +/** `1.6499E7` → `16499000`, `90.0` → `90`. */ +private fun plainNumber(value: Double): String = + if (value.isFinite()) BigDecimal.valueOf(value).stripTrailingZeros().toPlainString() else value.toString() + +/** Card images of the kit's catalog: the host loads them, Glide here. */ +internal val glideCardLoader: (ImageView, PersonalizationProduct) -> Unit = { view, product -> + Glide.with(view).load(product.imageUrl).into(view) +} + +private val mainHandler = Handler(Looper.getMainLooper()) + +/** SDK callbacks arrive on a background thread; views are touched on the main one. */ +internal fun onMain(block: () -> Unit) { + mainHandler.post(block) +} + +internal fun Context.spacing(res: Int): Int = resources.getDimensionPixelSize(res) + +/** Page background of the kit, so its components sit on the surface they were drawn for, light or dark. */ +internal fun Context.pageBackground(): Int = + PersonalizationTheme.color(this, SdkR.color.personalization_background_generic) + +/** Text in the kit's type scale and colours — the product page has no ready kit component for these. */ +internal fun Context.kitText( + fontSize: Int, + lineHeight: Int, + color: Int, + emphasized: Boolean = false, + strikeThrough: Boolean = false +): AppCompatTextView = AppCompatTextView(this).apply { + includeFontPadding = false + typeface = PersonalizationTheme.typeface(context, emphasized) + setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(fontSize)) + TextViewCompat.setLineHeight(this, resources.getDimensionPixelSize(lineHeight)) + setTextColor(PersonalizationTheme.color(context, color)) + if (strikeThrough) paintFlags = paintFlags or Paint.STRIKE_THRU_TEXT_FLAG +} + +/** Kit title row with a back button on the left, as the search results title has. */ +internal fun Context.backTitle(text: CharSequence?, onBack: () -> Unit): PersonalizationTitle = + PersonalizationTitle(this).apply { + this.text = text + setLeading(PersonalizationButton(context).apply { + size = PersonalizationButton.Size.MD + buttonView = PersonalizationButton.ButtonView.GHOST + iconStart = SdkR.drawable.personalization_ic_arrow_left + contentDescription = "Back" + setOnClickListener { onBack() } + }) + } + +/** + * Loading and failure of a screen or a section, from kit parts: the loader, or the empty-state text + * with a Retry button under it (the same pair the catalog shows for a failed first page). + */ +internal class ShopStatus(context: Context) : FrameLayout(context) { + + private val loader = PersonalizationLoader(context) + private val message = PersonalizationEmptyState(context) + private val retry = PersonalizationButton(context) + private val failure = LinearLayout(context) + + init { + val gap = context.spacing(SdkR.dimen.personalization_spacing_xl3) + setPadding(0, gap, 0, gap) + addView(loader, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL)) + retry.size = PersonalizationButton.Size.MD + retry.buttonView = PersonalizationButton.ButtonView.SECONDARY + retry.iconStart = SdkR.drawable.personalization_ic_arrow_rotate_cw + retry.text = RETRY_TEXT + failure.orientation = LinearLayout.VERTICAL + failure.gravity = Gravity.CENTER_HORIZONTAL + failure.addView(message, LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) + failure.addView(retry, LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)) + addView(failure, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + isVisible = false + } + + fun loading() { + isVisible = true + loader.isVisible = true + failure.isVisible = false + } + + fun failed(onRetry: () -> Unit) { + isVisible = true + loader.isVisible = false + message.text = ERROR_TEXT + retry.setOnClickListener { onRetry() } + failure.isVisible = true + } + + fun hide() { + isVisible = false + } +} From 06bbbe011aaa04dcb98573e46a1ce7efeecfe2a0 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Thu, 22 Oct 2026 09:51:24 +0400 Subject: [PATCH 32/65] feat(demo): back stack of the demo shop that survives recreation --- .../demo/shop/ShopNavigator.kt | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/ShopNavigator.kt diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopNavigator.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopNavigator.kt new file mode 100644 index 00000000..7071fc1e --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopNavigator.kt @@ -0,0 +1,99 @@ +package com.personalization.demo.shop + +import android.os.Bundle +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout + +/** A screen of the shop: where it is in the stack, and what it shows. */ +internal sealed class ShopRoute { + object Home : ShopRoute() + data class Category(val id: String, val name: String) : ShopRoute() + data class Product(val id: String) : ShopRoute() + data class Search(val query: String) : ShopRoute() + + /** Three strings per route, so the stack fits a plain string list in the saved state. */ + fun fields(): List = when (this) { + Home -> listOf(HOME, "", "") + is Category -> listOf(CATEGORY, id, name) + is Product -> listOf(PRODUCT, id, "") + is Search -> listOf(SEARCH, query, "") + } + + companion object { + private const val HOME = "home" + private const val CATEGORY = "category" + private const val PRODUCT = "product" + private const val SEARCH = "search" + + fun of(fields: List): ShopRoute? = when (fields.getOrNull(0)) { + HOME -> Home + CATEGORY -> Category(fields[1], fields[2]) + PRODUCT -> Product(fields[1]) + SEARCH -> Search(fields[1]) + else -> null + } + } +} + +internal interface ShopScreen { + val view: View + + /** System back inside the screen — closing an open panel. `false` — the screen itself goes. */ + fun onBack(): Boolean = false +} + +/** + * The shop's own stack of screens with back. Screens under the top one stay in the container, only + * hidden, so coming back finds them as they were — scrolled, loaded, without a second request. + * The routes survive the activity being recreated (rotation, the appearance switch of the UI Kit tab); + * the screens are built again from them. + */ +internal class ShopNavigator( + private val container: FrameLayout, + private val build: (route: ShopRoute, restored: Boolean) -> ShopScreen +) { + private class Entry(val route: ShopRoute, val screen: ShopScreen) + + private val stack = mutableListOf() + + fun push(route: ShopRoute, restored: Boolean = false) { + stack.lastOrNull()?.screen?.view?.visibility = View.GONE + val screen = build(route, restored) + stack += Entry(route, screen) + container.addView( + screen.view, + FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + ) + } + + /** Back from a screen's own button: the screen under it comes back. */ + fun pop(): Boolean { + if (stack.size < 2) return false + val top = stack.removeAt(stack.lastIndex) + container.removeView(top.screen.view) + stack.last().screen.view.visibility = View.VISIBLE + return true + } + + /** System back: the top screen first, then the stack. `false` — nothing left to go back to. */ + fun back(): Boolean = stack.lastOrNull()?.screen?.onBack() == true || pop() + + fun save(): Bundle = Bundle().apply { + putStringArrayList(KEY_ROUTES, ArrayList(stack.flatMap { it.route.fields() })) + } + + /** Builds the saved stack again, or starts at Home. */ + fun restore(state: Bundle?) { + val routes = state?.getStringArrayList(KEY_ROUTES).orEmpty() + .chunked(3) + .mapNotNull(ShopRoute::of) + .takeIf { it.firstOrNull() == ShopRoute.Home } + ?: listOf(ShopRoute.Home) + routes.forEach { push(it, restored = state != null) } + } + + private companion object { + const val KEY_ROUTES = "routes" + } +} From dec41514c7d84d41bdfc8a20723c32f7f1de05a3 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Thu, 22 Oct 2026 09:51:24 +0400 Subject: [PATCH 33/65] feat(demo): shop home, category, product and search screens --- .../com/personalization/demo/shop/DemoShop.kt | 104 ++++++++++ .../personalization/demo/shop/ShopCategory.kt | 110 +++++++++++ .../com/personalization/demo/shop/ShopHome.kt | 187 ++++++++++++++++++ .../personalization/demo/shop/ShopProduct.kt | 143 ++++++++++++++ 4 files changed, 544 insertions(+) create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/ShopCategory.kt create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/ShopHome.kt create mode 100644 demo-app/src/main/java/com/personalization/demo/shop/ShopProduct.kt diff --git a/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt b/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt new file mode 100644 index 00000000..5adb8d41 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt @@ -0,0 +1,104 @@ +package com.personalization.demo.shop + +import android.content.Context +import android.os.Bundle +import android.util.Log +import android.view.View +import android.widget.FrameLayout +import com.personalization.SDK +import com.personalization.api.OnApiCallbackListener +import com.personalization.api.models.tracking.TrackingItem +import com.personalization.ui.components.PersonalizationToast +import com.personalization.ui.widgets.PersonalizationSearchResultsScreen +import org.json.JSONObject + +/** + * "Shop" tab — a small shop put together from the UI kit and the public SDK methods, the way a host + * app would build one. It is the live integration example of the kit: + * - Home ([ShopHome]) — the instant search field, the stories bar, a recommender block and the + * shop's top-level categories; + * - Category ([ShopCategory]) — the kit's catalog over `getCategory`, page by page; + * - Product ([ShopProduct]) — `getProductInfo`, the view tracked, similar products under it; + * - Search ([ShopSearch]) — the kit's search results screen. + * + * There is no cart screen: "Add to cart" anywhere tracks the event and shows the kit's toast. + * Attribution of the recommender block is set by the block itself before it hands over a product. + */ +internal class DemoShop( + val context: Context, + val sdk: SDK, + val shopId: String, + val storiesCode: String, + container: FrameLayout +) { + private val navigator = ShopNavigator(container, ::screen) + + /** Shows the saved stack, or Home. */ + fun start(state: Bundle?) = navigator.restore(state) + + fun save(): Bundle = navigator.save() + + fun open(route: ShopRoute) = navigator.push(route) + + /** A screen's own back button. */ + fun close() { + navigator.pop() + } + + /** System back; `false` — the shop is at Home with nothing open. */ + fun back(): Boolean = navigator.back() + + /** The cart of the demo: the `cart` event and a toast, no cart screen. */ + fun addToCart(anchor: View, itemId: String, price: Double? = null) { + sdk.tracking.addToCart( + item = TrackingItem(id = itemId, price = price), + listener = object : OnApiCallbackListener() { + override fun onSuccess(response: JSONObject?) { + Log.d(TAG, "addToCart($itemId) sent") + } + + override fun onError(code: Int, msg: String?) { + Log.w(TAG, "addToCart($itemId) failed: $code $msg") + } + } + ) + PersonalizationToast.show(anchor, "Added to cart") + } + + private fun screen(route: ShopRoute, restored: Boolean): ShopScreen = when (route) { + ShopRoute.Home -> ShopHome(this) + is ShopRoute.Category -> ShopCategory(this, route, trackView = !restored) + is ShopRoute.Product -> ShopProduct(this, route, trackView = !restored) + is ShopRoute.Search -> ShopSearch(this, route) + } + + private companion object { + const val TAG = "DemoShop" + } +} + +/** + * Search results for a phrase submitted on Home. The screen runs the search, its paging and filters + * itself and tracks `search`; a tap remembers the `full_search` source and opens the product page. + * No sort picker in this iteration, so the sort button is off. + */ +internal class ShopSearch(private val shop: DemoShop, route: ShopRoute.Search) : ShopScreen { + + private val screen = PersonalizationSearchResultsScreen(shop.context).apply { + shopId = shop.shopId + showSort = false + productActionText = ADD_TO_CART_TEXT + onBack = { shop.close() } + onProductClick = { product -> shop.open(ShopRoute.Product(product.id)) } + onProductAction = { product -> shop.addToCart(this, product.id, product.price) } + query = route.query + } + + override val view: View = screen + + override fun onBack(): Boolean { + if (!screen.isFiltersOpen) return false + screen.closeFilters() + return true + } +} diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopCategory.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopCategory.kt new file mode 100644 index 00000000..37d9da70 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopCategory.kt @@ -0,0 +1,110 @@ +package com.personalization.demo.shop + +import android.content.Context +import android.view.View +import com.personalization.R as SdkR +import com.personalization.api.responses.category.CategoryResponse +import com.personalization.api.responses.product.Product +import com.personalization.ui.components.PersonalizationButtonGroup +import com.personalization.ui.components.PersonalizationCatalog +import com.personalization.ui.components.PersonalizationProductsGrid + +/** + * A category: `getCategory(id, limit = 20, page)` page by page in the kit's catalog. The title row + * carries back, the category name and the grid ⇄ list switch; under the products — "Showing N of M" + * and "Load more". The catalog draws the empty state, and the error of a failed first page with + * Retry; a failed next page turns "Load more" into Retry for that page. No filters or sorting in this + * iteration. + */ +internal class ShopCategory( + private val shop: DemoShop, + private val route: ShopRoute.Category, + trackView: Boolean +) : ShopScreen { + + private val context: Context = shop.context + private val catalog = PersonalizationCatalog(context) + private val loaded = mutableListOf() + private var total = 0 + private var page = 0 + private var hasMore = false + private var loading = false + private var request = 0 + + override val view: View = catalog + + init { + val gap = context.spacing(SdkR.dimen.personalization_spacing_xl) + catalog.setPadding(gap, gap, gap, gap) + catalog.setBackgroundColor(context.pageBackground()) + catalog.setHeader(context.backTitle(route.name) { shop.close() }.apply { + setTrailing(PersonalizationButtonGroup(context).apply { + size = PersonalizationButtonGroup.Size.MD + items = listOf( + PersonalizationButtonGroup.Item(SdkR.drawable.personalization_ic_grid_2x2, SdkR.drawable.personalization_ic_grid_2x2_fill), + PersonalizationButtonGroup.Item(SdkR.drawable.personalization_ic_list, SdkR.drawable.personalization_ic_list_fill) + ) + onSelected = { index -> + catalog.view = if (index == 0) PersonalizationProductsGrid.View.GRID else PersonalizationProductsGrid.View.LIST + } + }) + }) + catalog.imageLoader = glideCardLoader + catalog.retryText = RETRY_TEXT + catalog.onRetry = { load(1) } + catalog.onLoadMore = { load(page + 1) } + catalog.onProductClick = { card -> shop.open(ShopRoute.Product(card.id)) } + catalog.onProductAction = { card -> + shop.addToCart(catalog, card.id, loaded.firstOrNull { it.id == card.id }?.price) + } + if (trackView) shop.sdk.tracking.categoryView(route.id) + load(1) + } + + private fun load(target: Int) { + if (loading) return + loading = true + val seq = ++request + catalog.errorText = null + catalog.isLoading = true + shop.sdk.categoryManager.getCategory( + category = route.id, + limit = PAGE_SIZE, + page = target, + onSuccess = { response -> onMain { if (seq == request) onPage(target, response) } }, + onError = { _, _ -> onMain { if (seq == request) onFailure() } } + ) + } + + private fun onPage(target: Int, response: CategoryResponse) { + loading = false + // Gson leaves null in a missing list, the non-null type notwithstanding. + val products: List? = response.products + val items = products.orEmpty() + page = target + total = maxOf(response.productsTotal, loaded.size + items.size) + loaded += items + hasMore = items.isNotEmpty() && loaded.size < total + catalog.isLoading = false + // Empty state only for an answer: before it the catalog shows just the loader. + catalog.emptyText = "No products in this category yet." + catalog.products = loaded.map { it.toCard() } + catalog.setCount(if (loaded.isEmpty()) null else "Showing", loaded.size, "of", total) + catalog.loadMoreText = if (hasMore) "Load more" else null + } + + private fun onFailure() { + loading = false + catalog.isLoading = false + if (loaded.isEmpty()) { + catalog.errorText = ERROR_TEXT + } else { + // The next page did not come: the button retries it. + catalog.loadMoreText = RETRY_TEXT + } + } + + private companion object { + const val PAGE_SIZE = 20 + } +} diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopHome.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopHome.kt new file mode 100644 index 00000000..aeea29f8 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopHome.kt @@ -0,0 +1,187 @@ +package com.personalization.demo.shop + +import android.content.Context +import android.view.View +import android.view.ViewGroup +import android.view.inputmethod.InputMethodManager +import android.widget.LinearLayout +import android.widget.ScrollView +import androidx.core.view.isVisible +import com.personalization.OnClickListener +import com.personalization.Product +import com.personalization.R as SdkR +import com.personalization.api.responses.search.Category +import com.personalization.ui.components.PersonalizationSuggestionRow +import com.personalization.ui.components.PersonalizationTitle +import com.personalization.ui.widgets.PersonalizationInstantSearchField +import com.personalization.ui.widgets.PersonalizationRecommenderBlock +import com.personalization.ui.widgets.PersonalizationStories + +/** + * Shop home: the instant search field on top, then the stories bar, the recommender block and the + * shop's top-level categories. + * + * The field brings its own panel — recent searches, suggestions, categories, products. Here it opens + * only while the field has the focus, with the rest of the page out of the way, as in a store app; + * "Cancel" or system back closes it. Submitting a phrase opens the results, a product its page. + * The panel is switched with the field's own show* flags, and an empty query makes it redraw. + */ +internal class ShopHome(private val shop: DemoShop) : ShopScreen { + + private val context: Context = shop.context + private val field = PersonalizationInstantSearchField(context) + private val sections = LinearLayout(context) + private val categories = LinearLayout(context) + private val categoriesStatus = ShopStatus(context) + private val page = LinearLayout(context) + private var searching = false + private var request = 0 + + override val view: View = ScrollView(context).apply { + isFillViewport = true + setBackgroundColor(context.pageBackground()) + } + + init { + val gap = context.spacing(SdkR.dimen.personalization_spacing_xl) + val blockGap = context.spacing(SdkR.dimen.personalization_spacing_xl3) + page.orientation = LinearLayout.VERTICAL + page.setPadding(gap, gap, gap, gap) + // The page, not the field, holds the focus at rest: a focused field is an open panel. + page.isFocusableInTouchMode = true + sections.orientation = LinearLayout.VERTICAL + categories.orientation = LinearLayout.VERTICAL + + setUpField() + page.addView(field, matchWidth()) + sections.addView(stories(), matchWidth(top = blockGap)) + sections.addView(recommenderBlock(), matchWidth(top = blockGap)) + sections.addView(PersonalizationTitle(context).apply { text = "Categories" }, matchWidth(top = blockGap)) + sections.addView(categories, matchWidth(top = context.spacing(SdkR.dimen.personalization_spacing_md))) + sections.addView(categoriesStatus, matchWidth()) + page.addView(sections, matchWidth()) + (view as ScrollView).addView(page, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) + loadCategories() + } + + override fun onBack(): Boolean { + if (!searching) return false + closeSearch() + return true + } + + private fun setUpField() { + field.shopId = shop.shopId + field.placeholder = "Search" + field.recentLabel = "Recent searches" + field.clearText = "Clear" + field.moreText = "more" + field.categoriesLabel = "Categories" + field.productsLabel = "Products" + field.showImages = true + showPanel(false) + field.view.input.editText.setOnFocusChangeListener { _, focused -> if (focused) openSearch() } + field.onCancel = { closeSearch() } + field.onSubmit = { query -> + closeSearch() + shop.open(ShopRoute.Search(query)) + } + field.onProductClick = { product -> + closeSearch() + shop.open(ShopRoute.Product(product.id)) + } + // Categories of a typed query come with their id; the popular ones of the empty field only + // with a name and a link, so those run as a search. + field.onCategoryClick = { category -> + closeSearch() + val id = category.id + shop.open(if (id.isNullOrEmpty()) ShopRoute.Search(category.name) else ShopRoute.Category(id, category.name)) + } + } + + private fun openSearch() { + if (searching) return + searching = true + sections.isVisible = false + showPanel(true) + } + + private fun closeSearch() { + if (!searching) return + searching = false + showPanel(false) + val input = field.view.input.editText + (context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager) + ?.hideSoftInputFromWindow(input.windowToken, 0) + page.requestFocus() + sections.isVisible = true + } + + private fun showPanel(show: Boolean) { + field.showRecent = show + field.showSuggestions = show + field.showCategories = show + field.showProducts = show + field.cancelText = if (show) "Cancel" else null + field.query = "" + } + + /** The stories block the demo uses everywhere; a product tapped in a story opens its page here. */ + private fun stories(): View = PersonalizationStories(context).apply { + shopId = shop.shopId + code = shop.storiesCode + onClickListener = object : OnClickListener { + // Links stay with the SDK: it opens them itself. + override fun onClick(url: String): Boolean = true + + // `false` — the host handled it: the viewer closes and the shop opens the product. + override fun onClick(product: Product): Boolean { + shop.open(ShopRoute.Product(product.id)) + return false + } + } + } + + private fun recommenderBlock(): View = PersonalizationRecommenderBlock(context).apply { + shopId = shop.shopId + code = SHOP_BLOCK_CODE + actionText = ADD_TO_CART_TEXT + onProductClick = { product -> shop.open(ShopRoute.Product(product.id)) } + onProductAction = { product -> shop.addToCart(this, product.id) } + } + + /** Top-level categories (no parent) out of the `categories` facet of the products listing. */ + private fun loadCategories() { + val seq = ++request + categoriesStatus.loading() + shop.sdk.productsManager.getProductsList( + limit = 1, + onSuccess = { response -> onMain { if (seq == request) showCategories(response.categories) } }, + onError = { _, _ -> onMain { if (seq == request) categoriesStatus.failed(::loadCategories) } } + ) + } + + private fun showCategories(all: List?) { + categoriesStatus.hide() + categories.removeAllViews() + val rowPadding = context.spacing(SdkR.dimen.personalization_spacing_lg) + all.orEmpty().forEach { category -> + // Gson leaves null in missing fields, the non-null types notwithstanding. + val id: String? = category.id + val name: String? = category.name + val parent: String? = category.parent + if (id.isNullOrEmpty() || !parent.isNullOrEmpty()) return@forEach + categories.addView(PersonalizationSuggestionRow(context).apply { + kind = PersonalizationSuggestionRow.Kind.CATEGORY + title = name ?: id + setPadding(0, rowPadding, 0, rowPadding) + setOnClickListener { shop.open(ShopRoute.Category(id, name ?: id)) } + }, matchWidth()) + } + } + + private fun matchWidth(top: Int = 0): LinearLayout.LayoutParams = + LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + topMargin = top + } +} diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopProduct.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopProduct.kt new file mode 100644 index 00000000..d57f2b85 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopProduct.kt @@ -0,0 +1,143 @@ +package com.personalization.demo.shop + +import android.content.Context +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.LinearLayout +import android.widget.ScrollView +import androidx.core.view.isVisible +import com.bumptech.glide.Glide +import com.personalization.R as SdkR +import com.personalization.api.responses.product.Product +import com.personalization.ui.components.PersonalizationBadge +import com.personalization.ui.components.PersonalizationButton +import com.personalization.ui.components.PersonalizationProductImage +import com.personalization.ui.widgets.PersonalizationRecommenderBlock + +/** + * A product page: `getProductInfo(id)` — image, brand, name, price with the old one and the discount + * (by the card rules, see [toCard]) and "Add to cart". Opening it tracks the product view. Under it — + * the recommender block for this product, "Similar products", shown with the product. While the + * product loads — the kit's loader; a failed load — text and Retry. + */ +internal class ShopProduct( + private val shop: DemoShop, + private val route: ShopRoute.Product, + trackView: Boolean +) : ShopScreen { + + private val context: Context = shop.context + private val image = PersonalizationProductImage(context) + private val brand = context.kitText( + SdkR.dimen.personalization_font_size_sm, SdkR.dimen.personalization_line_height_sm, + SdkR.color.personalization_text_secondary + ) + private val name = context.kitText( + SdkR.dimen.personalization_font_size_xl, SdkR.dimen.personalization_line_height_xl, + SdkR.color.personalization_text_primary, emphasized = true + ) + private val price = context.kitText( + SdkR.dimen.personalization_font_size_xl2, SdkR.dimen.personalization_line_height_xl2, + SdkR.color.personalization_text_primary, emphasized = true + ) + private val oldPrice = context.kitText( + SdkR.dimen.personalization_font_size_base, SdkR.dimen.personalization_line_height_base, + SdkR.color.personalization_text_hint, strikeThrough = true + ) + private val discount = PersonalizationBadge(context).apply { + size = PersonalizationBadge.Size.MD + badgeView = PersonalizationBadge.BadgeView.DANGER + } + private val addToCart = PersonalizationButton(context).apply { + size = PersonalizationButton.Size.LG + buttonView = PersonalizationButton.ButtonView.PRIMARY + text = ADD_TO_CART_TEXT + } + private val details = LinearLayout(context) + private val status = ShopStatus(context) + private var request = 0 + + override val view: View = ScrollView(context).apply { + isFillViewport = true + setBackgroundColor(context.pageBackground()) + } + + init { + val gap = context.spacing(SdkR.dimen.personalization_spacing_xl) + val small = context.spacing(SdkR.dimen.personalization_spacing_md) + val page = LinearLayout(context).apply { + orientation = LinearLayout.VERTICAL + setPadding(gap, gap, gap, gap) + } + page.addView(context.backTitle(null) { shop.close() }, matchWidth()) + page.addView(status, matchWidth()) + + details.orientation = LinearLayout.VERTICAL + details.isVisible = false + details.addView(image, matchWidth(top = small)) + details.addView(brand, matchWidth(top = gap)) + details.addView(name, matchWidth(top = small)) + details.addView(LinearLayout(context).apply { + orientation = LinearLayout.HORIZONTAL + gravity = Gravity.CENTER_VERTICAL + addView(price) + addView(oldPrice, wrap(start = small)) + addView(discount, wrap(start = small)) + }, matchWidth(top = gap)) + details.addView(addToCart, matchWidth(top = gap)) + details.addView(similar(), matchWidth(top = context.spacing(SdkR.dimen.personalization_spacing_xl4))) + page.addView(details, matchWidth()) + (view as ScrollView).addView(page, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) + + if (trackView) shop.sdk.tracking.productView(route.id) + load() + } + + private fun load() { + val seq = ++request + status.loading() + shop.sdk.productsManager.getProductInfo( + itemId = route.id, + onSuccess = { product -> onMain { if (seq == request) show(product) } }, + onError = { _, _ -> onMain { if (seq == request) status.failed(::load) } } + ) + } + + private fun show(product: Product) { + val card = product.toCard() + status.hide() + Glide.with(image.imageView).load(card.imageUrl).into(image.imageView) + brand.text = card.brand + brand.isVisible = !card.brand.isNullOrEmpty() + name.text = card.name + price.text = card.price + oldPrice.text = card.oldPrice + oldPrice.isVisible = !card.oldPrice.isNullOrEmpty() + discount.text = card.discount + discount.isVisible = !card.discount.isNullOrEmpty() + addToCart.setOnClickListener { shop.addToCart(addToCart, card.id, product.price) } + details.isVisible = true + } + + /** The shop's recommender block for this product; it stays hidden until it has products. */ + private fun similar(): View = PersonalizationRecommenderBlock(context).apply { + shopId = shop.shopId + itemId = route.id + code = SHOP_BLOCK_CODE + title = "Similar products" + actionText = ADD_TO_CART_TEXT + onProductClick = { product -> shop.open(ShopRoute.Product(product.id)) } + onProductAction = { product -> shop.addToCart(this, product.id) } + } + + private fun matchWidth(top: Int = 0): LinearLayout.LayoutParams = + LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + topMargin = top + } + + private fun wrap(start: Int): LinearLayout.LayoutParams = + LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + marginStart = start + } +} From ebe6b9bb23021c1d54499a7422efc8f8e8cd36d8 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Thu, 22 Oct 2026 09:51:24 +0400 Subject: [PATCH 34/65] feat(demo): Shop tab in the bottom navigation --- .../com/personalization/demo/MainActivity.kt | 43 ++++++++++++++++++- .../src/main/res/drawable/ic_tab_shop.xml | 7 +++ .../src/main/res/layout/activity_main.xml | 11 ++++- .../src/main/res/menu/bottom_nav_menu.xml | 5 +++ demo-app/src/main/res/values/strings.xml | 1 + 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 demo-app/src/main/res/drawable/ic_tab_shop.xml diff --git a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt index 475a0025..6604eea5 100644 --- a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt +++ b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt @@ -14,7 +14,9 @@ import android.view.View import android.widget.Button import android.widget.CheckBox import android.widget.TextView +import android.widget.FrameLayout import android.widget.Toast +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -42,6 +44,7 @@ import com.personalization.api.models.purchase.PurchaseTrackingRequest import com.personalization.api.params.ProductItemParams import com.personalization.api.params.PurchasePredictParams import com.personalization.demo.BuildConfig +import com.personalization.demo.shop.DemoShop import com.personalization.sdk.data.models.dto.popUp.Components import org.json.JSONObject import com.personalization.sdk.data.models.dto.popUp.PopupActions @@ -58,9 +61,26 @@ class MainActivity : AppCompatActivity() { /** Bottom tab currently shown, kept so it survives the activity being recreated. */ private var selectedTabId = R.id.tabApi + /** The "Shop" tab, see [DemoShop]. */ + private lateinit var shop: DemoShop + + /** + * System back walks the shop's own stack while its tab is shown; at the shop's Home it falls + * through to the system. + */ + private val shopBack = object : OnBackPressedCallback(false) { + override fun handleOnBackPressed() { + if (shop.back()) return + isEnabled = false + onBackPressedDispatcher.onBackPressed() + isEnabled = selectedTabId == R.id.tabShop + } + } + private companion object { const val MAX_LOGGED_STORIES_EVENTS = 20 const val STATE_SELECTED_TAB = "selectedTabId" + const val STATE_SHOP = "shop" } private object DemoTrackingNamespaceConstants { @@ -147,6 +167,7 @@ class MainActivity : AppCompatActivity() { // Show the registered push provider(s) + token (FCM and/or HMS) in the header. observePushTokens() + setupShop(savedInstanceState?.getBundle(STATE_SHOP)) setupStoriesTabs() findViewById +

Вы — ✕, компьютер — ◯. Первый ход по очереди

+ + + + + + + diff --git a/demo-app/src/main/java/com/personalization/demo/DemoLink.kt b/demo-app/src/main/java/com/personalization/demo/DemoLink.kt new file mode 100644 index 00000000..784e7da4 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/DemoLink.kt @@ -0,0 +1,90 @@ +package com.personalization.demo + +import android.content.Context +import com.personalization.demo.game.GameActivity +import java.net.URI +import java.net.URLDecoder + +/** + * What a link that comes to the demo is — from outside (the intent filters of the manifest) or from a + * popup or a story of the demo: + * - [GAME] — the demo's mini-game: `rees46://game`, the host `game` with the scheme of any of the demos + * (`rees46`, `rees46flutter`, `rees46rn`), so one link in a popup or a story opens the game in each of + * them. `rees46://game?url=` opens a game of one's own from that address ([gameAddress]); + * - [STORIES] — a stories link: any scheme, host and path, the `r46_stories` parameter matters (it wins + * over the game host); + * - [OTHER] — anything else. + */ +internal enum class DemoLink { + GAME, STORIES, OTHER; + + companion object { + /** Link schemes of the demos: this one's ([DEMO_LINK_SCHEME]), the Flutter and React Native ones. */ + val SCHEMES = setOf(DEMO_LINK_SCHEME, "rees46flutter", "rees46rn") + + const val GAME_HOST = "game" + + private const val STORIES_PARAMETER = "r46_stories" + + /** The parameter of a game link with the address of a game of one's own. */ + private const val GAME_ADDRESS_PARAMETER = "url" + + /** `scheme://authority` at the start of a link. */ + private val START = Regex("^([A-Za-z][A-Za-z0-9+.-]*)://([^/?#]*)") + + fun of(url: String): DemoLink { + val link = url.trim() + if (parameters(link).any { it.first == STORIES_PARAMETER }) return STORIES + val start = START.find(link) ?: return OTHER + val scheme = start.groupValues[1].lowercase() + // The host without a user (`user@`) and a port (`:80`). + val host = start.groupValues[2].substringAfterLast('@').substringBefore(':').lowercase() + return if (scheme in SCHEMES && host == GAME_HOST) GAME else OTHER + } + + /** + * The address of a game of one's own in a game link — the `url` parameter, encoded as a query + * value: `rees46://game?url=https%3A%2F%2Fexample.com%2Fgame`. Only an `https` address with a host; + * `null` — not a game link, no address, or one that is not `https` or does not parse: the demo's + * own game opens. + */ + fun gameAddress(url: String): String? { + if (of(url) != GAME) return null + val value = parameters(url.trim()).firstOrNull { it.first == GAME_ADDRESS_PARAMETER }?.second ?: return null + val address = try { + URLDecoder.decode(value, Charsets.UTF_8.name()).trim() + } catch (exception: IllegalArgumentException) { + return null + } + val uri = try { + URI(address) + } catch (exception: Exception) { + return null + } + return address.takeIf { uri.scheme.equals("https", ignoreCase = true) && !uri.host.isNullOrEmpty() } + } + + /** + * The query parameters of a link — from the first `?` to a `#` after it, as the SDK reads a stories + * link — names with their values as they are written (not decoded). + */ + private fun parameters(link: String): List> { + val start = link.indexOf('?') + if (start < 0) return emptyList() + val end = link.indexOf('#', start).takeIf { it >= 0 } ?: link.length + return link.substring(start + 1, end).split('&') + .map { it.substringBefore('=') to it.substringAfter('=', missingDelimiterValue = "") } + .filter { it.first.isNotEmpty() } + } + } +} + +/** + * Opens the game over the screen of [context] when [url] is a game link; `false` — it is not, nothing + * opens. + */ +internal fun openGameLink(context: Context, url: String): Boolean { + if (DemoLink.of(url) != DemoLink.GAME) return false + GameActivity.start(context, url) + return true +} diff --git a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt index 1a9c9f1f..9666c3dd 100644 --- a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt +++ b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt @@ -266,19 +266,19 @@ class MainActivity : AppCompatActivity() { showLastCrashIfAny() // App may have been opened by tapping a push — report the click to the SDK. handleNotificationClick(intent) - // Or by a stories link; a recreated activity (rotation, theme) must not open it again. - if (savedInstanceState == null) handleStoriesLink(intent) + // Or by a stories or a game link; a recreated activity (rotation, theme) must not open it again. + if (savedInstanceState == null) handleLink(intent) } override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) handleNotificationClick(intent) - handleStoriesLink(intent) + handleLink(intent) } - /** A stories link opened the demo: its campaign opens over whatever tab is shown. */ - private fun handleStoriesLink(intent: Intent?) = openStoriesLinkIntent(this, intent, BuildConfig.SHOP_ID) + /** A stories link opened the demo: its campaign opens over whatever tab is shown; the game link, the game. */ + private fun handleLink(intent: Intent?) = openLinkIntent(this, intent, BuildConfig.SHOP_ID) /** * Safety net for a known Jetpack Compose bug: on some OEM devices (notably Huawei/EMUI) a stray @@ -1183,6 +1183,9 @@ class MainActivity : AppCompatActivity() { shop.open(ShopRoute.Product(product.id)) true } + // A popup's game link opens the game over the demo, not through the system, and the popup closes, + // as after a product; the other links go on as before. + sdk.popups.linkHandler = { url -> openGameLink(this, url) } shop.start(state) onBackPressedDispatcher.addCallback(this, shopBack) } @@ -1235,8 +1238,9 @@ class MainActivity : AppCompatActivity() { } override fun onDestroy() { - // The handler holds this activity's shop; a recreated activity sets its own. + // The handlers hold this activity and its shop; a recreated activity sets its own. sdk.popups.productHandler = null + sdk.popups.linkHandler = null super.onDestroy() } diff --git a/demo-app/src/main/java/com/personalization/demo/PopupsV3Demo.kt b/demo-app/src/main/java/com/personalization/demo/PopupsV3Demo.kt index b86f962f..2a043a94 100644 --- a/demo-app/src/main/java/com/personalization/demo/PopupsV3Demo.kt +++ b/demo-app/src/main/java/com/personalization/demo/PopupsV3Demo.kt @@ -25,7 +25,8 @@ internal object DemoScreens { */ internal val DEMO_POPUPS: Map = linkedMapOf( 181 to "#181 Banner · top", - 182 to "#182 Modal · center" + 182 to "#182 Modal · center", + 185 to "#185 Fullscreen" ) /** 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 f45829f1..6d1d4553 100644 --- a/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt +++ b/demo-app/src/main/java/com/personalization/demo/StoriesV2Compose.kt @@ -37,7 +37,10 @@ import com.personalization.ui.widgets.PersonalizationStoriesWidget /** API v3 host of the "Stories V2 with Sharing" block, of the stories link field and of deep links. */ internal const val STORIES_API_V3_DOMAIN = "app.rees46.ru" -/** The demo's own link scheme (see the intent filters of MainActivity in the manifest). */ +/** + * The demo's own link scheme (see the intent filters of MainActivity in the manifest): stories links + * and the game link. + */ internal const val DEMO_LINK_SCHEME = "rees46" /** @@ -74,12 +77,12 @@ internal fun openStoriesLink( ) /** - * A stories link opened the app — `rees46://…` or `https://demo.rees46.ru/…` (see the manifest): any - * host and path, only `r46_stories` matters. The campaign opens over whatever [activity] shows. - * A link to the demo site that is not a stories link (a popup's "Learn more", say) goes on to the - * browser. + * A link opened the app — `rees46://…` or `https://demo.rees46.ru/…` (see the manifest), told apart by + * [DemoLink]. A stories link (any host and path, only `r46_stories` matters) opens its campaign over + * whatever [activity] shows; the game link (`rees46://game`) opens the game over it. A link to the demo + * site that is neither (a popup's "Learn more", say) goes on to the browser. */ -internal fun openStoriesLinkIntent( +internal fun openLinkIntent( activity: Activity, intent: Intent?, shopId: String, @@ -87,9 +90,16 @@ internal fun openStoriesLinkIntent( ) { if (intent?.action != Intent.ACTION_VIEW) return val url = intent.dataString ?: return - if (!url.contains("r46_stories=")) { - if (intent.data?.scheme?.lowercase() in setOf("http", "https")) openInBrowser(activity, url) - return + when (DemoLink.of(url)) { + DemoLink.GAME -> { + openGameLink(activity, url) + return + } + DemoLink.OTHER -> { + if (intent.data?.scheme?.lowercase() in setOf("http", "https")) openInBrowser(activity, url) + return + } + DemoLink.STORIES -> Unit } val opened = openStoriesLink( context = activity, @@ -207,10 +217,12 @@ internal fun StoriesV2ComposeExhibit(storiesCode: String, shopId: String) { /** * 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". + * OnClickListener contract: `true` means "SDK, open it", `false` means "the host handled it". The game + * link opens the game here, without the system. */ internal class DemoStoriesClicks(private val context: Context) : OnClickListener { override fun onClick(url: String): Boolean { + if (openGameLink(context, url)) return false toast("Link: $url") return false } diff --git a/demo-app/src/main/java/com/personalization/demo/game/GameActivity.kt b/demo-app/src/main/java/com/personalization/demo/game/GameActivity.kt new file mode 100644 index 00000000..4e801875 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/game/GameActivity.kt @@ -0,0 +1,163 @@ +package com.personalization.demo.game + +import android.annotation.SuppressLint +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.content.Intent +import android.os.Bundle +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.LinearLayout +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import com.personalization.R as SdkR +import com.personalization.Rees46 +import com.personalization.SDK +import com.personalization.demo.BuildConfig +import com.personalization.demo.shop.circleButton +import com.personalization.demo.shop.isNight +import com.personalization.demo.shop.kitText +import com.personalization.demo.shop.onSystemBars +import com.personalization.demo.shop.pageBackground +import com.personalization.demo.shop.spacing + +/** + * The demo's mini-game, full screen over the screen it was opened from: a panel with the title and the + * close button, under it the game — a web page ([GamePage]). For the SDK it is an ordinary deep link + * (`rees46://game`, see [com.personalization.demo.DemoLink]): a button of a popup or a story, or a link + * from outside, opens it; the game itself is the app's, and the page plays it all by itself — there is + * no bridge to the app. The panel's cross and the system back go back where the game was opened from. + * + * The page gets the theme of the app in its address; the screen and the page's view take the kit's page + * background, so nothing flashes white while it loads. A rotation keeps the game (the activity handles + * it itself, see the manifest); a theme switch starts it again in the new theme. While the game is on screen + * the popups of triggers do not show ([GamePopups]): they would cover it. + * + * No action bar, edge to edge: the screen makes room for the system bars itself. + */ +class GameActivity : AppCompatActivity() { + + private lateinit var page: WebView + + /** The address the page was loaded from. */ + private var loaded: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() + super.onCreate(savedInstanceState) + val screen = LinearLayout(this).apply { + orientation = LinearLayout.VERTICAL + setBackgroundColor(pageBackground()) + } + screen.addView(panel(), LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) + page = webPage() + screen.addView(page, LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f)) + screen.onSystemBars { top, bottom -> screen.setPadding(0, top, 0, bottom) } + setContentView(screen) + load(intent) + } + + /** One more game link while the game is on top: another game opens in its place, the same one stays. */ + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + load(intent) + } + + private fun load(intent: Intent) { + val url = GamePage.url(intent.getStringExtra(EXTRA_LINK), isNight) + if (url == loaded) return + loaded = url + page.loadUrl(url) + } + + // Before super: the SDK hears of the started activity in it and may decide on a popup at once. + override fun onStart() { + popups.started() + super.onStart() + } + + override fun onStop() { + super.onStop() + popups.stopped() + } + + override fun onResume() { + super.onResume() + page.onResume() + } + + override fun onPause() { + page.onPause() + super.onPause() + } + + override fun onDestroy() { + page.destroy() + super.onDestroy() + } + + /** "Крестики-нолики" on the left; on the right, centred on its line, the round close button. */ + private fun panel(): View = LinearLayout(this).apply { + orientation = LinearLayout.HORIZONTAL + gravity = Gravity.CENTER_VERTICAL + val edge = spacing(SdkR.dimen.personalization_spacing_padding_x) + val vertical = spacing(SdkR.dimen.personalization_spacing_md) + setPadding(edge, vertical, edge, vertical) + addView( + kitText( + SdkR.dimen.personalization_font_size_xl, SdkR.dimen.personalization_line_height_xl, + SdkR.color.personalization_text_primary, emphasized = true + ).apply { text = TITLE_TEXT }, + LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f) + ) + val close = circleButton( + SdkR.drawable.personalization_ic_cross_large, SdkR.color.personalization_background_card, CLOSE_TEXT + ) { finish() } + addView(close, LinearLayout.LayoutParams(close.layoutParams)) + } + + /** The view of the page: scripts on, links of the page stay in it, the kit's background under it. */ + @SuppressLint("SetJavaScriptEnabled") + private fun webPage(): WebView = WebView(this).apply { + setBackgroundColor(pageBackground()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + webViewClient = WebViewClient() + } + + companion object { + private const val EXTRA_LINK = "link" + + private const val TITLE_TEXT = "Крестики-нолики" + private const val CLOSE_TEXT = "Закрыть" + + /** The popups of the demo shop, the one popups v3 are on for. */ + private val popups = GamePopups( + read = { shopSdk()?.enableAutoPopupPresentation }, + write = { on -> shopSdk()?.enableAutoPopupPresentation = on } + ) + + /** `null` — the shop did not initialize. */ + private fun shopSdk(): SDK? = runCatching { Rees46.getInstance(BuildConfig.SHOP_ID) }.getOrNull() + + /** Opens the game of the game link [link] over the screen of [context]. */ + fun start(context: Context, link: String) { + val intent = Intent(context, GameActivity::class.java).putExtra(EXTRA_LINK, link) + // Outside an activity there is no screen to go over: the game starts the demo's task. + if (context.activity == null) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + } + + private val Context.activity: Activity? + get() = when (this) { + is Activity -> this + is ContextWrapper -> baseContext?.activity + else -> null + } + } +} diff --git a/demo-app/src/main/java/com/personalization/demo/game/GamePage.kt b/demo-app/src/main/java/com/personalization/demo/game/GamePage.kt new file mode 100644 index 00000000..1bbde9fb --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/game/GamePage.kt @@ -0,0 +1,20 @@ +package com.personalization.demo.game + +import com.personalization.demo.DemoLink + +/** What the game screen loads. */ +internal object GamePage { + + /** + * The demo's own game: one web page, the same in every demo, in the assets — no network. It takes + * the theme as `?theme=dark|light`. + */ + const val BUILT_IN = "file:///android_asset/game/tic-tac-toe.html" + + /** + * The page for the game link [link]: the `https` address of its `url` parameter — a game of one's + * own from its server, as it is — or else the demo's own game in the theme of the app. + */ + fun url(link: String?, dark: Boolean): String = + link?.let(DemoLink::gameAddress) ?: "$BUILT_IN?theme=${if (dark) "dark" else "light"}" +} diff --git a/demo-app/src/main/java/com/personalization/demo/game/GamePopups.kt b/demo-app/src/main/java/com/personalization/demo/game/GamePopups.kt new file mode 100644 index 00000000..ba0439e0 --- /dev/null +++ b/demo-app/src/main/java/com/personalization/demo/game/GamePopups.kt @@ -0,0 +1,32 @@ +package com.personalization.demo.game + +/** + * Keeps the popups of triggers off while the game is on screen: the SDK shows a popup over the activity in + * front, and the game would go under it — an app that a game link starts gets its `app_start` popups right + * over the game. The first game screen started turns the automatic presentation off ([write] `false`), the + * last one stopped puts back what it was before; a game screen that takes the place of another starts + * before the old one stops. Popups shown by hand are not affected. + * + * [read] — the automatic presentation now, `null` — no SDK: nothing is turned off. + */ +internal class GamePopups( + private val read: () -> Boolean?, + private val write: (Boolean) -> Unit +) { + private var started = 0 + + /** What the automatic presentation was before the first game screen. */ + private var before: Boolean? = null + + fun started() { + if (started++ > 0) return + before = read() + if (before != null) write(false) + } + + fun stopped() { + if (started == 0 || --started > 0) return + before?.let(write) + before = null + } +} diff --git a/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt b/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt index 6ef781e2..01118b6a 100644 --- a/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt +++ b/demo-app/src/main/java/com/personalization/demo/shop/DemoShop.kt @@ -11,6 +11,7 @@ import com.personalization.Product import com.personalization.SDK import com.personalization.api.OnApiCallbackListener import com.personalization.api.models.tracking.TrackingItem +import com.personalization.demo.openGameLink import com.personalization.ui.PersonalizationTheme import com.personalization.ui.components.PersonalizationToast import com.personalization.ui.widgets.PersonalizationSearchResultsScreen @@ -70,10 +71,11 @@ internal class DemoShop( /** * Clicks of the shop's stories, also of a campaign opened by a link: links stay with the SDK (it - * opens them itself); a product opens its page here — `false`, the host handled it, the viewer closes. + * opens them itself); the game link opens the game and a product its page here — `false`, the host + * handled it, the viewer closes. */ val storiesClicks: OnClickListener = object : OnClickListener { - override fun onClick(url: String): Boolean = true + override fun onClick(url: String): Boolean = !openGameLink(context, url) override fun onClick(product: Product): Boolean { open(ShopRoute.Product(product.id)) diff --git a/demo-app/src/main/java/com/personalization/demo/shop/ShopActivity.kt b/demo-app/src/main/java/com/personalization/demo/shop/ShopActivity.kt index 6f199a78..142ab511 100644 --- a/demo-app/src/main/java/com/personalization/demo/shop/ShopActivity.kt +++ b/demo-app/src/main/java/com/personalization/demo/shop/ShopActivity.kt @@ -12,7 +12,8 @@ import androidx.core.view.updateLayoutParams import com.personalization.Rees46 import com.personalization.demo.BuildConfig import com.personalization.demo.R -import com.personalization.demo.openStoriesLinkIntent +import com.personalization.demo.openGameLink +import com.personalization.demo.openLinkIntent /** * The "shop only" demo — the launcher activity of the `shop` build type (see `src/shop/AndroidManifest.xml`): @@ -20,7 +21,8 @@ import com.personalization.demo.openStoriesLinkIntent * same shop instance [com.personalization.demo.DemoApplication] initializes for the full demo. * * Stories links (`rees46://…`, `https://demo.rees46.ru/…`) open their campaign over the shop, on a cold - * start and while the shop is open; a product tapped in that campaign opens its page in the shop. + * start and while the shop is open; a product tapped in that campaign opens its page in the shop. The + * game link (`rees46://game`) opens the game over the shop, so does a popup's or a story's one. * * No action bar, edge to edge: the system bars are transparent, with icons for the light or dark theme, * and the shop's screens make room for them themselves. The status bar shows the surface of the screen @@ -69,6 +71,9 @@ class ShopActivity : AppCompatActivity() { shop.open(ShopRoute.Product(product.id)) true } + // A popup's game link opens the game over the shop, not through the system, and the popup closes, + // as after a product; the other links go on as before. + shop.sdk.popups.linkHandler = { url -> openGameLink(this, url) } shop.start(savedInstanceState?.getBundle(STATE_SHOP)) onBackPressedDispatcher.addCallback(this, shopBack) // A recreated activity (rotation, theme) must not handle its push or link again. @@ -81,17 +86,18 @@ class ShopActivity : AppCompatActivity() { handle(intent) } - /** A tapped push reports its click, as in the full demo; a stories link opens its campaign. */ + /** A tapped push reports its click, as in the full demo; a stories link opens its campaign, the game link the game. */ private fun handle(intent: Intent?) { intent?.extras ?.takeIf { it.getString("NOTIFICATION_TYPE") != null || it.getString("NOTIFICATION_ID") != null } ?.let { shop.sdk.notificationClicked(it) } - openStoriesLinkIntent(this, intent, BuildConfig.SHOP_ID, shop.storiesClicks) + openLinkIntent(this, intent, BuildConfig.SHOP_ID, shop.storiesClicks) } override fun onDestroy() { - // The handler holds this activity's shop; a recreated activity sets its own. + // The handlers hold this activity and its shop; a recreated activity sets its own. shop.sdk.popups.productHandler = null + shop.sdk.popups.linkHandler = null super.onDestroy() } diff --git a/demo-app/src/main/res/values/themes.xml b/demo-app/src/main/res/values/themes.xml index 8c092e4b..202ad62a 100644 --- a/demo-app/src/main/res/values/themes.xml +++ b/demo-app/src/main/res/values/themes.xml @@ -24,6 +24,15 @@ @color/body_text_secondary + + + + diff --git a/demo-app/src/test/java/com/personalization/demo/DemoLinkTest.kt b/demo-app/src/test/java/com/personalization/demo/DemoLinkTest.kt new file mode 100644 index 00000000..051b09e0 --- /dev/null +++ b/demo-app/src/test/java/com/personalization/demo/DemoLinkTest.kt @@ -0,0 +1,86 @@ +package com.personalization.demo + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +/** + * The demo tells its links apart in one place: the game link of any of the demos' schemes opens the game + * here, a stories link (`r46_stories`) stays a stories link, the rest goes on as before. + */ +class DemoLinkTest { + + @Test + fun `the game host with the scheme of any of the demos is the game`() { + listOf( + "rees46://game", + "rees46flutter://game", + "rees46rn://game", + "rees46://game/", + "rees46://game/level/2?from=popup#top", + "REES46://Game", + " rees46://game ", + "rees46://game:80" + ).forEach { assertEquals(it, DemoLink.GAME, DemoLink.of(it)) } + } + + @Test + fun `a game link with an address is still the game`() { + assertEquals(DemoLink.GAME, DemoLink.of("rees46://game?url=https%3A%2F%2Fexample.com%2Fgame")) + assertEquals(DemoLink.GAME, DemoLink.of("rees46://game?url=http%3A%2F%2Fexample.com")) + } + + @Test + fun `r46_stories makes a stories link, the game host included`() { + listOf( + "rees46://game?r46_stories=abc&r46_story=40", + "rees46://demo.rees46.ru/?r46_stories=abc&r46_story=40&r46_slide=37", + "https://demo.rees46.ru/?r46_stories=abc&r46_story=40", + "rees46://stories?r46_story=40&r46_stories=abc" + ).forEach { assertEquals(it, DemoLink.STORIES, DemoLink.of(it)) } + } + + @Test + fun `anything else is another link`() { + listOf( + "", + "game", + "rees46:game", + "rees46://games", + "rees46://stories", + "rees46://demo.rees46.ru/game", + "myapp://game", + "https://game", + "https://demo.rees46.ru/catalog", + "rees46://game.example.com", + "https://demo.rees46.ru/#r46_stories=abc" + ).forEach { assertEquals(it, DemoLink.OTHER, DemoLink.of(it)) } + } + + @Test + fun `the https address of a game link is decoded`() { + assertEquals( + "https://example.com/game?level=2", + DemoLink.gameAddress("rees46://game?url=https%3A%2F%2Fexample.com%2Fgame%3Flevel%3D2") + ) + assertEquals("https://example.com/game", DemoLink.gameAddress("rees46rn://game?from=popup&url=https://example.com/game")) + assertEquals("HTTPS://example.com", DemoLink.gameAddress("rees46://game?url=HTTPS%3A%2F%2Fexample.com")) + } + + @Test + fun `an address that is not https or does not parse gives none`() { + listOf( + "rees46://game", + "rees46://game?url=", + "rees46://game?url=http%3A%2F%2Fexample.com%2Fgame", + "rees46://game?url=javascript%3Aalert(1)", + "rees46://game?url=file%3A%2F%2F%2Fsdcard%2Fgame.html", + "rees46://game?url=https%3A%2F%2F", + "rees46://game?url=https%3A%2F%2Fexa%20mple.com", + "rees46://game?url=%E0%A4%A", + "rees46://game?url=example.com", + "https://example.com/?url=https%3A%2F%2Fexample.com%2Fgame", + "rees46://game?r46_stories=abc&r46_story=40&url=https%3A%2F%2Fexample.com" + ).forEach { assertNull(it, DemoLink.gameAddress(it)) } + } +} diff --git a/demo-app/src/test/java/com/personalization/demo/game/GamePageTest.kt b/demo-app/src/test/java/com/personalization/demo/game/GamePageTest.kt new file mode 100644 index 00000000..fc8d1a7b --- /dev/null +++ b/demo-app/src/test/java/com/personalization/demo/game/GamePageTest.kt @@ -0,0 +1,35 @@ +package com.personalization.demo.game + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** The game screen loads the demo's own page in the app's theme, or the https game of the link's `url`. */ +class GamePageTest { + + @Test + fun `the own game takes the theme of the app`() { + assertEquals("file:///android_asset/game/tic-tac-toe.html?theme=light", GamePage.url("rees46://game", dark = false)) + assertEquals("file:///android_asset/game/tic-tac-toe.html?theme=dark", GamePage.url("rees46flutter://game", dark = true)) + assertEquals("file:///android_asset/game/tic-tac-toe.html?theme=dark", GamePage.url(null, dark = true)) + } + + @Test + fun `a game of one's own opens from its https address as it is`() { + assertEquals( + "https://example.com/game?level=2", + GamePage.url("rees46://game?url=https%3A%2F%2Fexample.com%2Fgame%3Flevel%3D2", dark = true) + ) + } + + @Test + fun `an address that is not https gives the own game`() { + assertEquals( + "file:///android_asset/game/tic-tac-toe.html?theme=light", + GamePage.url("rees46://game?url=http%3A%2F%2Fexample.com%2Fgame", dark = false) + ) + assertEquals( + "file:///android_asset/game/tic-tac-toe.html?theme=dark", + GamePage.url("rees46://game?url=not%20a%20link", dark = true) + ) + } +} diff --git a/demo-app/src/test/java/com/personalization/demo/game/GamePopupsTest.kt b/demo-app/src/test/java/com/personalization/demo/game/GamePopupsTest.kt new file mode 100644 index 00000000..1e0f7f39 --- /dev/null +++ b/demo-app/src/test/java/com/personalization/demo/game/GamePopupsTest.kt @@ -0,0 +1,49 @@ +package com.personalization.demo.game + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +/** The popups of triggers are off while a game screen is started and come back as they were. */ +class GamePopupsTest { + + private var auto: Boolean? = true + private val writes = mutableListOf() + private val popups = GamePopups(read = { auto }, write = { auto = it; writes += it }) + + @Test + fun `a game screen turns the popups off until it stops`() { + popups.started() + assertEquals(false, auto) + popups.stopped() + assertEquals(true, auto) + } + + @Test + fun `a game screen that takes the place of another keeps them off`() { + popups.started() + popups.started() + popups.stopped() + assertEquals(false, auto) + popups.stopped() + assertEquals(true, auto) + assertEquals(listOf(false, true), writes) + } + + @Test + fun `popups the app turned off stay off`() { + auto = false + popups.started() + popups.stopped() + assertEquals(false, auto) + } + + @Test + fun `without an SDK nothing is written`() { + auto = null + popups.started() + popups.stopped() + popups.stopped() + assertTrue(writes.isEmpty()) + } +} From beed8f7be8f47143fb8f2bc9eb94c18e5680c2e8 Mon Sep 17 00:00:00 2001 From: xyzcancer Date: Mon, 9 Nov 2026 21:27:47 +0400 Subject: [PATCH 65/65] feat(ui): the UI kit opens to apps without opt-in; popups v3 and stories over API v3 move behind their own opt-in marker, hidden from Java --- demo-app/build.gradle | 5 +- personalization-sdk/build.gradle | 5 +- .../InternalPersonalizationV3Api.kt | 35 +++++ .../main/kotlin/com/personalization/SDK.kt | 9 +- .../SdkInitializationResponse.kt | 5 +- .../com/personalization/popups/PopupsV3.kt | 6 +- .../models/params/SdkInitializationParams.kt | 3 + .../ui/InternalPersonalizationUiApi.kt | 34 ----- .../ui/PersonalizationTheme.kt | 1 - .../ui/components/PersonalizationAccordion.kt | 2 - .../ui/components/PersonalizationBadge.kt | 2 - .../ui/components/PersonalizationBarcode.kt | 2 - .../ui/components/PersonalizationButton.kt | 2 - .../components/PersonalizationButtonGroup.kt | 2 - .../ui/components/PersonalizationCatalog.kt | 2 - .../ui/components/PersonalizationCheckbox.kt | 2 - .../PersonalizationCheckboxWithLabel.kt | 2 - .../ui/components/PersonalizationCount.kt | 2 - .../ui/components/PersonalizationDots.kt | 2 - .../components/PersonalizationEmptyState.kt | 2 - .../PersonalizationFavoritesBadge.kt | 2 - .../ui/components/PersonalizationFilters.kt | 2 - .../components/PersonalizationInAppPopup.kt | 2 - .../components/PersonalizationInputField.kt | 2 - .../PersonalizationInstantSearch.kt | 2 - .../ui/components/PersonalizationLink.kt | 2 - .../ui/components/PersonalizationListLabel.kt | 2 - .../ui/components/PersonalizationLoader.kt | 2 - .../components/PersonalizationLoyaltyCard.kt | 2 - .../ui/components/PersonalizationProduct.kt | 3 - .../components/PersonalizationProductCard.kt | 2 - .../components/PersonalizationProductImage.kt | 2 - .../PersonalizationProductsBlock.kt | 2 - .../PersonalizationProductsCarousel.kt | 3 - .../components/PersonalizationProductsGrid.kt | 2 - .../ui/components/PersonalizationRating.kt | 2 - .../PersonalizationSearchResultsTitle.kt | 2 - .../ui/components/PersonalizationStoryCard.kt | 2 - .../components/PersonalizationStoryCover.kt | 5 - .../PersonalizationStoryNavigation.kt | 3 - .../components/PersonalizationStoryPrice.kt | 2 - .../components/PersonalizationStorySupport.kt | 2 - .../PersonalizationStoryTextBlock.kt | 2 - .../components/PersonalizationStoryTimer.kt | 3 - .../PersonalizationStoryUsedProducts.kt | 2 - .../PersonalizationSuggestionRow.kt | 2 - .../ui/components/PersonalizationTag.kt | 2 - .../ui/components/PersonalizationTitle.kt | 2 - .../ui/components/PersonalizationToast.kt | 2 - .../ui/popups/PopupV3Elements.kt | 4 - .../ui/popups/PopupV3Presenter.kt | 10 +- .../personalization/ui/popups/PopupV3Views.kt | 2 - .../widgets/PersonalizationCategoryScreen.kt | 2 - .../PersonalizationInstantSearchField.kt | 2 - .../widgets/PersonalizationListingScreen.kt | 2 - .../PersonalizationRecommenderBlock.kt | 2 - .../PersonalizationRecommenderBlockWidget.kt | 3 - .../PersonalizationSearchResultsScreen.kt | 2 - .../ui/widgets/PersonalizationStories.kt | 135 +++++++++++++----- .../widgets/PersonalizationStoriesViewer.kt | 71 ++++++--- .../widgets/PersonalizationStoriesWidget.kt | 73 +++++++++- .../ui/widgets/SearchSupport.kt | 2 - .../ui/widgets/StoriesPolls.kt | 12 +- .../ui/widgets/StoriesPollsApi.kt | 6 +- .../ui/widgets/StoriesSupport.kt | 2 - .../personalization/ui/widgets/StoryPoll.kt | 3 - .../ui/widgets/StoryPollController.kt | 6 +- .../ui/widgets/StorySlideView.kt | 2 - .../kotlin/com/personalization/V3GateTest.kt | 61 ++++++++ 69 files changed, 349 insertions(+), 243 deletions(-) create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/InternalPersonalizationV3Api.kt delete mode 100644 personalization-sdk/src/main/kotlin/com/personalization/ui/InternalPersonalizationUiApi.kt create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/V3GateTest.kt diff --git a/demo-app/build.gradle b/demo-app/build.gradle index 4bcb7efb..5c1d98ba 100644 --- a/demo-app/build.gradle +++ b/demo-app/build.gradle @@ -82,8 +82,9 @@ android { kotlinOptions { jvmTarget = '17' - // Демо подключает UI-кит дизайн-системы напрямую, пока он не стал публичным API. - freeCompilerArgs += ['-opt-in=com.personalization.ui.InternalPersonalizationUiApi'] + // Демо подключает v3 — попапы нового конструктора и сторис на API v3 — напрямую, пока он + // не стал публичным API. + freeCompilerArgs += ['-opt-in=com.personalization.InternalPersonalizationV3Api'] } buildFeatures { diff --git a/personalization-sdk/build.gradle b/personalization-sdk/build.gradle index 2e678ea6..a10df113 100644 --- a/personalization-sdk/build.gradle +++ b/personalization-sdk/build.gradle @@ -52,8 +52,9 @@ android { kotlinOptions { jvmTarget = '17' - // UI-кит дизайн-системы до релиза закрыт маркером opt-in; библиотека использует его сама. - freeCompilerArgs += ['-opt-in=com.personalization.ui.InternalPersonalizationUiApi'] + // v3 (попапы нового конструктора, сторис на API v3) не публичный API и закрыт маркером + // opt-in; библиотека использует его сама. + freeCompilerArgs += ['-opt-in=com.personalization.InternalPersonalizationV3Api'] // Interface methods with a body become Java default methods, so a Java implementation of a // public interface does not break when a method with a default body is added to it. // "compatibility" keeps the DefaultImpls classes that Kotlin code compiled earlier calls. diff --git a/personalization-sdk/src/main/kotlin/com/personalization/InternalPersonalizationV3Api.kt b/personalization-sdk/src/main/kotlin/com/personalization/InternalPersonalizationV3Api.kt new file mode 100644 index 00000000..1e0a7135 --- /dev/null +++ b/personalization-sdk/src/main/kotlin/com/personalization/InternalPersonalizationV3Api.kt @@ -0,0 +1,35 @@ +package com.personalization + +/** + * Маркер v3, который не является публичным API SDK: попапы нового конструктора + * ([com.personalization.popups.PopupsV3], `sdk.popups`) и сторис на API v3 — `apiV3Domain`, + * открытие кампании по ссылке «Поделиться», сама кнопка и её ссылка, опросы на слайдах. + * + * Код v3 работает в наших демо, но хост не подхватит его случайно: кто знает, что делает, + * подключает v3 явно — одной строкой на модуль, как демо-приложение: + * + * ```groovy + * kotlinOptions { + * freeCompilerArgs += ['-opt-in=com.personalization.InternalPersonalizationV3Api'] + * } + * ``` + * + * Маркер снимается, только когда v3 станет публичным API. + * + * Java opt-in не проверяет, поэтому входы в v3 (`SDK.popups`, члены сторис для v3) помечены + * `@JvmSynthetic` и из Java не видны. + */ +@RequiresOptIn( + level = RequiresOptIn.Level.ERROR, + message = "v3 (попапы нового конструктора, сторис на API v3) пока не публичный API. Подключите его явно: " + + "@OptIn(InternalPersonalizationV3Api::class) или " + + "-opt-in=com.personalization.InternalPersonalizationV3Api.", +) +@Retention(AnnotationRetention.BINARY) +@Target( + AnnotationTarget.CLASS, + AnnotationTarget.FUNCTION, + AnnotationTarget.PROPERTY, + AnnotationTarget.TYPEALIAS, +) +annotation class InternalPersonalizationV3Api diff --git a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt index daaf79b0..2e7aa771 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt @@ -46,7 +46,6 @@ import com.personalization.sdk.domain.usecases.userSettings.InitUserSettingsUseC import com.personalization.sdk.domain.usecases.userSettings.InitializeAdvertisingIdUseCase import com.personalization.stories.StoriesManager import com.personalization.stories.views.StoriesView -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.utils.DomainFormattingUtils.formatApiDomain import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -58,7 +57,7 @@ import org.json.JSONObject private const val GAID_KEY = "google_advertising_id" -@OptIn(InternalPersonalizationUiApi::class) +@OptIn(InternalPersonalizationV3Api::class) open class SDK { internal lateinit var context: Context @@ -176,9 +175,11 @@ open class SDK { /** * Popups v3 — native rendering of the new popup builder's documents. Asleep until the host turns - * them on (`popups.enabled`) and `/init` reports `popups_v3`; see [PopupsV3]. + * them on (`popups.enabled`) and `/init` reports `popups_v3`; see [PopupsV3]. Behind the v3 gate + * ([InternalPersonalizationV3Api]) and hidden from Java. */ - @InternalPersonalizationUiApi + @InternalPersonalizationV3Api + @get:JvmSynthetic val popups: PopupsV3 get() = popupsV3 ?: synchronized(this) { popupsV3 ?: PopupsV3(this).also { popupsV3 = it } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/initialization/SdkInitializationResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/initialization/SdkInitializationResponse.kt index 080fd240..66412a32 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/initialization/SdkInitializationResponse.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/initialization/SdkInitializationResponse.kt @@ -1,5 +1,6 @@ package com.personalization.api.responses.initialization +import com.personalization.InternalPersonalizationV3Api import com.personalization.sdk.data.models.dto.popUp.PopupDto import com.personalization.sdk.data.models.dto.popUp.WebPushSettings import com.personalization.sdk.data.models.dto.search.Search @@ -19,6 +20,8 @@ data class SdkInitializationResponse( val search: Search?, val webPushSettings: WebPushSettings?, val recone: Boolean, - /** The shop has popups v3 for this channel (`popups_v3` of `/init`). */ + /** The shop has popups v3 for this channel (`popups_v3` of `/init`). Behind the v3 gate. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic val popupsV3: Boolean = false ) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/popups/PopupsV3.kt b/personalization-sdk/src/main/kotlin/com/personalization/popups/PopupsV3.kt index 6bc4eb32..2ba19342 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/popups/PopupsV3.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/popups/PopupsV3.kt @@ -3,9 +3,9 @@ package com.personalization.popups import android.app.Activity import android.os.Handler import android.os.Looper +import com.personalization.InternalPersonalizationV3Api import com.personalization.SDK import com.personalization.features.inAppNotification.impl.ForegroundActivity -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationProduct import com.personalization.ui.popups.PopupV3Presenter import com.personalization.ui.widgets.MainThread @@ -19,9 +19,9 @@ import com.personalization.ui.widgets.MainThread * маркетолог пишет в `target_screens`; остальное движок делает сам: список, триггеры, * частоту, очередь, промокод, показ и события. * - * Пока за шлюзом кита: API не публичный и может поменяться. + * За шлюзом v3 ([InternalPersonalizationV3Api]): API не публичный и может поменяться. */ -@InternalPersonalizationUiApi +@InternalPersonalizationV3Api class PopupsV3 internal constructor(private val sdk: SDK) { /** Включить движок. Без этого попапы v3 не запрашиваются и не показываются. */ diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/SdkInitializationParams.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/SdkInitializationParams.kt index 0ab8301f..31a01951 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/SdkInitializationParams.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/SdkInitializationParams.kt @@ -1,5 +1,7 @@ package com.personalization.sdk.data.models.params +import com.personalization.InternalPersonalizationV3Api + object SdkInitializationParams { const val TAG = "SdkInitializationMapper" const val PARAM_ID = "id" @@ -36,5 +38,6 @@ object SdkInitializationParams { const val PARAM_CMS = "cms" const val PARAM_SNIPPETS = "snippets" const val PARAM_RECONE = "recone" + @InternalPersonalizationV3Api const val PARAM_POPUPS_V3 = "popups_v3" } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/InternalPersonalizationUiApi.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/InternalPersonalizationUiApi.kt deleted file mode 100644 index d7ab4af1..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/InternalPersonalizationUiApi.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.personalization.ui - -/** - * Маркер UI-кита дизайн-системы, который пока не является публичным API SDK. - * - * Кит ещё собирается и ничем в SDK не используется, поэтому до релиза вся его - * поверхность (тема и компоненты) закрыта этим маркером: хост не подхватит её - * случайно, а кто знает, что делает, подключает кит напрямую — одной строкой - * на модуль, как это делает демо-приложение: - * - * ```groovy - * kotlinOptions { - * freeCompilerArgs += ['-opt-in=com.personalization.ui.InternalPersonalizationUiApi'] - * } - * ``` - * - * Перед релизом маркер снимается, и компоненты становятся обычным публичным API. - * Ресурсы (`@color/personalization_*`, атрибуты темы) маркером не закрываются: - * это ресурсы библиотеки, и без `public.xml` они видны хосту как есть. - */ -@RequiresOptIn( - level = RequiresOptIn.Level.ERROR, - message = "UI-кит дизайн-системы пока не публичный API. Подключите его явно: " + - "@OptIn(InternalPersonalizationUiApi::class) или " + - "-opt-in=com.personalization.ui.InternalPersonalizationUiApi.", -) -@Retention(AnnotationRetention.BINARY) -@Target( - AnnotationTarget.CLASS, - AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY, - AnnotationTarget.TYPEALIAS, -) -annotation class InternalPersonalizationUiApi 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 b7707e4d..c05ebf7a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/PersonalizationTheme.kt @@ -33,7 +33,6 @@ import com.personalization.R * Темизуются цвета, радиусы и шрифт. Отступы, тени и кегли остаются ресурсами: * это шкала макета, менять её не предполагается. */ -@InternalPersonalizationUiApi object PersonalizationTheme { private val colorAttributes: Map = mapOf( diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationAccordion.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationAccordion.kt index 80b25001..91f869f7 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationAccordion.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationAccordion.kt @@ -13,7 +13,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Строка-аккордеон списка. @@ -26,7 +25,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * в React Native и Flutter тот же компонент, наоборот, ничего не хранит * и ждёт перерисовки сверху. */ -@InternalPersonalizationUiApi class PersonalizationAccordion @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBadge.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBadge.kt index f68f3605..0386f338 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBadge.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBadge.kt @@ -10,7 +10,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Бейдж дизайн-системы. @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * кегль берётся с одной ступени, интерлиньяж с другой (20/24, 16/20, 14/16). * Поэтому размеры заданы здесь явно, а не через стиль. */ -@InternalPersonalizationUiApi class PersonalizationBadge @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBarcode.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBarcode.kt index 48560f51..be8330d2 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBarcode.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationBarcode.kt @@ -6,7 +6,6 @@ import android.graphics.Color import android.graphics.Paint import android.util.AttributeSet import android.view.View -import com.personalization.ui.InternalPersonalizationUiApi /** * Штрихкод Code 128. @@ -22,7 +21,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * * Строку, которую Code 128 не несёт (пустую, не ASCII), не рисует — размер нулевой. */ -@InternalPersonalizationUiApi class PersonalizationBarcode @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButton.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButton.kt index 1e6d2173..1d0deb35 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButton.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButton.kt @@ -16,7 +16,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Кнопка дизайн-системы. @@ -27,7 +26,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Состояние Focus из макета — это нажатие: рисуется через state_pressed, * отдельным свойством не управляется. Disabled — обычный [setEnabled]. */ -@InternalPersonalizationUiApi class PersonalizationButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButtonGroup.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButtonGroup.kt index 737e3f2a..c6809a78 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButtonGroup.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationButtonGroup.kt @@ -10,7 +10,6 @@ import androidx.appcompat.widget.AppCompatImageView import androidx.core.widget.ImageViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Группа кнопок (сегментированный переключатель). @@ -22,7 +21,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * сегмент же есть и в MD, и в SM — поэтому размер вынесен в API, * а число сегментов не ограничено. */ -@InternalPersonalizationUiApi class PersonalizationButtonGroup @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt index 05d13860..c511adc5 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCatalog.kt @@ -14,7 +14,6 @@ import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Экран каталога: заголовок, плитка или список товаров, внизу лоадер, счётчик @@ -41,7 +40,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * догрузилось. Внутри чужой вертикальной прокрутки (высота по содержимому) он * раскладывается целиком, как обычный блок. */ -@InternalPersonalizationUiApi class PersonalizationCatalog @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckbox.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckbox.kt index 8ea6debb..7cb3baab 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckbox.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckbox.kt @@ -10,7 +10,6 @@ import android.view.View import androidx.annotation.ColorInt import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Чекбокс дизайн-системы, 20x20. @@ -24,7 +23,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Цвета — токены кита; заданный цвет заменяет свой токен, кроме заливки * неактивного — она всегда из disabled-токенов кита. Геометрия от цветов не зависит. */ -@InternalPersonalizationUiApi class PersonalizationCheckbox @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckboxWithLabel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckboxWithLabel.kt index 3f4297f6..601ff290 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckboxWithLabel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCheckboxWithLabel.kt @@ -9,7 +9,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Чекбокс с подписью. @@ -18,7 +17,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Зазор 8, подпись 16/20 обычного начертания; в disabled подпись уходит * в Text/Hint. */ -@InternalPersonalizationUiApi class PersonalizationCheckboxWithLabel @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCount.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCount.kt index 0e4382f3..5abe4119 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCount.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationCount.kt @@ -9,7 +9,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Счётчик «показано N из M». @@ -18,7 +17,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Слова — параметры, а не константы: локализация остаётся за интегратором. * В макете это «Showed 6 from 569». */ -@InternalPersonalizationUiApi class PersonalizationCount @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationDots.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationDots.kt index 8c556acf..cf311eab 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationDots.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationDots.kt @@ -8,7 +8,6 @@ import android.view.View import android.widget.LinearLayout import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Точки-индикатор карусели. @@ -17,7 +16,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * символы Dots (90:669) и Dot (90:685). * В макете нарисовано пять точек, число вынесено в API. */ -@InternalPersonalizationUiApi class PersonalizationDots @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationEmptyState.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationEmptyState.kt index a67e60ff..b9262b78 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationEmptyState.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationEmptyState.kt @@ -8,7 +8,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Пустое состояние дизайн-системы. @@ -20,7 +19,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Текст не зашит: в макете стоит «No results for your request.», но строку * подставляет потребитель — локализация остаётся на его стороне. */ -@InternalPersonalizationUiApi class PersonalizationEmptyState @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFavoritesBadge.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFavoritesBadge.kt index 34f78816..4f6d6932 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFavoritesBadge.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFavoritesBadge.kt @@ -7,14 +7,12 @@ import androidx.appcompat.widget.AppCompatImageView import androidx.core.widget.ImageViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Метка «в избранном»: звезда в круге цвета Semantic/Warning, 24x24. * * Источник: Figma Mobile SDK UI Kit, секция Badge, символ Favorites (391:17117). */ -@InternalPersonalizationUiApi class PersonalizationFavoritesBadge @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFilters.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFilters.kt index 9da67c6f..674a0197 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFilters.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationFilters.kt @@ -12,7 +12,6 @@ import androidx.core.widget.NestedScrollView import androidx.core.widget.TextViewCompat import androidx.core.widget.doAfterTextChanged import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -30,7 +29,6 @@ import com.personalization.ui.PersonalizationTheme * Состояние чекбоксов и раскрытия секций живёт здесь; хост получает изменения * через [onOptionToggle] и [onRangeChanged] и на «Apply» читает [sections]. */ -@InternalPersonalizationUiApi class PersonalizationFilters @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInAppPopup.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInAppPopup.kt index 9ef259ac..6d6d6f6f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInAppPopup.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInAppPopup.kt @@ -17,7 +17,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.view.isVisible import androidx.core.widget.TextViewCompat import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -50,7 +49,6 @@ import com.personalization.ui.PersonalizationTheme * Padding/Gap Full Screen (24), скругление модалки — радиус Modal, фон — Background/Card, * тень — Elevation 3. */ -@InternalPersonalizationUiApi class PersonalizationInAppPopup @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInputField.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInputField.kt index f7b5153a..a58db47a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInputField.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInputField.kt @@ -17,7 +17,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Поле ввода дизайн-системы. @@ -28,7 +27,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Состояния из макета не задаются снаружи, а выводятся из самого поля: * Default — пусто, Filled — есть текст, Focus — поле в фокусе, Disabled — [setEnabled]. */ -@InternalPersonalizationUiApi class PersonalizationInputField @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInstantSearch.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInstantSearch.kt index 3a72a753..311ff66e 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInstantSearch.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationInstantSearch.kt @@ -10,7 +10,6 @@ import android.widget.LinearLayout import androidx.core.view.isVisible import androidx.core.widget.doAfterTextChanged import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -31,7 +30,6 @@ import com.personalization.ui.PersonalizationTheme * Разделитель в макете чёрный 4%, ближайший токен Line/Generic Subtle (5%). * Картинки хост грузит через [imageLoader]. */ -@InternalPersonalizationUiApi class PersonalizationInstantSearch @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLink.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLink.kt index 21699019..96697a66 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLink.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLink.kt @@ -6,7 +6,6 @@ import android.util.TypedValue import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -17,7 +16,6 @@ import com.personalization.ui.PersonalizationTheme * начертание 600, цвет Text/Link, без подложки и отступов. Нажатого состояния * в макете нет, поэтому ссылка только слегка гаснет под пальцем. */ -@InternalPersonalizationUiApi class PersonalizationLink @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationListLabel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationListLabel.kt index 8829bdf5..889dd324 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationListLabel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationListLabel.kt @@ -7,7 +7,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Подпись-разделитель списка. @@ -18,7 +17,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * * Текст переводится в верхний регистр самим компонентом — так задано в макете. */ -@InternalPersonalizationUiApi class PersonalizationListLabel @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoader.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoader.kt index f43f5a74..c0f1c4ee 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoader.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoader.kt @@ -9,7 +9,6 @@ import android.graphics.SweepGradient import android.util.AttributeSet import android.view.View import android.view.animation.LinearInterpolator -import com.personalization.ui.InternalPersonalizationUiApi /** * Индикатор загрузки дизайн-системы. @@ -22,7 +21,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * `Gradient/Loader` приходит пустым. Рисуется SweepGradient, а не картинкой — * чтобы не зависеть от плотности экрана. */ -@InternalPersonalizationUiApi class PersonalizationLoader @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoyaltyCard.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoyaltyCard.kt index 9ad8120b..5eb1e21d 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoyaltyCard.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationLoyaltyCard.kt @@ -24,7 +24,6 @@ import androidx.core.view.isVisible import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -47,7 +46,6 @@ import com.personalization.ui.PersonalizationTheme * фирменного синего цвета — для этого [cardColor] и [contentColor]. Рамка Line/Generic Subtle, * скругление 2XL, тень Elevation 3. */ -@InternalPersonalizationUiApi class PersonalizationLoyaltyCard @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt index 8f248657..1e252c20 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProduct.kt @@ -1,7 +1,5 @@ package com.personalization.ui.components -import com.personalization.ui.InternalPersonalizationUiApi - /** * Данные товара для карточки и раскладок каталога. * @@ -14,7 +12,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * чтобы перейти на товар: [deeplink] ведёт в приложение (`deeplink_android` из ответа), * [url] — на страницу товара на сайте. */ -@InternalPersonalizationUiApi data class PersonalizationProduct( val id: String, val name: CharSequence, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductCard.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductCard.kt index 701e46f5..54c17ab6 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductCard.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductCard.kt @@ -14,7 +14,6 @@ import androidx.core.view.isVisible import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Карточка товара. @@ -32,7 +31,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * [PersonalizationBadge] (скидка, вид danger), [PersonalizationButton]. * Изображение хост грузит сам в `image.imageView`. */ -@InternalPersonalizationUiApi class PersonalizationProductCard @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductImage.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductImage.kt index f523f912..0f912aba 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductImage.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductImage.kt @@ -7,7 +7,6 @@ import android.widget.FrameLayout import androidx.appcompat.widget.AppCompatImageView import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Изображение товара с фиксированной пропорцией. @@ -20,7 +19,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * До загрузки виден плейсхолдер цвета Background/Card — в макете заливка * плейсхолдера к переменной не привязана, взят ближайший токен. */ -@InternalPersonalizationUiApi class PersonalizationProductImage @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt index a57fa2fd..9fddaf06 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsBlock.kt @@ -6,7 +6,6 @@ import android.widget.ImageView import android.widget.LinearLayout import androidx.core.view.isVisible import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Блок товаров: заголовок, товары, у карусели — точки. Товары даёт хост; сам блок ничего @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Собран из [PersonalizationTitle], [PersonalizationButton], * [PersonalizationProductsCarousel] / [PersonalizationProductsGrid], [PersonalizationDots]. */ -@InternalPersonalizationUiApi class PersonalizationProductsBlock @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt index 95568f69..f0a8e323 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsCarousel.kt @@ -9,7 +9,6 @@ import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Горизонтальная лента карточек товара. @@ -20,7 +19,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Собрана на RecyclerView, чтобы карточки переиспользовались; сами карточки — * [PersonalizationProductCard]. Картинки грузит хост через [imageLoader]. */ -@InternalPersonalizationUiApi class PersonalizationProductsCarousel @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -107,7 +105,6 @@ internal class PersonalizationGapDecoration( } /** Общий адаптер трёх раскладок: тип карточки задаёт раскладка. */ -@OptIn(InternalPersonalizationUiApi::class) internal class PersonalizationProductsAdapter( private val type: PersonalizationProductCard.Type ) : RecyclerView.Adapter() { diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt index 8b20c4d3..a43f6940 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationProductsGrid.kt @@ -9,7 +9,6 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Каталог товаров: плитка в две колонки или список. @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Собран на RecyclerView; карточки — [PersonalizationProductCard]. Картинки * грузит хост через [imageLoader]. */ -@InternalPersonalizationUiApi class PersonalizationProductsGrid @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRating.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRating.kt index 2240409e..7323256f 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRating.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationRating.kt @@ -12,7 +12,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Рейтинг товара, короткая форма. @@ -26,7 +25,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Цвет заполненной звезды в макете не привязан к переменной, взят ближайший * существующий токен Semantic/Warning — его стоит подтвердить у дизайнера. */ -@InternalPersonalizationUiApi class PersonalizationRating @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSearchResultsTitle.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSearchResultsTitle.kt index 46eee137..e9fdf13c 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSearchResultsTitle.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSearchResultsTitle.kt @@ -10,7 +10,6 @@ import androidx.core.view.isVisible import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Заголовок выдачи поиска. @@ -24,7 +23,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Собран из готовых компонентов: [PersonalizationTitle], [PersonalizationButton], * [PersonalizationButtonGroup], [PersonalizationTag]. */ -@InternalPersonalizationUiApi class PersonalizationSearchResultsTitle @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 4169a5e9..dc448f90 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 @@ -12,7 +12,6 @@ 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 /** @@ -27,7 +26,6 @@ import com.personalization.ui.PersonalizationTheme * * Цвет текста шапки — Text/Primary контекста: на медиа-слайде он тёмный режим. */ -@InternalPersonalizationUiApi class PersonalizationStoryCard @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 671a1029..94bc2c83 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 @@ -19,7 +19,6 @@ 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 /** @@ -36,7 +35,6 @@ import com.personalization.ui.PersonalizationTheme * * Картинку кладёт хост в [imageView] — кит ничего не качает. */ -@InternalPersonalizationUiApi class PersonalizationStoryCover @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -186,7 +184,6 @@ class PersonalizationStoryCover @JvmOverloads constructor( * подпись Regular 12/16 по центру цветом Text/Primary — до двух строк с многоточием * в конце, как у старых сторис. У скелетона вместо подписи — полоска 64×8 со скруглением 5. */ -@InternalPersonalizationUiApi class PersonalizationStoryPreview @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -266,7 +263,6 @@ class PersonalizationStoryPreview @JvmOverloads constructor( } /** Сторис для ленты: всё, что нужно обложке и подписи. */ -@InternalPersonalizationUiApi data class PersonalizationStoryItem( val id: String, val title: CharSequence, @@ -283,7 +279,6 @@ data class PersonalizationStoryItem( * Источник: Figma, Card/Story View=Stories Block (238:6890): превью с шагом 16, * отступы 16. Пока данных нет — [showSkeleton]. */ -@InternalPersonalizationUiApi class PersonalizationStoriesBar @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 3894e3c6..9dd9c008 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 @@ -12,7 +12,6 @@ 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 /** @@ -22,7 +21,6 @@ import com.personalization.ui.PersonalizationTheme * с шагом 2 и скруглением 1 делят ширину поровну. Пройденное — Text/Secondary, * дорожка — Line/Generic. Текущая полоска заполнена на [progress]. */ -@InternalPersonalizationUiApi class PersonalizationStoryProgress @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -105,7 +103,6 @@ class PersonalizationStoryProgress @JvmOverloads constructor( * Слева от крестика через 8 — «Поделиться» (иконка веб-SDK) в его стиле: та же коробка 32, * цвет и прозрачность, без фона. Видна, только пока задан [onShare]. */ -@InternalPersonalizationUiApi class PersonalizationStoryNavigation @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 80517394..a9e7e050 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 @@ -17,7 +17,6 @@ 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 /** @@ -35,7 +34,6 @@ import com.personalization.ui.PersonalizationTheme * (в задаче на странице Stories: «по умолчанию Copied») и зовёт [onPromoCopied]; * блок при нажатии чуть увеличивается — кадр Tap Zoom Effect. */ -@InternalPersonalizationUiApi class PersonalizationStoryPrice @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 index 06379633..aefd14cb 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStorySupport.kt @@ -20,7 +20,6 @@ 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 /** @@ -71,7 +70,6 @@ internal object StorySupport { * Цена, как её отдаёт сервер (`"1 190 900 ₽"`), разбитая на сумму и валюту: * в макете валюта набрана мельче и обычным начертанием. */ -@InternalPersonalizationUiApi data class PersonalizationStoryAmount(val amount: String, val currency: String?) { companion object { 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 dcf2a000..a34b10f6 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 @@ -10,7 +10,6 @@ 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 /** @@ -26,7 +25,6 @@ import com.personalization.ui.PersonalizationTheme * пресеты [Size] только стартовые значения. Без своего интерлиньяжа ([lineHeightSp] = `null`) * берётся высота строки ближайшего по кеглю пресета. */ -@InternalPersonalizationUiApi class PersonalizationStoryTextBlock @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 index 1a78357a..8b5b87d1 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationStoryTimer.kt @@ -12,7 +12,6 @@ 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 /** @@ -26,7 +25,6 @@ import com.personalization.ui.PersonalizationTheme * * В ответе сторис таймера нет — компонент для хоста: он задаёт [endTimeMillis]. */ -@InternalPersonalizationUiApi class PersonalizationStoryTimer @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -165,7 +163,6 @@ class PersonalizationStoryTimer @JvmOverloads constructor( } /** Остаток времени по единицам таймера. Отрицательный остаток — нули. */ -@InternalPersonalizationUiApi data class PersonalizationStoryTimerParts( val days: Long, val hours: Long, 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 8f06c477..a42009db 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 @@ -10,7 +10,6 @@ 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 /** @@ -25,7 +24,6 @@ import com.personalization.ui.PersonalizationTheme * В начале строки — кнопка звука видео-слайда ([showSoundButton], [muted]): * в макете она живёт здесь же. */ -@InternalPersonalizationUiApi class PersonalizationStoryUsedProducts @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSuggestionRow.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSuggestionRow.kt index 19f885a4..901495cf 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSuggestionRow.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationSuggestionRow.kt @@ -16,7 +16,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Строка подсказки поиска: товар или категория. @@ -30,7 +29,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * [highlight] выделяет совпадение с запросом полужирным, как в макете подсказок. * Картинку хост грузит в [imageView]. */ -@InternalPersonalizationUiApi class PersonalizationSuggestionRow @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTag.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTag.kt index 1541da87..a1deb62c 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTag.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTag.kt @@ -13,7 +13,6 @@ import androidx.core.widget.ImageViewCompat import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Тег дизайн-системы. @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Источник: Figma Mobile SDK UI Kit, секция Tag (243:10993). * В макете только размер MD, поэтому размера в API нет. */ -@InternalPersonalizationUiApi class PersonalizationTag @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTitle.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTitle.kt index caac5db7..2041f02a 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTitle.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationTitle.kt @@ -10,7 +10,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.widget.TextViewCompat import com.personalization.ui.PersonalizationTheme import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi /** * Заголовок блока. @@ -22,7 +21,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Filters (204:8340) — кнопка-крестик, Search results (167:3807) — кнопка «назад» и группа. * Поэтому края здесь — произвольные вью, а не фиксированные варианты. */ -@InternalPersonalizationUiApi class PersonalizationTitle @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationToast.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationToast.kt index db922ca1..96360cab 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationToast.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/components/PersonalizationToast.kt @@ -16,7 +16,6 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.widget.TextViewCompat import com.personalization.R -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme /** @@ -35,7 +34,6 @@ import com.personalization.ui.PersonalizationTheme * по центру, на 16 от края безопасной зоны, с затуханием, и через [durationMs] прячется * сам. Новый тост сменяет тот, что ещё на экране, — очереди нет. Касания проходят сквозь. */ -@InternalPersonalizationUiApi class PersonalizationToast @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Elements.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Elements.kt index ac17887b..8eed6faf 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Elements.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Elements.kt @@ -34,7 +34,6 @@ import com.personalization.popups.PopupV3Links import com.personalization.popups.PopupV3Specs import com.personalization.popups.PopupV3Texts import com.personalization.popups.PopupV3Variables -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationCheckbox import com.personalization.ui.components.PersonalizationFlowLayout import com.personalization.ui.components.PersonalizationProduct @@ -48,7 +47,6 @@ import java.util.Locale * опроса, клик по товару. Реализация — [PopupV3ActionHandler]; в тестах — подмена. * Колбэки отправок — на главном потоке: `null` — успех, иначе текст ошибки. */ -@OptIn(InternalPersonalizationUiApi::class) internal interface PopupV3Actions { fun close() fun click() @@ -73,7 +71,6 @@ internal class PopupV3State { } /** Всё, что нужно рендеру одного попапа. */ -@OptIn(InternalPersonalizationUiApi::class) internal class PopupV3RenderContext( val context: Context, val texts: PopupV3Texts, @@ -103,7 +100,6 @@ internal class PopupV3RenderContext( * (если его не отсеял разбор) пропускается с записью в лог; новый тип добавляется одной * регистрацией в [renderers]. */ -@OptIn(InternalPersonalizationUiApi::class) internal object PopupV3Renderer { fun interface ElementRenderer { diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Presenter.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Presenter.kt index 7fb4bca6..56abe6c0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Presenter.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Presenter.kt @@ -28,6 +28,7 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.FragmentActivity +import com.personalization.InternalPersonalizationV3Api import com.personalization.R import com.personalization.SDK import com.personalization.api.OnApiCallbackListener @@ -46,7 +47,6 @@ import com.personalization.popups.PopupV3Texts import com.personalization.popups.PopupsV3 import com.personalization.popups.PopupsV3Presenter import com.personalization.popups.PopupsV3Transport -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationProduct import com.personalization.ui.widgets.MainThread import com.personalization.ui.widgets.StoriesPollsApi @@ -82,7 +82,6 @@ internal fun popupTexts(context: Context): PopupV3Texts = with(context) { * Слоты попапов на процесс (все инстансы SDK): модалка одна — общая со старыми попапами, * баннер — по одному сверху и снизу. */ -@OptIn(InternalPersonalizationUiApi::class) internal object PopupV3Slots { private var modal: Any? = null @@ -138,7 +137,7 @@ internal object PopupV3Slots { * с затемнением или блокировкой фона — своим окном ([PopupV3Dialog]); баннер без них — * вью поверх окна активити, касания вне него уходят в приложение. */ -@OptIn(InternalPersonalizationUiApi::class) +@OptIn(InternalPersonalizationV3Api::class) internal class PopupV3Presenter(private val sdk: SDK, private val popups: PopupsV3) : PopupsV3Presenter { override fun canOpen(popup: PopupV3): String? = PopupV3Slots.reason(popup) @@ -153,7 +152,7 @@ internal class PopupV3Presenter(private val sdk: SDK, private val popups: Popups * закрывается, попап снимается без события и встаёт на следующую активити с тем же * состоянием элементов. */ -@OptIn(InternalPersonalizationUiApi::class) +@OptIn(InternalPersonalizationV3Api::class) internal class PopupV3Session( private val sdk: SDK, private val popups: PopupsV3, @@ -332,7 +331,6 @@ internal class PopupV3Dialog( * `frameStyle` и breakpoints на текущей ширине экрана; её высота не больше доступной * (экран без безопасных зон, клавиатуры и полей макета), лишнее прокручивается внутри. */ -@OptIn(InternalPersonalizationUiApi::class) @SuppressLint("ViewConstructor") internal class PopupV3RootView( context: Context, @@ -693,7 +691,7 @@ internal class PopupV3FrameView( * Действия элементов на устройстве: события попапа, ссылки (сначала обработчик хоста), * буфер, подписка и сегмент, профиль, отзыв опроса через API v3 опросов, клик по товару. */ -@OptIn(InternalPersonalizationUiApi::class) +@OptIn(InternalPersonalizationV3Api::class) internal class PopupV3ActionHandler( private val sdk: SDK, private val popupId: Int, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Views.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Views.kt index ad35467f..2e29f6c9 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Views.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/popups/PopupV3Views.kt @@ -33,7 +33,6 @@ import com.personalization.R import com.personalization.popups.PopupMarkup import com.personalization.popups.PopupV3Specs import com.personalization.popups.PopupV3Variables -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme import kotlin.math.abs import kotlin.math.max @@ -196,7 +195,6 @@ internal fun View.popupClipRound(radiusPx: Float) { * берётся та, чей `text_primary` контрастнее с фоном (WCAG): на белом — светлая в любой теме * системы. Окна поверх приложения (тост) остаются по теме приложения. */ -@OptIn(InternalPersonalizationUiApi::class) internal object PopupV3KitTheme { /** diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationCategoryScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationCategoryScreen.kt index f8bbb34b..9e3164f1 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationCategoryScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationCategoryScreen.kt @@ -4,7 +4,6 @@ import android.content.Context import android.util.AttributeSet import com.personalization.R import com.personalization.SDK -import com.personalization.ui.InternalPersonalizationUiApi /** * Экран категории с данными SDK — сестра [PersonalizationSearchResultsScreen]: тот же @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * раз на категорию, а не на каждую страницу, фильтр, сортировку или повтор. Источник * перехода при нажатии на товар не ставится. */ -@InternalPersonalizationUiApi class PersonalizationCategoryScreen @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt index 9d67866d..9ccc67c8 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationInstantSearchField.kt @@ -14,7 +14,6 @@ import com.personalization.api.responses.product.Product import com.personalization.api.responses.search.Category import com.personalization.api.responses.search.SearchBlankResponse import com.personalization.api.responses.search.SearchInstantResponse -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationInstantSearch /** @@ -42,7 +41,6 @@ import com.personalization.ui.components.PersonalizationInstantSearch * историю и вызывает [onSubmit] — экран полной выдачи открывает хост, событие * `search` трекает [PersonalizationSearchResultsScreen]. */ -@InternalPersonalizationUiApi class PersonalizationInstantSearchField @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationListingScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationListingScreen.kt index a56925c7..07396068 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationListingScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationListingScreen.kt @@ -14,7 +14,6 @@ import com.personalization.R import com.personalization.Rees46 import com.personalization.SDK import com.personalization.api.responses.product.Product -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.PersonalizationTheme import com.personalization.ui.components.PersonalizationCatalog import com.personalization.ui.components.PersonalizationFilters @@ -59,7 +58,6 @@ import java.util.Locale * повторяет запрос. Не загрузилась следующая — кнопка «загрузить ещё» становится * кнопкой повтора этой страницы, и бесконечная прокрутка сама её больше не просит. */ -@InternalPersonalizationUiApi abstract class PersonalizationListingScreen internal constructor( context: Context, attrs: AttributeSet?, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt index 2b91402f..87cb80b3 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlock.kt @@ -13,7 +13,6 @@ import com.personalization.Rees46 import com.personalization.SDK import com.personalization.api.models.tracking.TrackingSource import com.personalization.api.models.tracking.TrackingSourceType -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationProduct import com.personalization.ui.components.PersonalizationProductImage import com.personalization.ui.components.PersonalizationProductsBlock @@ -47,7 +46,6 @@ import com.personalization.ui.components.PersonalizationProductsBlock * [onProductAction]; у коллекции источник не ставится. Кнопка карточки есть, только когда * задан [actionText]. */ -@InternalPersonalizationUiApi class PersonalizationRecommenderBlock @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt index f2793462..eba3bfce 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationRecommenderBlockWidget.kt @@ -7,7 +7,6 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.viewinterop.AndroidView import com.personalization.SDK -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.components.PersonalizationProduct import com.personalization.ui.components.PersonalizationProductImage import com.personalization.ui.components.PersonalizationProductsBlock @@ -16,7 +15,6 @@ import com.personalization.ui.components.PersonalizationProductsBlock * Управление блоком рекомендаций из Compose: то же, что [PersonalizationRecommenderBlock.reload]. * Передаётся в [PersonalizationRecommenderBlockWidget]; без показанного блока ничего не делает. */ -@InternalPersonalizationUiApi class PersonalizationRecommenderBlockController { internal var view: PersonalizationRecommenderBlock? = null @@ -39,7 +37,6 @@ class PersonalizationRecommenderBlockController { * PersonalizationRecommenderBlockWidget(code = "BLOCK_CODE", onProductClick = { open(it) }) * ``` */ -@InternalPersonalizationUiApi @Composable fun PersonalizationRecommenderBlockWidget( modifier: Modifier = Modifier, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt index f9a800bc..841fe735 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/PersonalizationSearchResultsScreen.kt @@ -7,7 +7,6 @@ import com.personalization.SDK import com.personalization.api.models.tracking.TrackingSource import com.personalization.api.models.tracking.TrackingSourceType import com.personalization.api.params.SearchParams -import com.personalization.ui.InternalPersonalizationUiApi /** * Экран полной выдачи поиска с данными SDK: заголовок с числом найденного, плитка ⇄ список, @@ -21,7 +20,6 @@ import com.personalization.ui.InternalPersonalizationUiApi * Заголовок — сама фраза, пока хост не задал [titleText]. Каждый новый запрос трекается * событием `search`; нажатие на карточку запоминает источник `full_search`. */ -@InternalPersonalizationUiApi class PersonalizationSearchResultsScreen @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, 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 7cf53d60..ce3f9393 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,12 +6,11 @@ import android.view.View import android.widget.FrameLayout import android.widget.ImageView import com.personalization.Cancellable - +import com.personalization.InternalPersonalizationV3Api import com.personalization.R 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 /** @@ -28,12 +27,8 @@ import com.personalization.ui.components.PersonalizationStoriesBar * Пока блок грузится — скелетон. Пустой блок, ошибка загрузки, пустой [code], * неоднозначный магазин или 15 с без ответа прячут виджет и зовут [onError]. * Управление из кода — [open], [openStory], [pause], [resume]; без ленты — [show]. - * - * С [apiV3Domain] (своим или глобальным из companion) блок, события и кнопка «Поделиться» — - * на API v3; ссылку «Поделиться» открывает [handleLink]. Там же рисуются опросы слайдов; ответы - * уходят на тот же хост, а [pollsTransport] их подменяет. */ -@InternalPersonalizationUiApi +@OptIn(InternalPersonalizationV3Api::class) class PersonalizationStories @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -49,30 +44,9 @@ class PersonalizationStories @JvmOverloads constructor( /** Магазин; `null` — единственный зарегистрированный. Менять до показа. */ var shopId: String? = null - /** - * Хост API v3 этого виджета, без схемы (`app.rees46.ru`): блок, события и «Поделиться» — - * на v3. `null` — глобальный [Companion.apiV3Domain], а без него старое API. Соседние - * виджеты друг на друга не влияют. Менять до показа или вызвать [reload]. - */ - @get:JvmName("getWidgetApiV3Domain") - @set:JvmName("setWidgetApiV3Domain") - var apiV3Domain: String? = null - /** Загрузчик картинок; `null` — Glide из SDK. */ var imageLoader: ((ImageView, String) -> Unit)? = null - /** - * Ссылка слайда → то, что уходит в окно «Поделиться» (например, своя схема приложения). - * `null` — ссылка как есть. Событие `share` не меняется. - */ - var shareUrlTransform: ((String) -> String)? = null - - /** - * Куда уходят ответы на опросы слайдов. `null` — HTTP на хост API v3 блока (без него опросов - * нет). Свой — для тестов и офлайн-демо; на старом API опросов нет и с ним. - */ - var pollsTransport: StoriesPollsTransport? = null - /** Клики по ссылкам и товарам — контракт старых сторис ([com.personalization.OnClickListener]). */ var onClickListener: com.personalization.OnClickListener? = null @@ -88,9 +62,59 @@ class PersonalizationStories @JvmOverloads constructor( var closeLabel: CharSequence var soundOnLabel: CharSequence var soundOffLabel: CharSequence + + // --- v3: за своим шлюзом ([InternalPersonalizationV3Api]) и скрыто от Java ---------------- + + /** + * Хост API v3 этого виджета, без схемы (`app.rees46.ru`): блок, события и «Поделиться» — + * на v3. `null` — глобальный [Companion.apiV3Domain], а без него старое API. Соседние + * виджеты друг на друга не влияют. Менять до показа или вызвать [reload]. Ссылку + * «Поделиться» открывает [handleLink]. На v3 рисуются и опросы слайдов: ответы уходят на тот + * же хост, а [pollsTransport] их подменяет. + */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic + var apiV3Domain: String? = null + + /** + * Ссылка слайда → то, что уходит в окно «Поделиться» (например, своя схема приложения). + * `null` — ссылка как есть. Событие `share` не меняется. + */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic + var shareUrlTransform: ((String) -> String)? = null + + /** + * Куда уходят ответы на опросы слайдов. `null` — HTTP на хост API v3 блока (без него опросов + * нет). Свой — для тестов и офлайн-демо; на старом API опросов нет и с ним. + */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic + var pollsTransport: StoriesPollsTransport? = null + + /** Кнопка «Поделиться» и заголовок системного окна. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var shareLabel: CharSequence + + /** Тексты карточки опроса: «ответить заново», ошибка отправки, кнопка без `submit_label`. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollReanswerText: CharSequence + + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollErrorText: CharSequence + + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollSubmitText: CharSequence /** Загруженные сторис — в порядке сервера, без пустых. */ @@ -300,7 +324,9 @@ class PersonalizationStories @JvmOverloads constructor( * слайдов со ссылкой появляется «Поделиться». `null` — старые `stories/{code}` и * `track/stories`. Задавать до показа сторис. */ - @JvmStatic + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic @Volatile var apiV3Domain: String? = null @@ -315,12 +341,44 @@ class PersonalizationStories @JvmOverloads constructor( * * Пустой блок, ошибка загрузки, магазин не найден или 15 с без ответа — [onError], * и показ на этом заканчивается. Просмотр закрыли — [onClose] (F12; на RN и Flutter - * так завершаются Promise и Future). [apiV3Domain] — как у виджета, `null` — глобальный; - * [shareUrlTransform], тексты опросов и [pollsTransport] — как у виджета. Возвращает отмену - * ещё не открытого показа. + * так завершаются Promise и Future). Возвращает отмену ещё не открытого показа. */ @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, + onClose: (() -> 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 texts = hostTexts( + context, promoCaption, promoCopiedText, productButtonText, showProductsText, hideProductsText, + retryText, closeLabel, soundOnLabel, soundOffLabel + ) + return detached(context, code, shopId, onClickListener, onError, imageLoader, texts) + .showDetached(sdk, startStoryId, onClose) + } + + /** + * [show] на API v3 (за шлюзом v3): [apiV3Domain] — как у виджета, `null` — глобальный; + * [shareLabel], [shareUrlTransform], тексты опросов и [pollsTransport] — как у виджета. + */ + @InternalPersonalizationV3Api + @JvmSynthetic fun show( context: Context, code: String, @@ -372,9 +430,10 @@ class PersonalizationStories @JvmOverloads constructor( * `start_position` ответа), закрыв другой открытый просмотр V2, и отправить `shared_open` * с этим слайдом. Ошибка, 404, пусто, таймаут — [onError], ничего * не показано. Та же ссылка, пока грузится или её просмотр открыт, — игнорируется. + * За шлюзом v3. */ - @JvmStatic - @JvmOverloads + @InternalPersonalizationV3Api + @JvmSynthetic fun handleLink( context: Context, url: String, @@ -441,10 +500,10 @@ class PersonalizationStories @JvmOverloads constructor( closeLabel: CharSequence?, soundOnLabel: CharSequence?, soundOffLabel: CharSequence?, - shareLabel: CharSequence?, - pollReanswerText: CharSequence?, - pollErrorText: CharSequence?, - pollSubmitText: CharSequence? + shareLabel: CharSequence? = null, + pollReanswerText: CharSequence? = null, + pollErrorText: CharSequence? = null, + pollSubmitText: CharSequence? = null ): StoriesTexts { val defaults = StoriesTexts.defaults(context) return StoriesTexts( 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 c4ceeff0..23e44bd4 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 @@ -33,10 +33,10 @@ 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.InternalPersonalizationV3Api import com.personalization.OnClickListener import com.personalization.SDK import com.personalization.stories.models.Story -import com.personalization.ui.InternalPersonalizationUiApi import com.personalization.ui.widgets.StoriesViewerState.Pause import java.lang.ref.WeakReference @@ -54,15 +54,9 @@ import java.lang.ref.WeakReference * Ссылки и товары — через [onClickListener] с контрактом старых сторис: `true` — SDK * открывает сам, `false` — хост обработал. Перед переходом просмотр закрывается. * - * Слайд со ссылкой — с кнопкой «Поделиться», только на API v3 ([apiV3Domain]): системное окно с - * одной ссылкой, слайд стоит, пока окно открыто. - * - * Опросы слайда (элементы `poll`) — только на API v3 или со своим [pollsTransport]: карточка - * поверх середины слайда; пока её трогают, пишут в поле или ждут ответа, слайд стоит. - * * Модели — те же, что у старого `StoriesView`: V2 его не трогает. */ -@InternalPersonalizationUiApi +@OptIn(InternalPersonalizationV3Api::class) class PersonalizationStoriesViewer( context: Context, stories: List, @@ -91,33 +85,65 @@ class PersonalizationStoriesViewer( /** Клики по ссылкам и товарам — контракт старых сторис ([OnClickListener]). */ var onClickListener: OnClickListener? = null - /** Ссылка слайда → то, что уходит в окно «Поделиться»; `null` — как есть. Событие `share` то же. */ - var shareUrlTransform: ((String) -> String)? = 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 + + // --- v3: за своим шлюзом ([InternalPersonalizationV3Api]) и скрыто от Java ---------------- - /** Хост API v3, с которого пришли сторис: события идут туда же. `null` — старый `track/stories`. */ + /** + * Хост API v3, с которого пришли сторис: события идут туда же. `null` — старый `track/stories`. + * Только на нём у слайда со ссылкой есть кнопка «Поделиться»: системное окно с одной ссылкой, + * слайд стоит, пока окно открыто. + */ internal var apiV3Domain: String? = PersonalizationStories.v3Domain() + /** Ссылка слайда → то, что уходит в окно «Поделиться»; `null` — как есть. Событие `share` то же. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic + var shareUrlTransform: ((String) -> String)? = null + /** Слайд стартовой сторис в обход «первого непросмотренного» — для ссылки «Поделиться». */ internal var startSlide: Int? = null /** - * Куда уходят ответы на опросы. `null` — HTTP на хост API v3 сторис; без него опросы не - * рисуются. Свой — для тестов и офлайн-демо: с ним опросы рисуются и без API v3. + * Куда уходят ответы на опросы слайда (элементы `poll`). `null` — HTTP на хост API v3 сторис; + * без него опросы не рисуются. Свой — для тестов и офлайн-демо: с ним опросы рисуются и без + * API v3. Карточка — поверх середины слайда; пока её трогают, пишут в поле или ждут ответа, + * слайд стоит. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollsTransport: StoriesPollsTransport? = 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 + /** Кнопка «Поделиться» и заголовок системного окна. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var shareLabel: CharSequence + + /** Тексты карточки опроса: «ответить заново», ошибка отправки, кнопка без `submit_label`. */ + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollReanswerText: CharSequence + + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollErrorText: CharSequence + + @InternalPersonalizationV3Api + @get:JvmSynthetic + @set:JvmSynthetic var pollSubmitText: CharSequence init { @@ -1017,7 +1043,6 @@ class PersonalizationStoriesViewer( * Открытые просмотры V2 — из ленты, `show` и ссылки «Поделиться»: просмотр по ссылке закрывает * их перед показом своего. Только главный поток. */ -@InternalPersonalizationUiApi internal object OpenStoriesViewers { private val viewers = ArrayList>() 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 a4e8be1a..0198d716 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 @@ -6,16 +6,15 @@ import androidx.compose.runtime.key import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Modifier import androidx.compose.ui.viewinterop.AndroidView +import com.personalization.InternalPersonalizationV3Api import com.personalization.OnClickListener import com.personalization.SDK -import com.personalization.ui.InternalPersonalizationUiApi /** * Управление сторис из Compose (B8): то же, что методы [PersonalizationStories]. * Передаётся в [PersonalizationStoriesWidget]. Открытие до показа виджета ждёт его, как * ждёт загрузки блока (F11); пауза и остальное без виджета ничего не делают. */ -@InternalPersonalizationUiApi class PersonalizationStoriesController { internal var view: PersonalizationStories? = null @@ -61,7 +60,39 @@ class PersonalizationStoriesController { * 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 +) { + PersonalizationStoriesWidgetContent( + code, modifier, shopId, sdk, controller, onClickListener, onError, imageLoader, + promoCaption, promoCopiedText, productButtonText, showProductsText, hideProductsText, + retryText, closeLabel, soundOnLabel, soundOffLabel + ) +} + +/** + * [PersonalizationStoriesWidget] на API v3 (за шлюзом v3): [apiV3Domain], [shareLabel], + * [shareUrlTransform], тексты опросов и [pollsTransport] — как у [PersonalizationStories]. + */ +@InternalPersonalizationV3Api +@JvmSynthetic @Composable fun PersonalizationStoriesWidget( code: String, @@ -88,6 +119,42 @@ fun PersonalizationStoriesWidget( pollErrorText: CharSequence? = null, pollSubmitText: CharSequence? = null, pollsTransport: StoriesPollsTransport? = null +) { + PersonalizationStoriesWidgetContent( + code, modifier, shopId, sdk, controller, onClickListener, onError, imageLoader, + promoCaption, promoCopiedText, productButtonText, showProductsText, hideProductsText, + retryText, closeLabel, soundOnLabel, soundOffLabel, + shareLabel, apiV3Domain, shareUrlTransform, pollReanswerText, pollErrorText, pollSubmitText, pollsTransport + ) +} + +/** Оба виджета; без параметров v3 — как вьюха без них. */ +@Composable +private fun PersonalizationStoriesWidgetContent( + code: String, + modifier: Modifier, + shopId: String?, + sdk: SDK?, + controller: PersonalizationStoriesController?, + onClickListener: OnClickListener?, + onError: ((code: Int, message: String?) -> Unit)?, + imageLoader: ((ImageView, String) -> Unit)?, + promoCaption: CharSequence?, + promoCopiedText: CharSequence?, + productButtonText: CharSequence?, + showProductsText: CharSequence?, + hideProductsText: CharSequence?, + retryText: CharSequence?, + closeLabel: CharSequence?, + soundOnLabel: CharSequence?, + soundOffLabel: CharSequence?, + shareLabel: CharSequence? = null, + apiV3Domain: String? = null, + shareUrlTransform: ((String) -> String)? = null, + pollReanswerText: CharSequence? = null, + pollErrorText: CharSequence? = null, + pollSubmitText: CharSequence? = null, + pollsTransport: StoriesPollsTransport? = null ) { val currentOnError = rememberUpdatedState(onError) // Код, магазин, SDK и хост v3 задают, какой блок грузить, — их смена пересоздаёт вьюху. 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 bd85a9ee..fe6482fe 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 @@ -7,14 +7,12 @@ import android.widget.ImageView import androidx.core.view.doOnLayout import com.bumptech.glide.Glide import com.personalization.SDK -import com.personalization.ui.InternalPersonalizationUiApi import org.json.JSONArray /** * Категория, на которую можно перейти из поиска: из подсказок instant-поиска * (есть id) или из популярных категорий пустого запроса (только имя и ссылка). */ -@InternalPersonalizationUiApi data class PersonalizationSearchCategory( val id: String?, val name: String, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesPolls.kt b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesPolls.kt index 91964511..39a6b0ac 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesPolls.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/ui/widgets/StoriesPolls.kt @@ -1,6 +1,6 @@ package com.personalization.ui.widgets -import com.personalization.ui.InternalPersonalizationUiApi +import com.personalization.InternalPersonalizationV3Api import java.io.Serializable /** @@ -16,8 +16,10 @@ import java.io.Serializable * `channel`, `category` (NPS) или `campaign` (CSAT, CES) и `rate`. * * [callback] зовётся один раз, с любого потока: просмотр сам вернётся на главный. + * + * Опросы — часть v3: типы за шлюзом [InternalPersonalizationV3Api]. */ -@InternalPersonalizationUiApi +@InternalPersonalizationV3Api interface StoriesPollsTransport { /** `POST /api/v3/polls/mini_polls/{code}/answers`. */ @@ -28,7 +30,7 @@ interface StoriesPollsTransport { } /** Чем кончилась отправка ответа. */ -@InternalPersonalizationUiApi +@InternalPersonalizationV3Api sealed class StoriesPollsResult { /** @@ -49,7 +51,7 @@ sealed class StoriesPollsResult { * Ответ на опрос: варианты, текст или оценка шкалы. [rate] — число, как пришло: дробная оценка * из ленты тоже ответ, но ячейку шкалы не выделяет. */ -@InternalPersonalizationUiApi +@InternalPersonalizationV3Api data class StoriesPollAnswer( val optionIds: List? = null, val text: String? = null, @@ -62,7 +64,7 @@ data class StoriesPollAnswer( } /** Итоги мини-опроса: всего ответов и процент каждого варианта. */ -@InternalPersonalizationUiApi +@InternalPersonalizationV3Api data class StoriesPollResults(val total: Int, val options: List