From c81c35ec3b636d8a8d27a331850f423508ecf550 Mon Sep 17 00:00:00 2001
From: Yamakatsu63 <yamakatsu1217.63@gmail.com>
Date: Tue, 6 Jul 2021 20:38:59 +0900
Subject: [PATCH 1/5] =?UTF-8?q?google=20maps=E3=81=AE=E5=B0=8E=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml      |  4 +++
 lib/Pages/MeasurementPage/map_panel.dart      | 28 +++++++++++++++++++
 .../MeasurementPage/measurement_page.dart     |  2 ++
 pubspec.yaml                                  |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 lib/Pages/MeasurementPage/map_panel.dart

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9a16f44..d4181e0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cammel.the4thdayofmikkabozu">
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
@@ -35,5 +36,8 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/mikkabozu_logo" />
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyC4SYGk9d7_AG9R3DCleEXKCZS-6V98oJ8"/>
     </application>
 </manifest>
diff --git a/lib/Pages/MeasurementPage/map_panel.dart b/lib/Pages/MeasurementPage/map_panel.dart
new file mode 100644
index 0000000..75b3b69
--- /dev/null
+++ b/lib/Pages/MeasurementPage/map_panel.dart
@@ -0,0 +1,28 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:geolocator/geolocator.dart';
+
+class MapPanel extends StatelessWidget {
+  Completer<GoogleMapController> _controller = Completer();
+  // 初期表示位置を渋谷駅に設定
+  final Position _initialPosition = Position(
+    latitude: 35.658034,
+    longitude: 139.701636,
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    final Size size = MediaQuery.of(context).size;
+    return Container(
+      height: size.height/8,
+      child: GoogleMap(
+        mapType: MapType.normal,
+        initialCameraPosition: CameraPosition(
+          target: LatLng(_initialPosition.latitude, _initialPosition.longitude),
+          zoom: 14.4746,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/Pages/MeasurementPage/measurement_page.dart b/lib/Pages/MeasurementPage/measurement_page.dart
index 07870f9..4be3c2c 100644
--- a/lib/Pages/MeasurementPage/measurement_page.dart
+++ b/lib/Pages/MeasurementPage/measurement_page.dart
@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/measurement_button.dart';
 import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/measurement_panel.dart';
+import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/map_panel.dart';
 import 'package:the4thdayofmikkabozu/permission.dart';
 import 'package:the4thdayofmikkabozu/user_data.dart' as userData;
 
@@ -47,6 +48,7 @@ class MeasurementPageState extends State<MeasurementPage> {
               child: Center(
                 child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
                   MeasurementPanel(_distance, _timeStr),
+                  MapPanel(),
                   Center(
                     child: MeasurementButton(_value, () async {
                       if (_value == 0) {
diff --git a/pubspec.yaml b/pubspec.yaml
index bf02abf..3583d4b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -42,6 +42,7 @@ dependencies:
   image_cropper: ^1.1.0
   audioplayer: ^0.8.1
   path_provider: ^1.6.7
+  google_maps_flutter: ^0.5.27+1
 
 dev_dependencies:
   flutter_test:

From 43ae2ebfdb37b9da4f47a6216a9e40d7494b01f7 Mon Sep 17 00:00:00 2001
From: Yamakatsu63 <yamakatsu1217.63@gmail.com>
Date: Tue, 6 Jul 2021 21:02:11 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=82=92=E9=96=8B=E3=81=84=E3=81=9F=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=AB=E7=8F=BE=E5=9C=A8=E5=9C=B0=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Pages/MeasurementPage/map_panel.dart      | 13 ++--
 .../MeasurementPage/measurement_page.dart     | 78 ++++++++++---------
 .../MeasurementPage/measurement_panel.dart    |  6 +-
 3 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/lib/Pages/MeasurementPage/map_panel.dart b/lib/Pages/MeasurementPage/map_panel.dart
index 75b3b69..f37b2dd 100644
--- a/lib/Pages/MeasurementPage/map_panel.dart
+++ b/lib/Pages/MeasurementPage/map_panel.dart
@@ -1,21 +1,18 @@
-import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:geolocator/geolocator.dart';
 
 class MapPanel extends StatelessWidget {
-  Completer<GoogleMapController> _controller = Completer();
-  // 初期表示位置を渋谷駅に設定
-  final Position _initialPosition = Position(
-    latitude: 35.658034,
-    longitude: 139.701636,
-  );
+  Position _initialPosition;
+
+  MapPanel(this._initialPosition);
 
   @override
   Widget build(BuildContext context) {
     final Size size = MediaQuery.of(context).size;
     return Container(
-      height: size.height/8,
+      height: size.height/3,
+      padding: EdgeInsets.fromLTRB(0, 0, 0, size.height / 20),
       child: GoogleMap(
         mapType: MapType.normal,
         initialCameraPosition: CameraPosition(
diff --git a/lib/Pages/MeasurementPage/measurement_page.dart b/lib/Pages/MeasurementPage/measurement_page.dart
index 4be3c2c..ef44a8e 100644
--- a/lib/Pages/MeasurementPage/measurement_page.dart
+++ b/lib/Pages/MeasurementPage/measurement_page.dart
@@ -35,7 +35,6 @@ class MeasurementPageState extends State<MeasurementPage> {
           if (!snapshot.hasData) {
             return const Center(child: CircularProgressIndicator());
           }
-
           if (snapshot.data == GeolocationStatus.denied) {
             Permission().checkPermission();
           }
@@ -43,40 +42,48 @@ class MeasurementPageState extends State<MeasurementPage> {
             appBar: AppBar(
               elevation: 0,
             ),
-            body: Container(
-              decoration: BoxDecoration(color: Colors.blue),
-              child: Center(
-                child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
-                  MeasurementPanel(_distance, _timeStr),
-                  MapPanel(),
-                  Center(
-                    child: MeasurementButton(_value, () async {
-                      if (_value == 0) {
-                        if (Platform.isAndroid) {
-                          platform.invokeMethod<dynamic>("ON");
-                        }
-                        //countTime()を1秒ごとに実行
-                        _timer = Timer.periodic(
-                          Duration(seconds: 1),
-                          countTime,
-                        );
-                      } else if (_value == 1) {
-                        if (Platform.isAndroid) {
-                          platform.invokeMethod<dynamic>("OFF");
-                        }
-                        _timer.cancel();
-                        await _pushMessage();
-                        await _pushRecord();
-                      } else {
-                        Navigator.pop(context);
-                      }
-                      setState(() {
-                        _value++;
-                      });
-                    }),
+            body: FutureBuilder<Position>(
+              future: _getLocation(),
+              builder: (BuildContext context, AsyncSnapshot<Position> snapshot) {
+                if (!snapshot.hasData) {
+                  return const Center(child: CircularProgressIndicator());
+                }
+                return Container(
+                  decoration: BoxDecoration(color: Colors.blue),
+                  child: Center(
+                    child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
+                      MeasurementPanel(_distance, _timeStr),
+                      MapPanel(snapshot.data),
+                      Center(
+                        child: MeasurementButton(_value, () async {
+                          if (_value == 0) {
+                            if (Platform.isAndroid) {
+                              platform.invokeMethod<dynamic>("ON");
+                            }
+                            //countTime()を1秒ごとに実行
+                            _timer = Timer.periodic(
+                              Duration(seconds: 1),
+                              countTime,
+                            );
+                          } else if (_value == 1) {
+                            if (Platform.isAndroid) {
+                              platform.invokeMethod<dynamic>("OFF");
+                            }
+                            _timer.cancel();
+                            await _pushMessage();
+                            await _pushRecord();
+                          } else {
+                            Navigator.pop(context);
+                          }
+                          setState(() {
+                            _value++;
+                          });
+                        }),
+                      ),
+                    ]),
                   ),
-                ]),
-              ),
+                );
+              }
             ),
           );
         });
@@ -104,7 +111,7 @@ class MeasurementPageState extends State<MeasurementPage> {
         second.toString().padLeft(2, "0");
   }
 
-  Future<void> _getLocation() async {
+  Future<Position> _getLocation() async {
     Position _currentPosition =
         await Geolocator().getCurrentPosition(desiredAccuracy: LocationAccuracy.high); // ここで精度を「high」に指定している
     if (position == null) {
@@ -120,6 +127,7 @@ class MeasurementPageState extends State<MeasurementPage> {
     _distance += (distance * 10).round() / 10;
     // 画面の更新
     setState(() {});
+    return position;
   }
 
   // 走った距離と時間をデータベースにプッシュする
diff --git a/lib/Pages/MeasurementPage/measurement_panel.dart b/lib/Pages/MeasurementPage/measurement_panel.dart
index 7470644..2124a5b 100644
--- a/lib/Pages/MeasurementPage/measurement_panel.dart
+++ b/lib/Pages/MeasurementPage/measurement_panel.dart
@@ -8,21 +8,21 @@ class MeasurementPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     final Size size = MediaQuery.of(context).size;
     return Padding(
-      padding: EdgeInsets.fromLTRB(size.width / 20, size.height / 10, size.width / 20, size.height / 10),
+      padding: EdgeInsets.fromLTRB(size.width / 20, size.height / 20, size.width / 20, size.height / 20),
       child: Column(
         children: <Widget>[
           //時間表示のボックス
           Center(
             child: Text(
               _time,
-              style: TextStyle(fontSize: 100, fontFamily: 'BebasNeue', color: Colors.white),
+              style: TextStyle(fontSize: 80, fontFamily: 'BebasNeue', color: Colors.white),
             ),
           ),
           //距離表示のボックス
           Center(
             child: Text(
               _convertUnit(),
-              style: TextStyle(fontSize: 100, fontFamily: 'BebasNeue', color: Colors.white),
+              style: TextStyle(fontSize: 80, fontFamily: 'BebasNeue', color: Colors.white),
             ),
           ),
         ],

From a87888cdbc6e3598418a003d792bc1fb9d2cfe1f Mon Sep 17 00:00:00 2001
From: Yamakatsu63 <yamakatsu1217.63@gmail.com>
Date: Tue, 20 Jul 2021 19:04:18 +0900
Subject: [PATCH 3/5] =?UTF-8?q?measurementPage=E3=81=8B=E3=82=89=E3=83=9A?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E9=81=B7=E7=A7=BB=E3=81=97=E3=81=9F=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Pages/MeasurementPage/measurement_page.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Pages/MeasurementPage/measurement_page.dart b/lib/Pages/MeasurementPage/measurement_page.dart
index ef44a8e..5c428d7 100644
--- a/lib/Pages/MeasurementPage/measurement_page.dart
+++ b/lib/Pages/MeasurementPage/measurement_page.dart
@@ -126,7 +126,9 @@ class MeasurementPageState extends State<MeasurementPage> {
     //小数点2位以下を切り捨てて距離に加算する
     _distance += (distance * 10).round() / 10;
     // 画面の更新
-    setState(() {});
+    if (this.mounted) {
+      setState(() {});
+    }
     return position;
   }
 

From 52775e9604b2189ff4b0a2b8b19178d53a7d2d62 Mon Sep 17 00:00:00 2001
From: Yamakatsu63 <yamakatsu1217.63@gmail.com>
Date: Tue, 20 Jul 2021 20:18:59 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E5=9C=B0=E3=82=92?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E3=81=AB=E3=82=AB=E3=83=A1=E3=83=A9=E3=82=92?=
 =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=95=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Pages/MeasurementPage/map_panel.dart      | 25 ---------
 .../MeasurementPage/measurement_page.dart     | 55 ++++++++++++++++---
 2 files changed, 48 insertions(+), 32 deletions(-)
 delete mode 100644 lib/Pages/MeasurementPage/map_panel.dart

diff --git a/lib/Pages/MeasurementPage/map_panel.dart b/lib/Pages/MeasurementPage/map_panel.dart
deleted file mode 100644
index f37b2dd..0000000
--- a/lib/Pages/MeasurementPage/map_panel.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:geolocator/geolocator.dart';
-
-class MapPanel extends StatelessWidget {
-  Position _initialPosition;
-
-  MapPanel(this._initialPosition);
-
-  @override
-  Widget build(BuildContext context) {
-    final Size size = MediaQuery.of(context).size;
-    return Container(
-      height: size.height/3,
-      padding: EdgeInsets.fromLTRB(0, 0, 0, size.height / 20),
-      child: GoogleMap(
-        mapType: MapType.normal,
-        initialCameraPosition: CameraPosition(
-          target: LatLng(_initialPosition.latitude, _initialPosition.longitude),
-          zoom: 14.4746,
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/Pages/MeasurementPage/measurement_page.dart b/lib/Pages/MeasurementPage/measurement_page.dart
index 5c428d7..2a75941 100644
--- a/lib/Pages/MeasurementPage/measurement_page.dart
+++ b/lib/Pages/MeasurementPage/measurement_page.dart
@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/measurement_button.dart';
 import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/measurement_panel.dart';
-import 'package:the4thdayofmikkabozu/Pages/MeasurementPage/map_panel.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:the4thdayofmikkabozu/permission.dart';
 import 'package:the4thdayofmikkabozu/user_data.dart' as userData;
 
@@ -25,10 +25,12 @@ class MeasurementPageState extends State<MeasurementPage> {
   double _distance = 0;
   int _timeInt = 0;
   String _timeStr = "00:00:00";
+  GoogleMapController mapController;
   static const platform = const MethodChannel("Java.Foreground");
 
   @override
   Widget build(BuildContext context) {
+    final Size size = MediaQuery.of(context).size;
     return FutureBuilder<GeolocationStatus>(
         future: Geolocator().checkGeolocationPermissionStatus(),
         builder: (BuildContext context, AsyncSnapshot<GeolocationStatus> snapshot) {
@@ -48,12 +50,29 @@ class MeasurementPageState extends State<MeasurementPage> {
                 if (!snapshot.hasData) {
                   return const Center(child: CircularProgressIndicator());
                 }
+                _updateCamera();
                 return Container(
                   decoration: BoxDecoration(color: Colors.blue),
                   child: Center(
                     child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
                       MeasurementPanel(_distance, _timeStr),
-                      MapPanel(snapshot.data),
+                      // mapの表示
+                      Container(
+                        height: size.height / 3,
+                        padding: EdgeInsets.fromLTRB(0, 0, 0, size.height / 20),
+                        child: GoogleMap(
+                          mapType: MapType.normal,
+                          initialCameraPosition: CameraPosition(
+                            target: LatLng(snapshot.data.latitude, snapshot.data.longitude),
+                            zoom: 15,
+                          ),
+                          onMapCreated: (GoogleMapController controller) {
+                            mapController = controller;
+                          },
+                          markers: _createMarker(),
+                          zoomGesturesEnabled: true,
+                        ),
+                      ),
                       Center(
                         child: MeasurementButton(_value, () async {
                           if (_value == 0) {
@@ -90,7 +109,10 @@ class MeasurementPageState extends State<MeasurementPage> {
   }
 
   void countTime(Timer timer) {
-    _getLocation();
+    // 画面の更新
+    if (this.mounted) {
+      setState(() {});
+    }
     _timeInt++;
     _convertIntToTime();
   }
@@ -125,10 +147,6 @@ class MeasurementPageState extends State<MeasurementPage> {
         .distanceBetween(prevPosition.latitude, prevPosition.longitude, position.latitude, position.longitude);
     //小数点2位以下を切り捨てて距離に加算する
     _distance += (distance * 10).round() / 10;
-    // 画面の更新
-    if (this.mounted) {
-      setState(() {});
-    }
     return position;
   }
 
@@ -201,4 +219,27 @@ class MeasurementPageState extends State<MeasurementPage> {
           .setData(<String, dynamic>{'message': message, "sender": 'bot@gmail.com', "timestamp": Timestamp.now()});
     }
   }
+
+  Set<Marker> _createMarker() {
+    return {
+      Marker(
+        markerId: MarkerId("marker_1"),
+        position: LatLng(position.latitude, position.longitude),
+      ),
+    };
+  }
+
+  void _updateCamera() {
+    if (mapController != null) {
+      mapController.animateCamera(
+        CameraUpdate.newCameraPosition(
+          CameraPosition(
+            target:
+            LatLng(position.latitude, position.longitude),
+            zoom: 15,
+          ),
+        ),
+      );
+    }
+  }
 }

From fa210b22ade45a856b163e6da232d1c051eb8a06 Mon Sep 17 00:00:00 2001
From: Yamakatsu63 <yamakatsu1217.63@gmail.com>
Date: Tue, 20 Jul 2021 20:31:24 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B5=B0=E3=81=A3=E3=81=9F=E7=B5=8C?=
 =?UTF-8?q?=E8=B7=AF=E3=82=92=E5=9C=B0=E5=9B=B3=E3=81=AB=E6=8F=8F=E7=94=BB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Pages/MeasurementPage/measurement_page.dart | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/Pages/MeasurementPage/measurement_page.dart b/lib/Pages/MeasurementPage/measurement_page.dart
index 2a75941..4ecbfcc 100644
--- a/lib/Pages/MeasurementPage/measurement_page.dart
+++ b/lib/Pages/MeasurementPage/measurement_page.dart
@@ -26,6 +26,8 @@ class MeasurementPageState extends State<MeasurementPage> {
   int _timeInt = 0;
   String _timeStr = "00:00:00";
   GoogleMapController mapController;
+  List<LatLng> polylineCoordinates = [];
+  Map<PolylineId, Polyline> polylines = {};
   static const platform = const MethodChannel("Java.Foreground");
 
   @override
@@ -70,6 +72,7 @@ class MeasurementPageState extends State<MeasurementPage> {
                             mapController = controller;
                           },
                           markers: _createMarker(),
+                          polylines: Set<Polyline>.of(polylines.values),
                           zoomGesturesEnabled: true,
                         ),
                       ),
@@ -147,6 +150,17 @@ class MeasurementPageState extends State<MeasurementPage> {
         .distanceBetween(prevPosition.latitude, prevPosition.longitude, position.latitude, position.longitude);
     //小数点2位以下を切り捨てて距離に加算する
     _distance += (distance * 10).round() / 10;
+    // 緯度経度の配列に現在地を追加
+    polylineCoordinates.add(LatLng(position.latitude, position.longitude));
+    PolylineId id = PolylineId('poly');
+    // polylineを更新
+    Polyline polyline = Polyline(
+      polylineId: id,
+      points: polylineCoordinates,
+      color: Colors.red,
+      width: 3,
+    );
+    polylines[id] = polyline;
     return position;
   }