Skip to content

ピン削除 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SotaTamura wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ピン削除 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 215 additions & 85 deletions lib/features/map/presentation/map_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class MapScreen extends ConsumerStatefulWidget {

class _MapScreenState extends ConsumerState<MapScreen> {
late final MapController _mapController;
bool _isDimmed = false; // ピン選択時に背景を暗くする
PinData? _activePin; // 選択されたピン

@override
void initState() {
Expand All @@ -34,12 +36,26 @@ class _MapScreenState extends ConsumerState<MapScreen> {

List<Marker> _buildMarkers(List<PinData> pins) {
return pins.map((pin) {
final isActive = _activePin?.id == pin.id;
return Marker(
point: pin.position,
width: 60,
height: 60,
alignment: Alignment.topCenter,
child: const Icon(Icons.location_pin, size: 60, color: Colors.red),
child: Opacity(
opacity: isActive ? 0.0 : 1.0,
child: _AnimatedMarker(
key: ValueKey(pin.id),
pin: pin,
ref: ref,
onFloatingChanged: (isFloating) {
setState(() {
_isDimmed = isFloating;
_activePin = isFloating ? pin : null;
});
},
),
),
);
}).toList();
}
Expand Down Expand Up @@ -74,103 +90,217 @@ class _MapScreenState extends ConsumerState<MapScreen> {
),
],
),
body: Column(
body: Stack(
children: [
Expanded(
child: Stack(
children: [
FlutterMap(
mapController: _mapController,
options: MapOptions(
initialCenter: const LatLng(35.6895, 139.6917),
initialZoom: 9.2,
interactionOptions: InteractionOptions(
flags: drawingState.isDrawingMode
? InteractiveFlag.none
: InteractiveFlag.all &
~InteractiveFlag.doubleTapZoom,
),
onTap: (tapPosition, latlng) {
if (!drawingState.isDrawingMode) {
ref.read(pinsProvider.notifier).addPin(latlng);
}
},
),
Column(
children: [
Expanded(
child: Stack(
children: [
TileLayer(
urlTemplate:
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
),
PolylineLayer(
polylines: drawingState.paths
.map(
(path) => Polyline(
points: path.points,
color: path.color,
strokeWidth: path.strokeWidth,
),
)
.toList(),
),
MarkerLayer(
markers: pinsAsync.when(
data: _buildMarkers,
loading: () => [],
error: (_, _) => [],
FlutterMap(
mapController: _mapController,
options: MapOptions(
initialCenter: const LatLng(35.6895, 139.6917),
initialZoom: 9.2,
interactionOptions: InteractionOptions(
flags: drawingState.isDrawingMode
? InteractiveFlag.none
: InteractiveFlag.all &
~InteractiveFlag.doubleTapZoom,
),
onTap: (tapPosition, latlng) {
if (!drawingState.isDrawingMode) {
ref.read(pinsProvider.notifier).addPin(latlng);
}
},
),
),
RichAttributionWidget(
alignment: AttributionAlignment.bottomLeft,
attributions: [
TextSourceAttribution(
'OpenStreetMap contributors',
onTap: () => launchUrl(
Uri.parse('https://openstreetmap.org/copyright'),
children: [
TileLayer(
urlTemplate:
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName:
'dev.fleaflet.flutter_map.example',
),
PolylineLayer(
polylines: drawingState.paths
.map(
(path) => Polyline(
points: path.points,
color: path.color,
strokeWidth: path.strokeWidth,
),
)
.toList(),
),
MarkerLayer(
markers: pinsAsync.when(
data: _buildMarkers,
loading: () => [],
error: (_, _) => [],
),
),
RichAttributionWidget(
alignment: AttributionAlignment.bottomLeft,
attributions: [
TextSourceAttribution(
'OpenStreetMap contributors',
onTap: () => launchUrl(
Uri.parse(
'https://openstreetmap.org/copyright',
),
),
),
],
),
],
),
],
),
IgnorePointer(
ignoring: !drawingState.isDrawingMode,
child: DrawingCanvas(mapController: _mapController),
),
Positioned(
right: 16,
bottom: 16,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
FloatingActionButton(
heroTag: 'zoom_in',
onPressed: () => _mapController.move(
_mapController.camera.center,
_mapController.camera.zoom + 1,
),
tooltip: 'Zoom in',
child: const Icon(Icons.add),
),
const SizedBox(height: 8),
FloatingActionButton(
heroTag: 'zoom_out',
onPressed: () => _mapController.move(
_mapController.camera.center,
_mapController.camera.zoom - 1,
),
tooltip: 'Zoom out',
child: const Icon(Icons.remove),
IgnorePointer(
ignoring: !drawingState.isDrawingMode,
child: DrawingCanvas(mapController: _mapController),
),
Positioned(
right: 16,
bottom: 16,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
FloatingActionButton(
heroTag: 'zoom_in',
onPressed: () => _mapController.move(
_mapController.camera.center,
_mapController.camera.zoom + 1,
),
tooltip: 'Zoom in',
child: const Icon(Icons.add),
),
const SizedBox(height: 8),
FloatingActionButton(
heroTag: 'zoom_out',
onPressed: () => _mapController.move(
_mapController.camera.center,
_mapController.camera.zoom - 1,
),
tooltip: 'Zoom out',
child: const Icon(Icons.remove),
),
],
),
],
),
),
],
),
],
),
const Controls(),
],
),
// ピン選択時に背景を暗くするウィジェット
IgnorePointer(
ignoring: !_isDimmed,
child: AnimatedOpacity(
opacity: _isDimmed ? 1.0 : 0.0,
duration: const Duration(milliseconds: 200),
child: Container(color: Colors.black.withValues(alpha: 0.4)),
),
),
const Controls(),
// ピン選択時に浮き上がるピン
if (_isDimmed && _activePin != null)
Builder(
builder: (context) {
final pos = _mapController.camera.latLngToScreenOffset(
_activePin!.position,
);
return Positioned(
left: pos.dx - 30,
top: pos.dy - 60,
width: 60,
height: 60,
child: const _PinIcon(isFloating: true),
);
},
),
],
),
);
}
}

class _AnimatedMarker extends StatefulWidget {
final PinData pin;
final WidgetRef ref;
final void Function(bool) onFloatingChanged;

const _AnimatedMarker({
super.key,
required this.pin,
required this.ref,
required this.onFloatingChanged,
});

@override
State<_AnimatedMarker> createState() => _AnimatedMarkerState();
}

class _AnimatedMarkerState extends State<_AnimatedMarker> {
bool _isFloating = false;

@override
Widget build(BuildContext context) {
return GestureDetector(
onLongPressStart: (details) async {
setState(() {
_isFloating = true;
});
widget.onFloatingChanged(true);

final selected = await showMenu<String>(
context: context,
position: RelativeRect.fromLTRB(
details.globalPosition.dx,
details.globalPosition.dy,
details.globalPosition.dx,
details.globalPosition.dy,
),
items: const [
PopupMenuItem(
value: "delete",
child: Text("Delete", style: TextStyle(color: Colors.red)),
),
],
);

if (mounted) {
setState(() {
_isFloating = false;
});
widget.onFloatingChanged(false);
}

if (selected == "delete") {
widget.ref.read(pinsProvider.notifier).deletePin(widget.pin.id);
}
},
child: _PinIcon(isFloating: _isFloating),
);
}
}

class _PinIcon extends StatelessWidget {
final bool isFloating;

const _PinIcon({required this.isFloating});

@override
Widget build(BuildContext context) {
return AnimatedContainer(
duration: const Duration(milliseconds: 200),
curve: Curves.easeOut,
alignment: Alignment.bottomCenter,
transform: Matrix4.diagonal3Values(
isFloating ? 1.2 : 1.0,
isFloating ? 1.2 : 1.0,
1.0,
),
transformAlignment: Alignment.bottomCenter,
child: Icon(Icons.location_on, color: Colors.red, size: 40),
);
}
}