Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

info: fixed map layout

Browse source
This commit is contained in:
Thibault Deckers 2020-08-17 16:00:22 +09:00
parent e5ef201176
commit 3e85172043
4 changed files with 91 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/widgets/fullscreen/info/location_section.dart
View file

@ -6,7 +6,7 @@ import 'package:aves/utils/geo_utils.dart';
import 'package:aves/widgets/common/aves_filter_chip.dart';
import 'package:aves/widgets/common/icons.dart';
import 'package:aves/widgets/fullscreen/info/info_page.dart';
import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
import 'package:aves/widgets/fullscreen/info/maps/common.dart';
import 'package:aves/widgets/fullscreen/info/maps/google_map.dart';
import 'package:aves/widgets/fullscreen/info/maps/leaflet_map.dart';
import 'package:flutter/material.dart';

27
lib/widgets/fullscreen/info/maps/buttons.dart → lib/widgets/fullscreen/info/maps/common.dart
View file

@ -7,11 +7,36 @@ import 'package:aves/widgets/fullscreen/info/location_section.dart';
import 'package:aves/widgets/fullscreen/overlay/common.dart';
import 'package:flutter/material.dart';
class MapDecorator extends StatelessWidget {
final Widget child;
static const BorderRadius mapBorderRadius = BorderRadius.all(Radius.circular(24)); // to match button circles
const MapDecorator({@required this.child});
@override
Widget build(BuildContext context) {
return GestureDetector(
onScaleStart: (details) {
// absorb scale gesture here to prevent scrolling
// and triggering by mistake a move to the image page above
},
child: ClipRRect(
borderRadius: mapBorderRadius,
child: Container(
color: Colors.white70,
height: 200,
child: child,
),
),
);
}
}
class MapButtonPanel extends StatelessWidget {
final String geoUri;
final void Function(double amount) zoomBy;
static const BorderRadius mapBorderRadius = BorderRadius.all(Radius.circular(24)); // to match button circles
static const double padding = 4;
const MapButtonPanel({

31
lib/widgets/fullscreen/info/maps/google_map.dart
View file

@ -1,5 +1,5 @@
import 'package:aves/model/settings.dart';
import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
import 'package:aves/widgets/fullscreen/info/maps/common.dart';
import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:tuple/tuple.dart';
@ -45,44 +45,34 @@ class EntryGoogleMapState extends State<EntryGoogleMap> with AutomaticKeepAliveC
super.build(context);
return Stack(
children: [
_buildMap(),
Positioned.fill(
child: Align(
alignment: AlignmentDirectional.centerEnd,
child: MapButtonPanel(
MapDecorator(
child: _buildMap(),
),
MapButtonPanel(
geoUri: widget.geoUri,
zoomBy: _zoomBy,
),
),
)
],
);
}
Widget _buildMap() {
final accentHue = HSVColor.fromColor(Theme.of(context).accentColor).hue;
return GestureDetector(
onScaleStart: (details) {
// absorb scale gesture here to prevent scrolling
// and triggering by mistake a move to the image page above
},
child: ClipRRect(
borderRadius: MapButtonPanel.mapBorderRadius,
child: Container(
color: Colors.white70,
height: 200,
child: GoogleMap(
return GoogleMap(
// GoogleMap init perf issue: https://github.com/flutter/flutter/issues/28493
initialCameraPosition: CameraPosition(
target: widget.latLng,
zoom: widget.initialZoom,
),
onMapCreated: (controller) => setState(() => _controller = controller),
compassEnabled: false,
mapToolbarEnabled: false,
rotateGesturesEnabled: false,
scrollGesturesEnabled: false,
zoomControlsEnabled: false,
zoomGesturesEnabled: false,
liteModeEnabled: false,
// no camera animation in lite mode
tiltGesturesEnabled: false,
myLocationEnabled: false,
myLocationButtonEnabled: false,
@ -93,9 +83,6 @@ class EntryGoogleMapState extends State<EntryGoogleMap> with AutomaticKeepAliveC
position: widget.latLng,
)
},
),
),
),
);
}

21
lib/widgets/fullscreen/info/maps/leaflet_map.dart
View file

@ -1,5 +1,5 @@
import 'package:aves/model/settings.dart';
import 'package:aves/widgets/fullscreen/info/maps/buttons.dart';
import 'package:aves/widgets/fullscreen/info/maps/common.dart';
import 'package:aves/widgets/fullscreen/info/maps/scale_layer.dart';
import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart';
@ -50,7 +50,9 @@ class EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAliv
children: [
Stack(
children: [
_buildMap(),
MapDecorator(
child: _buildMap(),
),
MapButtonPanel(
geoUri: widget.geoUri,
zoomBy: _zoomBy,
@ -63,17 +65,7 @@ class EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAliv
}
Widget _buildMap() {
return GestureDetector(
onScaleStart: (details) {
// absorb scale gesture here to prevent scrolling
// and triggering by mistake a move to the image page above
},
child: ClipRRect(
borderRadius: MapButtonPanel.mapBorderRadius,
child: Container(
color: Colors.white70,
height: 200,
child: FlutterMap(
return FlutterMap(
options: MapOptions(
center: widget.latLng,
zoom: widget.initialZoom,
@ -105,9 +97,6 @@ class EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAliv
),
],
mapController: _mapController,
),
),
),
);
}