From 1699cc79867da1cc85c3874973718f039270bf91 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Thu, 30 Jul 2026 03:00:49 +0200 Subject: [PATCH] Header: preserve compact channel accessibility state --- .../java/com/bitchat/android/ui/ChatHeader.kt | 19 ++++++++++-- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fil/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ka/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-mg/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-ne/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pa-rPK/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-ur/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values-zh/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - .../android/ui/ChatHeaderCrowdingTest.kt | 30 +++++++++++++++++++ 36 files changed, 47 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt index d0258296..aac5283c 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt @@ -96,6 +96,16 @@ internal fun headerCrowdingMode(availableWidth: Dp): HeaderCrowdingMode = when { else -> HeaderCrowdingMode.Full } +internal fun locationChannelContentDescription( + actionDescription: String, + channelLabel: String, + showLabel: Boolean, +): String = if (showLabel) { + actionDescription +} else { + "$channelLabel. $actionDescription" +} + /** Corner radius for the header's tappable label+icon clusters. */ private val HeaderClusterShape = RoundedCornerShape(8.dp) @@ -850,7 +860,12 @@ private fun LocationChannelsButton( } else { R.drawable.ic_spec_range } - val contentDescription = stringResource(R.string.cd_open_location_channels) + val actionDescription = stringResource(R.string.cd_open_location_channels) + val contentDescription = locationChannelContentDescription( + actionDescription = actionDescription, + channelLabel = badgeText, + showLabel = showLabel + ) Row( verticalAlignment = Alignment.CenterVertically, @@ -859,7 +874,7 @@ private fun LocationChannelsButton( .clip(HeaderClusterShape) .pressScaleClickable( onClick = onClick, - onClickLabel = contentDescription + onClickLabel = actionDescription ) .height(HeaderTapTarget) .widthIn(min = HeaderTapTarget) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index a313162e..772e48a5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -74,7 +74,6 @@ يمكن الوصول عبر Nostr رسائل خاصة غير مقروءة تم الانتقال - حالة Tor فتح إعدادات الموقع والقنوات الأقران المتصلون مشاركو geohash diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index d9ae8361..b6557fe2 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -74,7 +74,6 @@ Nostr এর মাধ্যমে পৌঁছানো যায় অপঠিত ব্যক্তিগত বার্তা টেলিপোর্ট করা হয়েছে - Tor অবস্থা অবস্থান ও চ্যানেল সেটিংস খুলুন সংযুক্ত পিয়ার জিওহ্যাশ অংশগ্রহণকারী diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 76d2af75..75cc8927 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -74,7 +74,6 @@ Über Nostr erreichbar Ungelesene private Nachrichten Teleportiert - Tor‑Status Standort- und Kanaleinstellungen öffnen Verbundenen Peers Geohash‑Teilnehmer diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7bd541f2..3f08ead0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -74,7 +74,6 @@ Accesible vía Nostr Mensajes privados sin leer Teletransportado - Estado de Tor Abrir ajustes de ubicación y canales Pares conectados Participantes geohash diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 57cd9e5b..1e092b64 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -74,7 +74,6 @@ قابل دسترس از طریق Nostr پیام‌های خصوصی خوانده‌نشده انتقال مکانی - وضعیت Tor باز کردن تنظیمات مکان و کانال‌ها همتایان متصل شرکت‌کنندگان geohash diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 8ac69fd3..66cd93bd 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -74,7 +74,6 @@ Maabot sa Nostr Hindi nabasang pribadong mensahe Naiteleport - Katayuan ng Tor Buksan ang mga setting ng lokasyon at channel Nakakonektang peers Mga kalahok sa geohash diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a9ac7bde..aa857f44 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -74,7 +74,6 @@ Joignable via Nostr Messages privés non lus Téléporté - Statut Tor Ouvrir les réglages de localisation et des canaux Pairs connectés Participants geohash diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 657cc100..86e4bbcb 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -122,7 +122,6 @@ הודעות פרטיות שלא נקראו הערות מיקום טלפורט - סטטוס Tor פתיחת הגדרות מיקום וערוצים עמיתים מחוברים משתתפי geohash diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ceca0787..4cb18e38 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -74,7 +74,6 @@ Nostr के माध्यम से उपलब्ध अपठित निजी संदेश टेलीपोर्ट हुआ - Tor स्थिति स्थान और चैनल सेटिंग खोलें कनेक्टेड पीयर्स geohash प्रतिभागी diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 5e2d0279..02c86a68 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -74,7 +74,6 @@ Dapat dijangkau melalui Nostr Pesan pribadi yang belum dibaca Diteleportasi - Status Tor Buka pengaturan lokasi dan channel Peer yang terhubung Peserta geohash diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 67c22cad..a8ecb688 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -74,7 +74,6 @@ Raggiungibile via Nostr Messaggi privati non letti Teletrasportato - Stato Tor Apri le impostazioni di posizione e canali Peer connessi Partecipanti geohash diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b181eb7d..17841dcc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -74,7 +74,6 @@ Nostr 経由で到達可能 未読のプライベートメッセージ テレポート済み - Tor ステータス 位置情報とチャンネルの設定を開く 接続中のピア Geohash 参加者 diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index a15eb0dc..8fe186cc 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -74,7 +74,6 @@ მისაწვდომია Nostr-ით წაუკითხავი პირადი შეტყობინებები ტელეპორტირებული - Tor-ის სტატუსი მდებარეობისა და არხების პარამეტრების გახსნა დაკავშირებული პირები geohash მონაწილეები diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 354a546a..030165d6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -74,7 +74,6 @@ Nostr로 연결 가능 읽지 않은 개인 메시지 텔레포트됨 - Tor 상태 위치 및 채널 설정 열기 연결된 피어 geohash 참여자 diff --git a/app/src/main/res/values-mg/strings.xml b/app/src/main/res/values-mg/strings.xml index 72291d80..52617e72 100644 --- a/app/src/main/res/values-mg/strings.xml +++ b/app/src/main/res/values-mg/strings.xml @@ -74,7 +74,6 @@ Azo tratrarina amin\'ny alalan\'ny Nostr Hafatra manokana tsy voavaky Nafindra toerana - Toe-javatra Tor Sokafy ny fikirana toerana sy fantsona Mpiara-miasa mifandray Mpandray anjara Geohash diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 2dc624ce..c6391e6f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -76,7 +76,6 @@ Mesej peribadi belum dibaca Nota lokasi Diteleport - Status Tor Buka tetapan lokasi dan saluran Rakan disambungkan Peserta geohash diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 64c9bbd6..7a3da0bd 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -74,7 +74,6 @@ Nostr मार्फत पुग्न सकिने नपढिएका निजी सन्देश टेलिपोर्ट भयो - Tor स्थिति स्थान र च्यानल सेटिङ खोल्नुहोस् जडान भएका साथीहरू Geohash सहभागिहरू diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e02bc5ce..64326ae5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -74,7 +74,6 @@ Bereikbaar via Nostr Ongelezen privéberichten Geteleporteerd - Tor-status Locatie- en kanaalinstellingen openen Verbonden peers Geohash-deelnemers diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 0cb9cbe8..a3f67735 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -74,7 +74,6 @@ Nostr راہین پہنچ ممکن اے انہ پڑھیا ذاتی پیغام ٹیلپورٹ کیتا گیا - Tor حالت مقام تے چینل دیاں ترتیباں کھولو جُڑے پیئر geohash شریک diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0196d218..0d2f2689 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -120,7 +120,6 @@ Nieprzeczytane wiadomości prywatne Notatki lokalizacji Teleportowany - Status Tor Otwórz ustawienia lokalizacji i kanałów Połączeni użytkownicy Uczestnicy geohash diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 92895e4d..42340857 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -74,7 +74,6 @@ Acessível via Nostr Mensagens privadas não lidas Teletransportado - Status do Tor Abrir configurações de localização e canais Peers conectados Participantes geohash diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 156df94b..0e01bb07 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -74,7 +74,6 @@ Alcançável via Nostr Mensagens privadas não lidas Teletransportado - Estado do Tor Abrir definições de localização e canais Pares ligados Participantes geohash diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ab246554..613b008d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -66,7 +66,6 @@ Доступен через Nostr Непрочитанные личные Телепортировано - Статус Tor Открыть настройки местоположения и каналов Подключённые узлы Участники geohash diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6c6a57d1..c0457997 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -66,7 +66,6 @@ Nås via Nostr Olästa privata meddelanden Teleporterad - Tor‑status Öppna plats- och kanalinställningar Anslutna noder Geohash‑deltagare diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 8f6bb836..5e7f8bdd 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -112,7 +112,6 @@ படிக்காத தனிப்பட்ட செய்திகள் இருப்பிட குறிப்புகள் டெலிபோர்ட் செய்யப்பட்டது - Tor நிலை இருப்பிடம் மற்றும் சேனல் அமைப்புகளைத் திற இணைக்கப்பட்ட பியர்ஸ் ஜியோஹாஷ் பங்கேற்பாளர்கள் diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9db333b3..b21049c1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -74,7 +74,6 @@ ติดต่อได้ผ่าน Nostr ข้อความส่วนตัวยังไม่ได้อ่าน เทเลพอร์ตแล้ว - สถานะ Tor เปิดการตั้งค่าตำแหน่งและช่อง เพียร์ที่เชื่อมต่อ ผู้เข้าร่วม geohash diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 98e99c02..533e3252 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -66,7 +66,6 @@ Nostr üzerinden ulaşılabilir Okunmamış özel mesaj Teleport edildi - Tor durumu Konum ve kanal ayarlarını aç Bağlı eşler Geohash katılımcıları diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d39b00fb..cdc73c91 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -105,7 +105,6 @@ Непрочитані приватні повідомлення Нотатки про місце Телепортовано - Статус Tor Відкрити налаштування розташування та каналів Підключені піри Учасники геохешу diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index f2364483..785338fb 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -74,7 +74,6 @@ Nostr کے ذریعے رسائی غیر پڑھے ہوئے نجی پیغامات ٹیلی پورٹ - Tor کی کیفیت مقام اور چینل کی ترتیبات کھولیں منسلک پیئرز geohash شرکاء diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index fda4b40a..b97c3fc5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -74,7 +74,6 @@ Có thể tiếp cận qua Nostr Tin nhắn riêng chưa đọc Đã dịch chuyển - Trạng thái Tor Mở cài đặt vị trí và kênh Peers đã kết nối Người tham gia geohash diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a639dd00..b9e35372 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -121,7 +121,6 @@ 未读私信 位置笔记 已传送 - Tor 状态 已连接的节点 Geohash 参与者 准备握手 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 70fc5986..36b6bbdd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -121,7 +121,6 @@ 未讀私訊 位置筆記 已傳送 - Tor 狀態 已連線的節點 地理雜湊參與者 準備好進行握手 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b84e0e5d..751580a6 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -74,7 +74,6 @@ 可通过 Nostr 联系 未读私信 已传送 - Tor 状态 打开位置和频道设置 已连接节点 Geohash 参与者 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8dff50b..0e272140 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -123,7 +123,6 @@ You Location notes Teleported - Tor status Open location and channel settings Connected peers Geohash participants diff --git a/app/src/test/java/com/bitchat/android/ui/ChatHeaderCrowdingTest.kt b/app/src/test/java/com/bitchat/android/ui/ChatHeaderCrowdingTest.kt index d248bf33..ce079ba7 100644 --- a/app/src/test/java/com/bitchat/android/ui/ChatHeaderCrowdingTest.kt +++ b/app/src/test/java/com/bitchat/android/ui/ChatHeaderCrowdingTest.kt @@ -35,4 +35,34 @@ class ChatHeaderCrowdingTest { headerCrowdingMode(320.dp) ) } + + @Test + fun `icon-only location action includes the selected channel in its description`() { + val action = "Open location and channel settings" + + assertEquals( + action, + locationChannelContentDescription( + actionDescription = action, + channelLabel = "mesh", + showLabel = true + ) + ) + assertEquals( + "mesh. $action", + locationChannelContentDescription( + actionDescription = action, + channelLabel = "mesh", + showLabel = false + ) + ) + assertEquals( + "#u33d. $action", + locationChannelContentDescription( + actionDescription = action, + channelLabel = "#u33d", + showLabel = false + ) + ) + } }