From 251809df33f20c72d4e40262f3eba3cd84a0033b Mon Sep 17 00:00:00 2001 From: nk Date: Sun, 7 Jun 2026 17:55:11 +0300 Subject: [PATCH] =?UTF-8?q?fix(filters):=20=D1=83=D0=BC=D0=B5=D0=BD=D1=8C?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=87=D0=B8=D0=BF=D0=B0=20?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=83=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20(offset=3D0=20=D0=B2=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=D0=BE=D0=B5=20=3D=20=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B=D0=B9?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Баг: offset первого чипа в покое = 0 (считается от начала контента, не от вьюпорта), а формула ждала offset≥235px → «Все» и соседние были невидимы/крошечные через пол-экрана. Фикс: recedeFactor = info.offset / shrinkPx + 1 — полный размер в покое и правее (offset≥0), уменьшение/затухание ТОЛЬКО когда чип уезжает влево под кнопку (offset<0, зона ~32dp). Отступ-зазор уменьшен 96→60dp (Радио) / 100→64dp (Чарты) — «Все» вплотную к кнопке. --- .../com/radiola/ui/charts/ChartsScreen.kt | 2 +- .../com/radiola/ui/components/FilterChips.kt | Bin 5479 -> 5648 bytes .../com/radiola/ui/stations/StationsScreen.kt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/radiola/ui/charts/ChartsScreen.kt b/app/src/main/java/com/radiola/ui/charts/ChartsScreen.kt index 5a46607..30f50d7 100644 --- a/app/src/main/java/com/radiola/ui/charts/ChartsScreen.kt +++ b/app/src/main/java/com/radiola/ui/charts/ChartsScreen.kt @@ -110,7 +110,7 @@ fun ChartsScreen( genres = genres, selected = selectedGenre, onSelect = viewModel::selectGenre, - contentPadding = PaddingValues(start = 100.dp, end = 20.dp), + contentPadding = PaddingValues(start = 64.dp, end = 20.dp), modifier = Modifier .fillMaxWidth() .align(Alignment.Center) diff --git a/app/src/main/java/com/radiola/ui/components/FilterChips.kt b/app/src/main/java/com/radiola/ui/components/FilterChips.kt index 7c05692502c800c2865c7c85a92c2ea9c0ade6c3..bd021deb413c3567e5f09e6b128046c54abbf8e1 100644 GIT binary patch delta 539 zcmY+AOG^S_6ozS$W43iwn^TK&RP44B+=R3#q!!U4T!<-3qM}n7F1%3*Y8Sp}QQ)Fg zix!hMD0%w}=lp`8P4q81Gmb9)-~>a_#&=YKuCR+EpbAy#4tv1j9?M%e1RQYvFdNInlgIvaQ0z&| z;>Y5$Fqt7@PTCeZX|Vu-O)sRP(QHJ~?KQUKZfrAw8V0P-zyXz+hW{q?@k9 zZY}fc25?Aa!<{QC6Sz-bNk^Cv0IwVD%9DRN>ulJVBkR zsM7Vsq(TbhZNTR=lz?%vyE)dJ#g&+2ClwAQ{E=ifuAF0MLO~H*9_;6#U##H4rAF=H{{2(H*tCDxHfUFkQNc6~EFV9=oz>SDIM_dJt}x{R;K8NFs2v xaCrZ}2IuUox?9UVEt2zhvZv|`k!;uU6wk6klfp)hwTM6iq diff --git a/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt b/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt index e4bc430..b6a0ad4 100644 --- a/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt +++ b/app/src/main/java/com/radiola/ui/stations/StationsScreen.kt @@ -185,7 +185,7 @@ fun StationsScreen( tags = tags, selectedTag = selectedTag, onTagSelected = viewModel::onTagSelected, - contentPadding = PaddingValues(start = 96.dp, end = 16.dp), + contentPadding = PaddingValues(start = 60.dp, end = 16.dp), modifier = Modifier .fillMaxWidth() .align(Alignment.Center)