Give the map the whole screen and move the credits into settings
Drops the app bar, moves settings onto the map with the other controls, and takes the attribution bar off the main screen. The app bar held only the app name — which the launcher already shows — and one action, so removing it hands its height to the map rather than leaving an empty strip. The settings button joins search and recentre in the column over the map, where the rest of the controls that act on the map already live. The attribution needed checking before it could move, because it is a licence obligation rather than a layout choice. The OSMF guidelines settle it: for a browsable map the credit does not have to be permanently visible, provided "the user must still be able to find the licence information if they look for it, for example from an '(i)' button in the corner of the map or an 'About' option in a menu". Map to settings to "Fonti e licenze" is exactly that, and MapLibre's own (i) control now sits in the map's top-right corner as a second route — it had been landing underneath the new button column. Two things had to follow the bar rather than disappear with it. The radar manifest carries its own credit for the frames on screen, set by whoever published them and absent from the region config, so the Sources screen now shows it alongside the configured attributions. And the settings entry that leads there carries a subtitle saying what it holds, because "Fonti e licenze" alone does not tell a reader that this is where the licence information went. settings_screen_test asserts that entry exists and opens the screen. Removing it would be a licence breach, so it should fail the build rather than ship quietly. Verified on the emulator: no title bar, the map runs to the top with the demo notice above it, the three controls stack bottom-right without colliding with the (i), and settings shows the sources entry with its subtitle. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,12 +5,18 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
import '../../core/region/region_config.dart';
|
||||
import '../../core/region/region_repository.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../timeline/radar_timeline.dart';
|
||||
|
||||
/// Sources, licences and the independence disclaimer.
|
||||
///
|
||||
/// Reachable from the attribution bar on every screen that shows data. The
|
||||
/// content is driven by the region config so a new region cannot ship without
|
||||
/// its credits.
|
||||
/// Reached from Settings, which is one tap from the map. That path is what the
|
||||
/// OSM attribution guidelines call for: the credit does not have to sit on the
|
||||
/// map permanently, but it must stay findable from it — "an (i) button in the
|
||||
/// corner of the map or an About option in a menu".
|
||||
///
|
||||
/// The content is driven by the region config, so a new region cannot ship
|
||||
/// without its credits, plus the credit the radar manifest carries for the
|
||||
/// frames actually on screen.
|
||||
class SourcesScreen extends ConsumerWidget {
|
||||
const SourcesScreen({super.key});
|
||||
|
||||
@@ -35,15 +41,21 @@ class SourcesScreen extends ConsumerWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _SourcesBody extends StatelessWidget {
|
||||
class _SourcesBody extends ConsumerWidget {
|
||||
const _SourcesBody({required this.region});
|
||||
|
||||
final RegionConfig region;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final l10n = AppLocalizations.of(context);
|
||||
final theme = Theme.of(context);
|
||||
// The frames carry their own credit, set by whoever published them. It is
|
||||
// not in the region config, so without this it would be lost when the
|
||||
// attribution bar came off the map.
|
||||
final frameCredit = ref.watch(
|
||||
radarTimelineProvider.select((state) => state.manifest?.attribution),
|
||||
);
|
||||
|
||||
return ListView(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8),
|
||||
@@ -60,6 +72,13 @@ class _SourcesBody extends StatelessWidget {
|
||||
for (final attribution in region.attributions)
|
||||
_AttributionTile(attribution: attribution),
|
||||
|
||||
if (frameCredit != null)
|
||||
ListTile(
|
||||
leading: const Icon(Icons.radar),
|
||||
title: Text(frameCredit),
|
||||
subtitle: Text(l10n.sourcesRadarFrames),
|
||||
),
|
||||
|
||||
_Card(
|
||||
icon: Icons.copyright_outlined,
|
||||
title: l10n.sourcesShareAlikeTitle,
|
||||
|
||||
Reference in New Issue
Block a user