Show distance to home as a fourth field in the fly-mode details pill
Adds computeDistanceToHomeM() (mission_stats.dart) alongside the existing rubber-band-target helper, wired through MissionFooterBar -> BottomStatsBar the same way flyMissionStatus already is. Only appears once a home point is known, as the last field after waypoint/distance/ duration. Generalized HomePointIcon to take an optional strokeColor: the map marker keeps its dark-fill-plus-white-outline look, while the details pill uses a plain white fill (strokeColor: null) to match the existing monochrome flag/ruler/clock icons instead of looking like a dropped-in map pin.
This commit is contained in:
@@ -11,6 +11,7 @@ import '../providers/active_drone_profile_provider.dart';
|
||||
import '../providers/altitude_profile_provider.dart';
|
||||
import '../providers/mission_meta_provider.dart';
|
||||
import 'drone_status_messages_panel.dart';
|
||||
import 'home_point_icon.dart';
|
||||
import 'missions_drones_panel.dart';
|
||||
import 'mountain_peak_icon.dart';
|
||||
import 'paper_plane_icon.dart';
|
||||
@@ -54,6 +55,7 @@ class BottomStatsBar extends ConsumerWidget {
|
||||
required this.totalDistanceM,
|
||||
required this.totalDurationSec,
|
||||
this.flyMissionStatus,
|
||||
this.distanceToHomeM,
|
||||
this.droneStatus,
|
||||
required this.onTap,
|
||||
required this.onSettingsTap,
|
||||
@@ -71,6 +73,13 @@ class BottomStatsBar extends ConsumerWidget {
|
||||
/// die statischen Felder in der Details-Pille.
|
||||
final FlyMissionStatus? flyMissionStatus;
|
||||
|
||||
/// Nur im Fly-Modus gesetzt (Doku: "zeige die Entfernung zum Home Punkt
|
||||
/// als letztes element in der details pille im fly modus an") - zeigt
|
||||
/// dort ein zusaetzliches, viertes Feld nach Wegpunkt/Distanz/Zeit. Bleibt
|
||||
/// null (kein zusaetzliches Feld), solange kein Homepoint bekannt ist
|
||||
/// oder [flyMissionStatus] selbst null ist (Plan-Modus).
|
||||
final double? distanceToHomeM;
|
||||
|
||||
/// Nur im Fly-Modus gesetzt (Doku: "im fly modus zeigt die drone pille
|
||||
/// den zustand der drohne") - ersetzt dort den Drohnennamen-Chip durch
|
||||
/// die 3-Icon-Statusanzeige (Verbindung/Position/Zustand).
|
||||
@@ -291,6 +300,26 @@ class BottomStatsBar extends ConsumerWidget {
|
||||
fontSize: _footerFontSize,
|
||||
fontWeight: _footerFontWeight,
|
||||
)),
|
||||
// Entfernung zum Homepoint als viertes, letztes Feld (Doku:
|
||||
// "als letztes element in der details pille im fly modus") -
|
||||
// nur im Fly-Modus und nur, sobald ein Homepoint bekannt ist
|
||||
// (siehe home_point_provider.dart), sonst kein zusaetzliches
|
||||
// Feld statt eines erfundenen "—"-Platzhalters.
|
||||
if (flyStatus != null && distanceToHomeM != null) ...[
|
||||
const SizedBox(width: 14),
|
||||
const HomePointIcon(
|
||||
size: _footerIconSize,
|
||||
color: Colors.white,
|
||||
strokeColor: null,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text('${distanceToHomeM!.round()} m',
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: _footerFontSize,
|
||||
fontWeight: _footerFontWeight,
|
||||
)),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,27 +1,44 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// Homepoint-Marker auf der Karte im Fly-Modus (Doku: "den auf der Drohne
|
||||
/// gelockten Homepoint abfragen ... benutze dieses Icon"), Pentagon-Haus-
|
||||
/// Form aus design/homepoint-pentagon.svg - nativ als [CustomPainter] statt
|
||||
/// als SVG-Asset nachgebaut (Format bewusst geaendert, dasselbe Muster wie
|
||||
/// DroneMarkerIcon/PaperPlaneIcon: ein einzelnes Polygon lohnt keine
|
||||
/// zusaetzliche SVG-Renderer-Abhaengigkeit).
|
||||
/// Homepoint-Pentagon-Haus-Form aus design/homepoint-pentagon.svg - nativ
|
||||
/// als [CustomPainter] statt als SVG-Asset nachgebaut (Format bewusst
|
||||
/// geaendert, dasselbe Muster wie DroneMarkerIcon/PaperPlaneIcon: ein
|
||||
/// einzelnes Polygon lohnt keine zusaetzliche SVG-Renderer-Abhaengigkeit).
|
||||
///
|
||||
/// Zwei Anwendungsfaelle mit unterschiedlichem Stil teilen sich dieselbe
|
||||
/// Geometrie: als Kartenmarker im Fly-Modus (Doku: "den auf der Drohne
|
||||
/// gelockten Homepoint abfragen ... benutze dieses Icon") mit dunkler
|
||||
/// Fuellung + weissem Rand wie die anderen Kartenmarker, und als schlichtes
|
||||
/// einfarbiges Inline-Icon in der Details-Pille (Doku: "gleiche Pentagon
|
||||
/// Form, aber im Style von den anderen icons") ohne Rand, passend zu den
|
||||
/// dortigen Material-Icons (flag/straighten/access_time). [strokeColor]
|
||||
/// null waehlt Letzteres.
|
||||
class HomePointIcon extends StatelessWidget {
|
||||
const HomePointIcon({super.key, this.size = 32});
|
||||
const HomePointIcon({
|
||||
super.key,
|
||||
this.size = 32,
|
||||
this.color = const Color(0xFF161616),
|
||||
this.strokeColor = Colors.white,
|
||||
});
|
||||
|
||||
final double size;
|
||||
final Color color;
|
||||
final Color? strokeColor;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomPaint(
|
||||
size: Size.square(size),
|
||||
painter: const _HomePointPainter(),
|
||||
painter: _HomePointPainter(fill: color, stroke: strokeColor),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _HomePointPainter extends CustomPainter {
|
||||
const _HomePointPainter();
|
||||
const _HomePointPainter({required this.fill, required this.stroke});
|
||||
|
||||
final Color fill;
|
||||
final Color? stroke;
|
||||
|
||||
// 1:1 aus design/homepoint-pentagon.svg uebernommene Koordinaten (viewBox
|
||||
// 0 0 72 72): Haus-Silhouette (Fuenfeck) mit spitzem Dach.
|
||||
@@ -33,7 +50,6 @@ class _HomePointPainter extends CustomPainter {
|
||||
Offset(52, 34),
|
||||
Offset(52, 52),
|
||||
];
|
||||
static const _fill = Color(0xFF161616);
|
||||
static const _strokeWidth = 3.0;
|
||||
|
||||
@override
|
||||
@@ -47,17 +63,21 @@ class _HomePointPainter extends CustomPainter {
|
||||
}
|
||||
path.close();
|
||||
|
||||
canvas.drawPath(path, Paint()..color = _fill);
|
||||
canvas.drawPath(
|
||||
path,
|
||||
Paint()
|
||||
..color = Colors.white
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = _strokeWidth * scale
|
||||
..strokeJoin = StrokeJoin.round,
|
||||
);
|
||||
canvas.drawPath(path, Paint()..color = fill);
|
||||
final strokeColor = stroke;
|
||||
if (strokeColor != null) {
|
||||
canvas.drawPath(
|
||||
path,
|
||||
Paint()
|
||||
..color = strokeColor
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = _strokeWidth * scale
|
||||
..strokeJoin = StrokeJoin.round,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _HomePointPainter oldDelegate) => false;
|
||||
bool shouldRepaint(covariant _HomePointPainter oldDelegate) =>
|
||||
oldDelegate.fill != fill || oldDelegate.stroke != stroke;
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ class MissionFooterBar extends ConsumerWidget {
|
||||
required this.totalDistanceM,
|
||||
required this.totalDurationSec,
|
||||
this.flyMissionStatus,
|
||||
this.distanceToHomeM,
|
||||
this.droneStatus,
|
||||
required this.warnings,
|
||||
this.showWarningsBanner = true,
|
||||
@@ -48,6 +49,11 @@ class MissionFooterBar extends ConsumerWidget {
|
||||
/// Distanz/Zeit dorthin. Bleibt im Plan-Modus null.
|
||||
final FlyMissionStatus? flyMissionStatus;
|
||||
|
||||
/// Nur im Fly-Modus gesetzt (Doku: "zeige die Entfernung zum Home Punkt
|
||||
/// als letztes element in der details pille im fly modus an") - siehe
|
||||
/// BottomStatsBar.distanceToHomeM.
|
||||
final double? distanceToHomeM;
|
||||
|
||||
/// Nur im Fly-Modus gesetzt (Doku: "im fly modus zeigt die drone pille
|
||||
/// den zustand der drohne") - siehe BottomStatsBar.droneStatus. FlyScreen
|
||||
/// setzt hier immer einen Wert (auch ohne Telemetrie-Frame, siehe dortige
|
||||
@@ -127,6 +133,7 @@ class MissionFooterBar extends ConsumerWidget {
|
||||
totalDistanceM: totalDistanceM,
|
||||
totalDurationSec: totalDurationSec,
|
||||
flyMissionStatus: flyMissionStatus,
|
||||
distanceToHomeM: distanceToHomeM,
|
||||
droneStatus: droneStatus,
|
||||
onTap: onDetailsTap,
|
||||
warnings: warnings,
|
||||
|
||||
Reference in New Issue
Block a user