mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-12-25 15:02:33 +01:00
Merge branch 'soru/maps-widget' into 'main'
fix: Properly position the pointer in the map bubble and add attribution See merge request famedly/fluffychat!592
This commit is contained in:
commit
efddd1daf1
@ -28,7 +28,9 @@ class MapBubble extends StatelessWidget {
|
|||||||
constraints: BoxConstraints.loose(Size(width, height)),
|
constraints: BoxConstraints.loose(Size(width, height)),
|
||||||
child: AspectRatio(
|
child: AspectRatio(
|
||||||
aspectRatio: width / height,
|
aspectRatio: width / height,
|
||||||
child: FlutterMap(
|
child: Stack(
|
||||||
|
children: <Widget>[
|
||||||
|
FlutterMap(
|
||||||
options: MapOptions(
|
options: MapOptions(
|
||||||
center: LatLng(latitude, longitude),
|
center: LatLng(latitude, longitude),
|
||||||
zoom: zoom,
|
zoom: zoom,
|
||||||
@ -40,18 +42,44 @@ class MapBubble extends StatelessWidget {
|
|||||||
subdomains: ['a', 'b', 'c'],
|
subdomains: ['a', 'b', 'c'],
|
||||||
),
|
),
|
||||||
MarkerLayerOptions(
|
MarkerLayerOptions(
|
||||||
|
rotate: true,
|
||||||
markers: [
|
markers: [
|
||||||
Marker(
|
Marker(
|
||||||
point: LatLng(latitude, longitude),
|
point: LatLng(latitude, longitude),
|
||||||
builder: (context) => const Icon(
|
width: 30,
|
||||||
|
height: 30,
|
||||||
|
builder: (_) => Transform.translate(
|
||||||
|
// No idea why the offset has to be like this, instead of -15
|
||||||
|
// It has been determined by trying out, though, that this yields
|
||||||
|
// the tip of the location pin to be static when zooming.
|
||||||
|
// Might have to do with psychological perception of where the tip exactly is
|
||||||
|
offset: const Offset(0, -12.5),
|
||||||
|
child: const Icon(
|
||||||
Icons.location_pin,
|
Icons.location_pin,
|
||||||
color: Colors.red,
|
color: Colors.red,
|
||||||
|
size: 30,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
Container(
|
||||||
|
alignment: Alignment.bottomRight,
|
||||||
|
child: Text(
|
||||||
|
' © OpenStreetMap contributors ',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Theme.of(context).brightness == Brightness.dark
|
||||||
|
? Colors.white
|
||||||
|
: Colors.black,
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).appBarTheme.backgroundColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user