Declutter the map overlay
Drop the row of activity/type/group chips under the Local/Online/Both switch; every option is already in the filter sheet, whose button now shows a badge with the number of active filters. Add a one-line hint to each map source segment.
This commit is contained in:
1 parent
00756ef05e
commit
ed5884e252
22 files changed
+303
-145
No files matched your search
@@ -3467,6 +3467,9 @@
|
|||||||
"networkMap_sourceLocal": "Local",
|
"networkMap_sourceLocal": "Local",
|
||||||
"networkMap_sourceOnline": "Online",
|
"networkMap_sourceOnline": "Online",
|
||||||
"networkMap_sourceBoth": "Both",
|
"networkMap_sourceBoth": "Both",
|
||||||
|
"networkMap_sourceLocalHint": "Nodes your radio has heard",
|
||||||
|
"networkMap_sourceOnlineHint": "Repeaters from the online network map",
|
||||||
|
"networkMap_sourceBothHint": "Your radio's nodes plus the online network map",
|
||||||
"networkMap_zoomInHint": "Zoom in to see the online network map",
|
"networkMap_zoomInHint": "Zoom in to see the online network map",
|
||||||
"networkMap_loadFailed": "Couldn't load the online network map",
|
"networkMap_loadFailed": "Couldn't load the online network map",
|
||||||
"networkMap_inYourContacts": "In your contacts",
|
"networkMap_inYourContacts": "In your contacts",
|
||||||
|
|||||||
@@ -10477,6 +10477,24 @@ abstract class AppLocalizations {
|
|||||||
/// **'Both'**
|
/// **'Both'**
|
||||||
String get networkMap_sourceBoth;
|
String get networkMap_sourceBoth;
|
||||||
|
|
||||||
|
/// No description provided for @networkMap_sourceLocalHint.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Nodes your radio has heard'**
|
||||||
|
String get networkMap_sourceLocalHint;
|
||||||
|
|
||||||
|
/// No description provided for @networkMap_sourceOnlineHint.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Repeaters from the online network map'**
|
||||||
|
String get networkMap_sourceOnlineHint;
|
||||||
|
|
||||||
|
/// No description provided for @networkMap_sourceBothHint.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Your radio\'s nodes plus the online network map'**
|
||||||
|
String get networkMap_sourceBothHint;
|
||||||
|
|
||||||
/// No description provided for @networkMap_zoomInHint.
|
/// No description provided for @networkMap_zoomInHint.
|
||||||
///
|
///
|
||||||
/// In en, this message translates to:
|
/// In en, this message translates to:
|
||||||
|
|||||||
@@ -6256,6 +6256,17 @@ class AppLocalizationsBg extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'И двете';
|
String get networkMap_sourceBoth => 'И двете';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Увеличете, за да видите онлайн мрежовата карта';
|
'Увеличете, за да видите онлайн мрежовата карта';
|
||||||
|
|||||||
@@ -6269,6 +6269,17 @@ class AppLocalizationsDe extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Beides';
|
String get networkMap_sourceBoth => 'Beides';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Zoome hinein, um die Online-Netzwerkkarte zu sehen';
|
'Zoome hinein, um die Online-Netzwerkkarte zu sehen';
|
||||||
|
|||||||
@@ -6167,6 +6167,17 @@ class AppLocalizationsEn extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Both';
|
String get networkMap_sourceBoth => 'Both';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint => 'Zoom in to see the online network map';
|
String get networkMap_zoomInHint => 'Zoom in to see the online network map';
|
||||||
|
|
||||||
|
|||||||
@@ -6258,6 +6258,17 @@ class AppLocalizationsEs extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Ambos';
|
String get networkMap_sourceBoth => 'Ambos';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Acerca el zoom para ver el mapa de la red en línea';
|
'Acerca el zoom para ver el mapa de la red en línea';
|
||||||
|
|||||||
@@ -6284,6 +6284,17 @@ class AppLocalizationsFr extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Les deux';
|
String get networkMap_sourceBoth => 'Les deux';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Zoomez pour voir la carte du réseau en ligne';
|
'Zoomez pour voir la carte du réseau en ligne';
|
||||||
|
|||||||
@@ -6246,6 +6246,17 @@ class AppLocalizationsHu extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Mindkettő';
|
String get networkMap_sourceBoth => 'Mindkettő';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Nagyíts rá az online hálózati térkép megtekintéséhez';
|
'Nagyíts rá az online hálózati térkép megtekintéséhez';
|
||||||
|
|||||||
@@ -6265,6 +6265,17 @@ class AppLocalizationsIt extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Entrambi';
|
String get networkMap_sourceBoth => 'Entrambi';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Ingrandisci per vedere la mappa della rete online';
|
'Ingrandisci per vedere la mappa della rete online';
|
||||||
|
|||||||
@@ -5965,6 +5965,17 @@ class AppLocalizationsJa extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => '両方';
|
String get networkMap_sourceBoth => '両方';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint => 'ズームインするとオンラインのネットワークマップが表示されます';
|
String get networkMap_zoomInHint => 'ズームインするとオンラインのネットワークマップが表示されます';
|
||||||
|
|
||||||
|
|||||||
@@ -5975,6 +5975,17 @@ class AppLocalizationsKo extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => '모두';
|
String get networkMap_sourceBoth => '모두';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint => '온라인 네트워크 지도를 보려면 확대하세요';
|
String get networkMap_zoomInHint => '온라인 네트워크 지도를 보려면 확대하세요';
|
||||||
|
|
||||||
|
|||||||
@@ -6223,6 +6223,17 @@ class AppLocalizationsNl extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Beide';
|
String get networkMap_sourceBoth => 'Beide';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Zoom in om de online netwerkkaart te zien';
|
'Zoom in om de online netwerkkaart te zien';
|
||||||
|
|||||||
@@ -6289,6 +6289,17 @@ class AppLocalizationsPl extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Obie';
|
String get networkMap_sourceBoth => 'Obie';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Przybliż, aby zobaczyć mapę sieci online';
|
'Przybliż, aby zobaczyć mapę sieci online';
|
||||||
|
|||||||
@@ -6253,6 +6253,17 @@ class AppLocalizationsPt extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Ambos';
|
String get networkMap_sourceBoth => 'Ambos';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Aproxime o zoom para ver o mapa da rede online';
|
'Aproxime o zoom para ver o mapa da rede online';
|
||||||
|
|||||||
@@ -6276,6 +6276,17 @@ class AppLocalizationsRu extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Обе';
|
String get networkMap_sourceBoth => 'Обе';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Приблизьте, чтобы увидеть онлайн-карту сети';
|
'Приблизьте, чтобы увидеть онлайн-карту сети';
|
||||||
|
|||||||
@@ -6236,6 +6236,17 @@ class AppLocalizationsSk extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Obe';
|
String get networkMap_sourceBoth => 'Obe';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Priblížte, aby ste videli online sieťovú mapu';
|
'Priblížte, aby ste videli online sieťovú mapu';
|
||||||
|
|||||||
@@ -6238,6 +6238,17 @@ class AppLocalizationsSl extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Oboje';
|
String get networkMap_sourceBoth => 'Oboje';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Povečajte, da vidite spletni omrežni zemljevid';
|
'Povečajte, da vidite spletni omrežni zemljevid';
|
||||||
|
|||||||
@@ -6203,6 +6203,17 @@ class AppLocalizationsSv extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Båda';
|
String get networkMap_sourceBoth => 'Båda';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Zooma in för att se nätverkskartan online';
|
'Zooma in för att se nätverkskartan online';
|
||||||
|
|||||||
@@ -6277,6 +6277,17 @@ class AppLocalizationsUk extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => 'Обидві';
|
String get networkMap_sourceBoth => 'Обидві';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint =>
|
String get networkMap_zoomInHint =>
|
||||||
'Наблизьте, щоб побачити онлайн-карту мережі';
|
'Наблизьте, щоб побачити онлайн-карту мережі';
|
||||||
|
|||||||
@@ -5830,6 +5830,17 @@ class AppLocalizationsZh extends AppLocalizations {
|
|||||||
@override
|
@override
|
||||||
String get networkMap_sourceBoth => '两者';
|
String get networkMap_sourceBoth => '两者';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceLocalHint => 'Nodes your radio has heard';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceOnlineHint =>
|
||||||
|
'Repeaters from the online network map';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get networkMap_sourceBothHint =>
|
||||||
|
'Your radio\'s nodes plus the online network map';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get networkMap_zoomInHint => '放大以查看在线网络地图';
|
String get networkMap_zoomInHint => '放大以查看在线网络地图';
|
||||||
|
|
||||||
|
|||||||
+16
-128
@@ -1080,7 +1080,11 @@ class _MapScreenState extends State<MapScreen> with DisconnectNavigationMixin {
|
|||||||
? FloatingActionButton(
|
? FloatingActionButton(
|
||||||
onPressed: () => _showFilterSheet(context, settingsService),
|
onPressed: () => _showFilterSheet(context, settingsService),
|
||||||
tooltip: context.l10n.map_filterNodes,
|
tooltip: context.l10n.map_filterNodes,
|
||||||
child: const Icon(Icons.filter_list),
|
child: Badge.count(
|
||||||
|
count: _activeFilterCount(settings),
|
||||||
|
isLabelVisible: _activeFilterCount(settings) > 0,
|
||||||
|
child: const Icon(Icons.filter_list),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
@@ -2023,69 +2027,6 @@ class _MapScreenState extends State<MapScreen> with DisconnectNavigationMixin {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 6),
|
const SizedBox(height: 6),
|
||||||
_buildMapSourceSwitch(context, mapSource),
|
_buildMapSourceSwitch(context, mapSource),
|
||||||
const SizedBox(height: 6),
|
|
||||||
LayoutBuilder(
|
|
||||||
builder: (context, constraints) {
|
|
||||||
final chips = <Widget>[
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.time_allTime,
|
|
||||||
selected: _freshness == _Freshness.all,
|
|
||||||
onTap: () => setState(() => _freshness = _Freshness.all),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_online,
|
|
||||||
selected: _freshness == _Freshness.online,
|
|
||||||
color: MapPalette.online,
|
|
||||||
onTap: () => setState(() => _freshness = _Freshness.online),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_recent,
|
|
||||||
selected: _freshness == _Freshness.recent,
|
|
||||||
color: MapPalette.stale,
|
|
||||||
onTap: () => setState(() => _freshness = _Freshness.recent),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_stale,
|
|
||||||
selected: _freshness == _Freshness.stale,
|
|
||||||
color: MapPalette.offline,
|
|
||||||
onTap: () => setState(() => _freshness = _Freshness.stale),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_repeaters,
|
|
||||||
selected: settings.mapShowRepeaters,
|
|
||||||
color: MapPalette.repeater,
|
|
||||||
onTap: () => settingsService.setMapShowRepeaters(
|
|
||||||
!settings.mapShowRepeaters,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_chatNodes,
|
|
||||||
selected: settings.mapShowChatNodes,
|
|
||||||
color: MapPalette.selected,
|
|
||||||
onTap: () => settingsService.setMapShowChatNodes(
|
|
||||||
!settings.mapShowChatNodes,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
_mapChip(
|
|
||||||
label: context.l10n.map_groupChip,
|
|
||||||
selected: settings.mapClusterNodes,
|
|
||||||
color: MapPalette.cluster,
|
|
||||||
onTap: () => settingsService.setMapClusterNodes(
|
|
||||||
!settings.mapClusterNodes,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
];
|
|
||||||
|
|
||||||
if (constraints.maxWidth < 600) {
|
|
||||||
return Wrap(runSpacing: 6, children: chips);
|
|
||||||
}
|
|
||||||
|
|
||||||
return SingleChildScrollView(
|
|
||||||
scrollDirection: Axis.horizontal,
|
|
||||||
child: Row(children: chips),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
if (hasQuery)
|
if (hasQuery)
|
||||||
_buildSearchResults(context, allContacts, guessedLocations)
|
_buildSearchResults(context, allContacts, guessedLocations)
|
||||||
else if (_statsExpanded)
|
else if (_statsExpanded)
|
||||||
@@ -2107,6 +2048,14 @@ class _MapScreenState extends State<MapScreen> with DisconnectNavigationMixin {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int _activeFilterCount(AppSettings settings) => [
|
||||||
|
_freshness != _Freshness.all,
|
||||||
|
!settings.mapShowChatNodes,
|
||||||
|
!settings.mapShowRepeaters,
|
||||||
|
!settings.mapShowOtherNodes,
|
||||||
|
settings.mapKeyPrefixEnabled,
|
||||||
|
].where((active) => active).length;
|
||||||
|
|
||||||
Widget _buildMapSourceSwitch(BuildContext context, MapSourceOption source) {
|
Widget _buildMapSourceSwitch(BuildContext context, MapSourceOption source) {
|
||||||
final l10n = context.l10n;
|
final l10n = context.l10n;
|
||||||
return Material(
|
return Material(
|
||||||
@@ -2128,16 +2077,19 @@ class _MapScreenState extends State<MapScreen> with DisconnectNavigationMixin {
|
|||||||
value: MapSourceOption.local,
|
value: MapSourceOption.local,
|
||||||
icon: const Icon(Icons.radio, size: 20),
|
icon: const Icon(Icons.radio, size: 20),
|
||||||
label: Text(l10n.networkMap_sourceLocal),
|
label: Text(l10n.networkMap_sourceLocal),
|
||||||
|
tooltip: l10n.networkMap_sourceLocalHint,
|
||||||
),
|
),
|
||||||
ButtonSegment(
|
ButtonSegment(
|
||||||
value: MapSourceOption.online,
|
value: MapSourceOption.online,
|
||||||
icon: const Icon(Icons.public, size: 20),
|
icon: const Icon(Icons.public, size: 20),
|
||||||
label: Text(l10n.networkMap_sourceOnline),
|
label: Text(l10n.networkMap_sourceOnline),
|
||||||
|
tooltip: l10n.networkMap_sourceOnlineHint,
|
||||||
),
|
),
|
||||||
ButtonSegment(
|
ButtonSegment(
|
||||||
value: MapSourceOption.both,
|
value: MapSourceOption.both,
|
||||||
icon: const Icon(Icons.layers, size: 20),
|
icon: const Icon(Icons.layers, size: 20),
|
||||||
label: Text(l10n.networkMap_sourceBoth),
|
label: Text(l10n.networkMap_sourceBoth),
|
||||||
|
tooltip: l10n.networkMap_sourceBothHint,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
selected: {source},
|
selected: {source},
|
||||||
@@ -2177,70 +2129,6 @@ class _MapScreenState extends State<MapScreen> with DisconnectNavigationMixin {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _mapChip({
|
|
||||||
required String label,
|
|
||||||
required bool selected,
|
|
||||||
required VoidCallback onTap,
|
|
||||||
Color? color,
|
|
||||||
}) {
|
|
||||||
final accent = color ?? MapPalette.selected;
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(right: 6),
|
|
||||||
child: Semantics(
|
|
||||||
button: true,
|
|
||||||
selected: selected,
|
|
||||||
child: Material(
|
|
||||||
color: selected
|
|
||||||
? Color.alphaBlend(
|
|
||||||
accent.withValues(alpha: 0.34),
|
|
||||||
_overlayPanelColor,
|
|
||||||
)
|
|
||||||
: _overlayPanelColor,
|
|
||||||
shape: StadiumBorder(
|
|
||||||
side: BorderSide(
|
|
||||||
color: selected ? accent : _overlayBorderColor,
|
|
||||||
width: selected ? 1.5 : 1,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
clipBehavior: Clip.antiAlias,
|
|
||||||
child: InkWell(
|
|
||||||
onTap: () {
|
|
||||||
HapticFeedback.selectionClick();
|
|
||||||
onTap();
|
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
constraints: const BoxConstraints(minHeight: 44),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 14),
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
if (selected) ...[
|
|
||||||
Icon(
|
|
||||||
Icons.check,
|
|
||||||
size: 16,
|
|
||||||
color: _overlayPrimaryTextColor,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 4),
|
|
||||||
],
|
|
||||||
Text(
|
|
||||||
label,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 14,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
color: selected
|
|
||||||
? _overlayPrimaryTextColor
|
|
||||||
: _overlaySecondaryTextColor,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildSearchResults(
|
Widget _buildSearchResults(
|
||||||
BuildContext context,
|
BuildContext context,
|
||||||
List<Contact> allContacts,
|
List<Contact> allContacts,
|
||||||
|
|||||||
+68
-17
@@ -1,69 +1,120 @@
|
|||||||
{
|
{
|
||||||
"bg": [
|
"bg": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"de": [
|
"de": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"es": [
|
"es": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"fr": [
|
"fr": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"hu": [
|
"hu": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"it": [
|
"it": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"ja": [
|
"ja": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"ko": [
|
"ko": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"nl": [
|
"nl": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"pl": [
|
"pl": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"pt": [
|
"pt": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"ru": [
|
"ru": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"sk": [
|
"sk": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"sl": [
|
"sl": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"sv": [
|
"sv": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"uk": [
|
"uk": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
],
|
],
|
||||||
|
|
||||||
"zh": [
|
"zh": [
|
||||||
"contacts_keyPrefixSemantics"
|
"contacts_keyPrefixSemantics",
|
||||||
|
"networkMap_sourceLocalHint",
|
||||||
|
"networkMap_sourceOnlineHint",
|
||||||
|
"networkMap_sourceBothHint"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user