From ccd23c4b8168f516f6ac2b4f16040a1f9e56d6d2 Mon Sep 17 00:00:00 2001 From: Seth Golub Date: Wed, 6 May 2026 08:40:30 -0700 Subject: [PATCH] Remove channel subtitles from UI Per issue #418, this commmit removes channel subtitles from the channel list and from the map screen (deep in the marker sharing). This reduces visual clutter and allows for more compact lists, and the type of channel is already indicated by the leading icon. The subtitles simply said "Public channel", "Hashtag channel", or "Private channel". We also remove the relevant localization strings. --- lib/l10n/app_bg.arb | 3 --- lib/l10n/app_de.arb | 3 --- lib/l10n/app_en.arb | 3 --- lib/l10n/app_es.arb | 3 --- lib/l10n/app_fr.arb | 3 --- lib/l10n/app_hu.arb | 3 --- lib/l10n/app_it.arb | 3 --- lib/l10n/app_ja.arb | 3 --- lib/l10n/app_ko.arb | 3 --- lib/l10n/app_localizations.dart | 18 ------------------ lib/l10n/app_localizations_bg.dart | 9 --------- lib/l10n/app_localizations_de.dart | 9 --------- lib/l10n/app_localizations_en.dart | 9 --------- lib/l10n/app_localizations_es.dart | 9 --------- lib/l10n/app_localizations_fr.dart | 9 --------- lib/l10n/app_localizations_hu.dart | 9 --------- lib/l10n/app_localizations_it.dart | 9 --------- lib/l10n/app_localizations_ja.dart | 9 --------- lib/l10n/app_localizations_ko.dart | 9 --------- lib/l10n/app_localizations_nl.dart | 9 --------- lib/l10n/app_localizations_pl.dart | 9 --------- lib/l10n/app_localizations_pt.dart | 9 --------- lib/l10n/app_localizations_ru.dart | 9 --------- lib/l10n/app_localizations_sk.dart | 9 --------- lib/l10n/app_localizations_sl.dart | 9 --------- lib/l10n/app_localizations_sv.dart | 9 --------- lib/l10n/app_localizations_uk.dart | 9 --------- lib/l10n/app_localizations_zh.dart | 9 --------- lib/l10n/app_nl.arb | 3 --- lib/l10n/app_pl.arb | 3 --- lib/l10n/app_pt.arb | 3 --- lib/l10n/app_ru.arb | 3 --- lib/l10n/app_sk.arb | 3 --- lib/l10n/app_sl.arb | 3 --- lib/l10n/app_sv.arb | 3 --- lib/l10n/app_uk.arb | 3 --- lib/l10n/app_zh.arb | 3 --- lib/screens/channels_screen.dart | 24 +++++++----------------- lib/screens/map_screen.dart | 3 --- 39 files changed, 7 insertions(+), 254 deletions(-) diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb index e3cf5071..a1d2a52c 100644 --- a/lib/l10n/app_bg.arb +++ b/lib/l10n/app_bg.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Канал с хаштаг", "channels_public": "Публично", "channels_private": "Личен", - "channels_publicChannel": "Публичен канал", - "channels_privateChannel": "Частен канал", "channels_editChannel": "Редактирай канал", "channels_muteChannel": "Заглуши канала", "channels_unmuteChannel": "Включи известията на канала", diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 67b59448..1ffa578d 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Hashtag-Kanal", "channels_public": "Öffentlich", "channels_private": "Privat", - "channels_publicChannel": "Öffentlicher Kanal", - "channels_privateChannel": "Privater Kanal", "channels_editChannel": "Kanal bearbeiten", "channels_muteChannel": "Kanal stummschalten", "channels_unmuteChannel": "Kanal Stummschaltung aufheben", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 36a98c6d..8b5cdc2a 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -517,7 +517,6 @@ } } }, - "channels_hashtagChannel": "Hashtag channel", "channels_public": "Public", "channels_via": "via {path}", "@channels_via": { @@ -528,8 +527,6 @@ } }, "channels_private": "Private", - "channels_publicChannel": "Public channel", - "channels_privateChannel": "Private channel", "channels_editChannel": "Edit channel", "channels_muteChannel": "Mute channel", "channels_unmuteChannel": "Unmute channel", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index 99ba7a1d..f7abc499 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Canal con hashtag", "channels_public": "Público", "channels_private": "Privado", - "channels_publicChannel": "Canal público", - "channels_privateChannel": "Canal privado", "channels_editChannel": "Editar canal", "channels_muteChannel": "Silenciar canal", "channels_unmuteChannel": "Activar canal", diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index 0b314b8b..2161f942 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Canal avec hashtag", "channels_public": "Public", "channels_private": "Privé", - "channels_publicChannel": "Canal public", - "channels_privateChannel": "Canal privé", "channels_editChannel": "Modifier le canal", "channels_muteChannel": "Désactiver les notifications du canal", "channels_unmuteChannel": "Réactiver les notifications du canal", diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb index f2931365..286d36ff 100644 --- a/lib/l10n/app_hu.arb +++ b/lib/l10n/app_hu.arb @@ -491,11 +491,8 @@ } } }, - "channels_hashtagChannel": "Hashtag-ok közössége", "channels_public": "A nyilvánosság számára", "channels_private": "Személyes", - "channels_publicChannel": "Össztávos csatorna", - "channels_privateChannel": "Személyes csatorna", "channels_editChannel": "Csatorna szerkesztése", "channels_muteChannel": "Csendes csatorna", "channels_unmuteChannel": "Engedje be a hangot", diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb index 7058eb9e..e95ecb67 100644 --- a/lib/l10n/app_it.arb +++ b/lib/l10n/app_it.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Canale hashtag", "channels_public": "Pubblico", "channels_private": "Privato", - "channels_publicChannel": "Canale pubblico", - "channels_privateChannel": "Canale privato", "channels_editChannel": "Modifica canale", "channels_muteChannel": "Silenzia canale", "channels_unmuteChannel": "Attiva notifiche canale", diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 2ed40fc8..5755cec4 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -491,11 +491,8 @@ } } }, - "channels_hashtagChannel": "ハッシュタグチャンネル", "channels_public": "一般の人々", "channels_private": "個人の", - "channels_publicChannel": "一般チャンネル", - "channels_privateChannel": "プライベートチャンネル", "channels_editChannel": "チャンネルを編集する", "channels_muteChannel": "ミュート機能", "channels_unmuteChannel": "ミュートを解除する", diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb index 520cd214..661d825c 100644 --- a/lib/l10n/app_ko.arb +++ b/lib/l10n/app_ko.arb @@ -491,11 +491,8 @@ } } }, - "channels_hashtagChannel": "해시태그 채널", "channels_public": "대중의", "channels_private": "사립", - "channels_publicChannel": "공개 채널", - "channels_privateChannel": "개인 채널", "channels_editChannel": "채널 편집", "channels_muteChannel": "음소거 채널", "channels_unmuteChannel": "채널 음소거 해제", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index c5720915..f1029fd5 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -2050,12 +2050,6 @@ abstract class AppLocalizations { /// **'Channel {index}'** String channels_channelIndex(int index); - /// No description provided for @channels_hashtagChannel. - /// - /// In en, this message translates to: - /// **'Hashtag channel'** - String get channels_hashtagChannel; - /// No description provided for @channels_public. /// /// In en, this message translates to: @@ -2074,18 +2068,6 @@ abstract class AppLocalizations { /// **'Private'** String get channels_private; - /// No description provided for @channels_publicChannel. - /// - /// In en, this message translates to: - /// **'Public channel'** - String get channels_publicChannel; - - /// No description provided for @channels_privateChannel. - /// - /// In en, this message translates to: - /// **'Private channel'** - String get channels_privateChannel; - /// No description provided for @channels_editChannel. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 46df9bab..6c217aa9 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -1099,9 +1099,6 @@ class AppLocalizationsBg extends AppLocalizations { return 'Канал $index'; } - @override - String get channels_hashtagChannel => 'Канал с хаштаг'; - @override String get channels_public => 'Публично'; @@ -1113,12 +1110,6 @@ class AppLocalizationsBg extends AppLocalizations { @override String get channels_private => 'Личен'; - @override - String get channels_publicChannel => 'Публичен канал'; - - @override - String get channels_privateChannel => 'Частен канал'; - @override String get channels_editChannel => 'Редактирай канал'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index f6e264d3..0398a525 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -1094,9 +1094,6 @@ class AppLocalizationsDe extends AppLocalizations { return 'Kanal $index'; } - @override - String get channels_hashtagChannel => 'Hashtag-Kanal'; - @override String get channels_public => 'Öffentlich'; @@ -1108,12 +1105,6 @@ class AppLocalizationsDe extends AppLocalizations { @override String get channels_private => 'Privat'; - @override - String get channels_publicChannel => 'Öffentlicher Kanal'; - - @override - String get channels_privateChannel => 'Privater Kanal'; - @override String get channels_editChannel => 'Kanal bearbeiten'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 3391d333..aea59c37 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -1076,9 +1076,6 @@ class AppLocalizationsEn extends AppLocalizations { return 'Channel $index'; } - @override - String get channels_hashtagChannel => 'Hashtag channel'; - @override String get channels_public => 'Public'; @@ -1090,12 +1087,6 @@ class AppLocalizationsEn extends AppLocalizations { @override String get channels_private => 'Private'; - @override - String get channels_publicChannel => 'Public channel'; - - @override - String get channels_privateChannel => 'Private channel'; - @override String get channels_editChannel => 'Edit channel'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 6314934e..40d9b9fa 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -1096,9 +1096,6 @@ class AppLocalizationsEs extends AppLocalizations { return 'Canal $index'; } - @override - String get channels_hashtagChannel => 'Canal con hashtag'; - @override String get channels_public => 'Público'; @@ -1110,12 +1107,6 @@ class AppLocalizationsEs extends AppLocalizations { @override String get channels_private => 'Privado'; - @override - String get channels_publicChannel => 'Canal público'; - - @override - String get channels_privateChannel => 'Canal privado'; - @override String get channels_editChannel => 'Editar canal'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index d5f014c7..a8f3c11c 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -1101,9 +1101,6 @@ class AppLocalizationsFr extends AppLocalizations { return 'Canal $index'; } - @override - String get channels_hashtagChannel => 'Canal avec hashtag'; - @override String get channels_public => 'Public'; @@ -1115,12 +1112,6 @@ class AppLocalizationsFr extends AppLocalizations { @override String get channels_private => 'Privé'; - @override - String get channels_publicChannel => 'Canal public'; - - @override - String get channels_privateChannel => 'Canal privé'; - @override String get channels_editChannel => 'Modifier le canal'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index b0777599..99f3990c 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -1101,9 +1101,6 @@ class AppLocalizationsHu extends AppLocalizations { return '$index-os csatorna'; } - @override - String get channels_hashtagChannel => 'Hashtag-ok közössége'; - @override String get channels_public => 'A nyilvánosság számára'; @@ -1115,12 +1112,6 @@ class AppLocalizationsHu extends AppLocalizations { @override String get channels_private => 'Személyes'; - @override - String get channels_publicChannel => 'Össztávos csatorna'; - - @override - String get channels_privateChannel => 'Személyes csatorna'; - @override String get channels_editChannel => 'Csatorna szerkesztése'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index 67a10de4..a7f2920a 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -1097,9 +1097,6 @@ class AppLocalizationsIt extends AppLocalizations { return 'Canale $index'; } - @override - String get channels_hashtagChannel => 'Canale hashtag'; - @override String get channels_public => 'Pubblico'; @@ -1111,12 +1108,6 @@ class AppLocalizationsIt extends AppLocalizations { @override String get channels_private => 'Privato'; - @override - String get channels_publicChannel => 'Canale pubblico'; - - @override - String get channels_privateChannel => 'Canale privato'; - @override String get channels_editChannel => 'Modifica canale'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index 29b556c6..c816aa6f 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -1043,9 +1043,6 @@ class AppLocalizationsJa extends AppLocalizations { return 'チャンネル $index'; } - @override - String get channels_hashtagChannel => 'ハッシュタグチャンネル'; - @override String get channels_public => '一般の人々'; @@ -1057,12 +1054,6 @@ class AppLocalizationsJa extends AppLocalizations { @override String get channels_private => '個人の'; - @override - String get channels_publicChannel => '一般チャンネル'; - - @override - String get channels_privateChannel => 'プライベートチャンネル'; - @override String get channels_editChannel => 'チャンネルを編集する'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index 4b016d36..6e713b6f 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -1038,9 +1038,6 @@ class AppLocalizationsKo extends AppLocalizations { return '채널 $index'; } - @override - String get channels_hashtagChannel => '해시태그 채널'; - @override String get channels_public => '대중의'; @@ -1052,12 +1049,6 @@ class AppLocalizationsKo extends AppLocalizations { @override String get channels_private => '사립'; - @override - String get channels_publicChannel => '공개 채널'; - - @override - String get channels_privateChannel => '개인 채널'; - @override String get channels_editChannel => '채널 편집'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index 4db1cced..632d0b49 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -1086,9 +1086,6 @@ class AppLocalizationsNl extends AppLocalizations { return 'Kanaal $index'; } - @override - String get channels_hashtagChannel => 'Hashtag kanaal'; - @override String get channels_public => 'Openbaar'; @@ -1100,12 +1097,6 @@ class AppLocalizationsNl extends AppLocalizations { @override String get channels_private => 'Privé'; - @override - String get channels_publicChannel => 'Open kanaal'; - - @override - String get channels_privateChannel => 'Private kanaal'; - @override String get channels_editChannel => 'Kanaal bewerken'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index 3f19da09..2da1e88d 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -1106,9 +1106,6 @@ class AppLocalizationsPl extends AppLocalizations { return 'Kanał $index'; } - @override - String get channels_hashtagChannel => 'Kanał hashtagów'; - @override String get channels_public => 'Publiczny'; @@ -1120,12 +1117,6 @@ class AppLocalizationsPl extends AppLocalizations { @override String get channels_private => 'Prywatny'; - @override - String get channels_publicChannel => 'Kanał publiczny'; - - @override - String get channels_privateChannel => 'Prywatny kanał'; - @override String get channels_editChannel => 'Edytuj kanał'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index 523ba2e7..7dbc3d3d 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -1097,9 +1097,6 @@ class AppLocalizationsPt extends AppLocalizations { return 'Canal $index'; } - @override - String get channels_hashtagChannel => 'Canal com hashtag'; - @override String get channels_public => 'Público'; @@ -1111,12 +1108,6 @@ class AppLocalizationsPt extends AppLocalizations { @override String get channels_private => 'Privado'; - @override - String get channels_publicChannel => 'Canal público'; - - @override - String get channels_privateChannel => 'Canal privado'; - @override String get channels_editChannel => 'Editar canal'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index a90cd77f..90e93053 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -1097,9 +1097,6 @@ class AppLocalizationsRu extends AppLocalizations { return 'Канал $index'; } - @override - String get channels_hashtagChannel => 'Хэштег-канал'; - @override String get channels_public => 'Публичный'; @@ -1111,12 +1108,6 @@ class AppLocalizationsRu extends AppLocalizations { @override String get channels_private => 'Приватный'; - @override - String get channels_publicChannel => 'Публичный канал'; - - @override - String get channels_privateChannel => 'Приватный канал'; - @override String get channels_editChannel => 'Изменить канал'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index e7711be5..86b6a0a0 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -1086,9 +1086,6 @@ class AppLocalizationsSk extends AppLocalizations { return 'Kanál $index'; } - @override - String get channels_hashtagChannel => 'Kanál s hashtagom'; - @override String get channels_public => 'Veľké verejné'; @@ -1100,12 +1097,6 @@ class AppLocalizationsSk extends AppLocalizations { @override String get channels_private => 'Osobné'; - @override - String get channels_publicChannel => 'Veľké verejne kanály'; - - @override - String get channels_privateChannel => 'Osobné kanál'; - @override String get channels_editChannel => 'Upraviť kanál'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 8a16ae02..d6f1a5af 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -1084,9 +1084,6 @@ class AppLocalizationsSl extends AppLocalizations { return 'Kanal $index'; } - @override - String get channels_hashtagChannel => 'Hashtag kanal'; - @override String get channels_public => 'Javni'; @@ -1098,12 +1095,6 @@ class AppLocalizationsSl extends AppLocalizations { @override String get channels_private => 'Zasebni'; - @override - String get channels_publicChannel => 'Javni kanal'; - - @override - String get channels_privateChannel => 'Zasebni kanal'; - @override String get channels_editChannel => 'Uredi kanal'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index 754058c6..b0d66033 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -1077,9 +1077,6 @@ class AppLocalizationsSv extends AppLocalizations { return 'Kanal $index'; } - @override - String get channels_hashtagChannel => 'Hashtagkanal'; - @override String get channels_public => 'Offentligt'; @@ -1091,12 +1088,6 @@ class AppLocalizationsSv extends AppLocalizations { @override String get channels_private => 'Privat'; - @override - String get channels_publicChannel => 'Allmänt kanal'; - - @override - String get channels_privateChannel => 'Privat kanal'; - @override String get channels_editChannel => 'Redigera kanal'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index d565747a..7c36065b 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -1092,9 +1092,6 @@ class AppLocalizationsUk extends AppLocalizations { return 'Канал $index'; } - @override - String get channels_hashtagChannel => 'Хештег-канал'; - @override String get channels_public => 'Публічний'; @@ -1106,12 +1103,6 @@ class AppLocalizationsUk extends AppLocalizations { @override String get channels_private => 'Приватний'; - @override - String get channels_publicChannel => 'Публічний канал'; - - @override - String get channels_privateChannel => 'Приватний канал'; - @override String get channels_editChannel => 'Редагувати канал'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 54da237a..57f5a7be 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -1025,9 +1025,6 @@ class AppLocalizationsZh extends AppLocalizations { return '频道 $index'; } - @override - String get channels_hashtagChannel => '标签频道'; - @override String get channels_public => '公共'; @@ -1039,12 +1036,6 @@ class AppLocalizationsZh extends AppLocalizations { @override String get channels_private => '私有'; - @override - String get channels_publicChannel => '公共频道'; - - @override - String get channels_privateChannel => '私有频道'; - @override String get channels_editChannel => '编辑频道'; diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb index f0569661..a0436db7 100644 --- a/lib/l10n/app_nl.arb +++ b/lib/l10n/app_nl.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Hashtag kanaal", "channels_public": "Openbaar", "channels_private": "Privé", - "channels_publicChannel": "Open kanaal", - "channels_privateChannel": "Private kanaal", "channels_editChannel": "Kanaal bewerken", "channels_muteChannel": "Kanaal dempen", "channels_unmuteChannel": "Kanaal dempen opheffen", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index 8464a820..f9d41d1c 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -349,11 +349,8 @@ } } }, - "channels_hashtagChannel": "Kanał hashtagów", "channels_public": "Publiczny", "channels_private": "Prywatny", - "channels_publicChannel": "Kanał publiczny", - "channels_privateChannel": "Prywatny kanał", "channels_editChannel": "Edytuj kanał", "channels_muteChannel": "Wycisz kanał", "channels_unmuteChannel": "Wyłącz wyciszenie kanału", diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 84222828..4a312a38 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Canal com hashtag", "channels_public": "Público", "channels_private": "Privado", - "channels_publicChannel": "Canal público", - "channels_privateChannel": "Canal privado", "channels_editChannel": "Editar canal", "channels_muteChannel": "Silenciar canal", "channels_unmuteChannel": "Ativar canal", diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index ee12f8bc..5dde7600 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -231,11 +231,8 @@ "channels_searchChannels": "Поиск каналов...", "channels_noChannelsFound": "Каналы не найдены", "channels_channelIndex": "Канал {index}", - "channels_hashtagChannel": "Хэштег-канал", "channels_public": "Публичный", "channels_private": "Приватный", - "channels_publicChannel": "Публичный канал", - "channels_privateChannel": "Приватный канал", "channels_editChannel": "Изменить канал", "channels_muteChannel": "Отключить уведомления канала", "channels_unmuteChannel": "Включить уведомления канала", diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb index 00d6371e..c0c78d35 100644 --- a/lib/l10n/app_sk.arb +++ b/lib/l10n/app_sk.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Kanál s hashtagom", "channels_public": "Veľké verejné", "channels_private": "Osobné", - "channels_publicChannel": "Veľké verejne kanály", - "channels_privateChannel": "Osobné kanál", "channels_editChannel": "Upraviť kanál", "channels_muteChannel": "Stlmiť kanál", "channels_unmuteChannel": "Zrušiť stlmenie kanála", diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb index 225e6354..a82df810 100644 --- a/lib/l10n/app_sl.arb +++ b/lib/l10n/app_sl.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Hashtag kanal", "channels_public": "Javni", "channels_private": "Zasebni", - "channels_publicChannel": "Javni kanal", - "channels_privateChannel": "Zasebni kanal", "channels_editChannel": "Uredi kanal", "channels_muteChannel": "Utišaj kanal", "channels_unmuteChannel": "Vklopi obvestila kanala", diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index 2c0e9184..e759129d 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -339,11 +339,8 @@ } } }, - "channels_hashtagChannel": "Hashtagkanal", "channels_public": "Offentligt", "channels_private": "Privat", - "channels_publicChannel": "Allmänt kanal", - "channels_privateChannel": "Privat kanal", "channels_editChannel": "Redigera kanal", "channels_muteChannel": "Tysta kanal", "channels_unmuteChannel": "Slå på ljud för kanal", diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index f0c56074..e149fa10 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -341,12 +341,9 @@ } } }, - "channels_hashtagChannel": "Хештег-канал", "channels_public": "Публічний", "channels_via": "через {path}", "channels_private": "Приватний", - "channels_publicChannel": "Публічний канал", - "channels_privateChannel": "Приватний канал", "channels_editChannel": "Редагувати канал", "channels_muteChannel": "Вимкнути сповіщення каналу", "channels_unmuteChannel": "Увімкнути сповіщення каналу", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index fc58a19e..65a1f074 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -354,11 +354,8 @@ } } }, - "channels_hashtagChannel": "标签频道", "channels_public": "公共", "channels_private": "私有", - "channels_publicChannel": "公共频道", - "channels_privateChannel": "私有频道", "channels_editChannel": "编辑频道", "channels_muteChannel": "静音频道", "channels_unmuteChannel": "取消静音频道", diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart index 5db12852..155939bd 100644 --- a/lib/screens/channels_screen.dart +++ b/lib/screens/channels_screen.dart @@ -384,7 +384,6 @@ class _ChannelsScreenState extends State IconData icon; Color iconColor; Color bgColor; - String subtitle; if (isCommunityChannel) { // Community channel styling @@ -392,28 +391,21 @@ class _ChannelsScreenState extends State bgColor = Colors.purple.withValues(alpha: 0.2); if (isCommunityPublic) { icon = Icons.groups; - subtitle = - '${context.l10n.community_publicChannel} • ${community.name}'; } else { icon = Icons.tag; - subtitle = - '${context.l10n.community_hashtagChannel} • ${community.name}'; } } else if (channel.isPublicChannel) { icon = Icons.public; iconColor = Colors.green; bgColor = Colors.green.withValues(alpha: 0.2); - subtitle = context.l10n.channels_publicChannel; } else if (channel.name.startsWith('#')) { icon = Icons.tag; iconColor = Colors.blue; bgColor = Colors.blue.withValues(alpha: 0.2); - subtitle = context.l10n.channels_hashtagChannel; } else { icon = Icons.lock; iconColor = Colors.blue; bgColor = Colors.blue.withValues(alpha: 0.2); - subtitle = context.l10n.channels_privateChannel; } return Card( @@ -430,14 +422,17 @@ class _ChannelsScreenState extends State : null, child: ListTile( dense: true, - minVerticalPadding: 0, + minVerticalPadding: 14, contentPadding: const EdgeInsets.symmetric(horizontal: 12), visualDensity: const VisualDensity(vertical: -2), leading: Stack( children: [ - CircleAvatar( - backgroundColor: bgColor, - child: Icon(icon, color: iconColor), + Padding( + padding: const EdgeInsets.symmetric(vertical: 3), + child: CircleAvatar( + backgroundColor: bgColor, + child: Icon(icon, color: iconColor), + ), ), if (isCommunityChannel) Positioned( @@ -469,11 +464,6 @@ class _ChannelsScreenState extends State : channel.name, style: const TextStyle(fontWeight: FontWeight.w500), ), - subtitle: Text( - subtitle, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), trailing: Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart index 9108e2b4..4ae2fd43 100644 --- a/lib/screens/map_screen.dart +++ b/lib/screens/map_screen.dart @@ -2011,9 +2011,6 @@ class _MapScreenState extends State { color: isPublic ? Colors.orange : Colors.blue, ), title: Text(label), - subtitle: isPublic - ? Text(context.l10n.channels_publicChannel) - : null, onTap: () async { Navigator.pop(sheetContext); final canSend = isPublic