From d57be5e77aee642f3f4e66b9801a6d173363f20e Mon Sep 17 00:00:00 2001 From: Ming Ming Date: Wed, 17 Nov 2021 15:06:04 +0800 Subject: [PATCH] Rename map to reduce confusion --- lib/mobile/{map_widget.dart => gps_map.dart} | 4 ++-- lib/mobile/platform.dart | 2 +- lib/web/{map_widget.dart => gps_map.dart} | 8 ++++---- lib/web/platform.dart | 2 +- lib/widget/viewer_detail_pane.dart | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename lib/mobile/{map_widget.dart => gps_map.dart} (95%) rename lib/web/{map_widget.dart => gps_map.dart} (89%) diff --git a/lib/mobile/map_widget.dart b/lib/mobile/gps_map.dart similarity index 95% rename from lib/mobile/map_widget.dart rename to lib/mobile/gps_map.dart index 0df1db6d..5415f832 100644 --- a/lib/mobile/map_widget.dart +++ b/lib/mobile/gps_map.dart @@ -2,8 +2,8 @@ import 'package:flutter/widgets.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:tuple/tuple.dart'; -class Map extends StatelessWidget { - const Map({ +class GpsMap extends StatelessWidget { + const GpsMap({ Key? key, required this.center, required this.zoom, diff --git a/lib/mobile/platform.dart b/lib/mobile/platform.dart index e6b88c28..394ce6a2 100644 --- a/lib/mobile/platform.dart +++ b/lib/mobile/platform.dart @@ -1,5 +1,5 @@ export 'db_util.dart'; export 'download.dart'; export 'file_saver.dart'; -export 'map_widget.dart'; +export 'gps_map.dart'; export 'universal_storage.dart'; diff --git a/lib/web/map_widget.dart b/lib/web/gps_map.dart similarity index 89% rename from lib/web/map_widget.dart rename to lib/web/gps_map.dart index 1ffb9324..4b4fb0bb 100644 --- a/lib/web/map_widget.dart +++ b/lib/web/gps_map.dart @@ -6,8 +6,8 @@ import 'package:/nc_photos/mobile/ui_hack.dart' if (dart.library.html) 'dart:ui' import 'package:flutter/widgets.dart'; import 'package:tuple/tuple.dart'; -class Map extends StatefulWidget { - const Map({ +class GpsMap extends StatefulWidget { + const GpsMap({ Key? key, required this.center, required this.zoom, @@ -15,7 +15,7 @@ class Map extends StatefulWidget { }) : super(key: key); @override - createState() => _MapState(); + createState() => _GpsMapState(); /// A pair of latitude and longitude coordinates, stored as degrees final Tuple2 center; @@ -23,7 +23,7 @@ class Map extends StatefulWidget { final void Function()? onTap; } -class _MapState extends State { +class _GpsMapState extends State { @override initState() { super.initState(); diff --git a/lib/web/platform.dart b/lib/web/platform.dart index e6b88c28..394ce6a2 100644 --- a/lib/web/platform.dart +++ b/lib/web/platform.dart @@ -1,5 +1,5 @@ export 'db_util.dart'; export 'download.dart'; export 'file_saver.dart'; -export 'map_widget.dart'; +export 'gps_map.dart'; export 'universal_storage.dart'; diff --git a/lib/widget/viewer_detail_pane.dart b/lib/widget/viewer_detail_pane.dart index 7a7a161d..1b2681cf 100644 --- a/lib/widget/viewer_detail_pane.dart +++ b/lib/widget/viewer_detail_pane.dart @@ -248,7 +248,7 @@ class _ViewerDetailPaneState extends State { if (features.isSupportMapView && _gps != null) SizedBox( height: 256, - child: platform.Map( + child: platform.GpsMap( center: _gps!, zoom: 16, onTap: _onMapTap,