From f23d71daad17988f871ee9551778a925b7a14c56 Mon Sep 17 00:00:00 2001
From: Ayush Dubey <ayushdubey70@gmail.com>
Date: Wed, 21 Jul 2021 11:28:30 +0530
Subject: [PATCH] lib: fetch distance and duration properly

*change direction API's

Signed-off-by: Ayush Dubey <ayushdubey70@gmail.com>
---
 android/app/src/main/AndroidManifest.xml | 33 +++++-------------------
 lib/.env.dart                            |  2 +-
 lib/direction_model.dart                 |  2 +-
 lib/main.dart                            |  2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8d6c73b..63ad7e3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,32 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.google_maps">
-   <application
-        android:label="google_maps"
-        android:icon="@mipmap/ic_launcher">
-        <activity
-            android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.google_maps">
+    <application android:label="google_maps" android:icon="@mipmap/ic_launcher">
+        <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+            <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <!-- Displays an Android View that continues showing the launch screen
                  Drawable until Flutter paints its first frame, then this splash
                  screen fades out. A splash screen is useful to avoid any visual
                  gap between the end of Android's launch screen and the painting of
                  Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+            <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -34,11 +19,7 @@
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyBlefMmsxW3lz0_wlTrCKAFZLsHXtgFufI" />
+        <meta-data android:name="flutterEmbedding" android:value="2" />
+        <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBmPdAZ84TD-qNoGXyd9RnarWPR1i6QBi8" />
     </application>
 </manifest>
diff --git a/lib/.env.dart b/lib/.env.dart
index 58c1bf4..58dded0 100644
--- a/lib/.env.dart
+++ b/lib/.env.dart
@@ -1 +1 @@
-const String googleAPIkey = 'AIzaSyBlefMmsxW3lz0_wlTrCKAFZLsHXtgFufI';
+const String googleAPIkey = 'AIzaSyBmPdAZ84TD-qNoGXyd9RnarWPR1i6QBi8';
diff --git a/lib/direction_model.dart b/lib/direction_model.dart
index 8c63b59..b53fdbe 100644
--- a/lib/direction_model.dart
+++ b/lib/direction_model.dart
@@ -27,7 +27,7 @@ class Directions {
 
     String distance = '';
     String duration = '';
-    if (data['legs' as List].isEmpty) {
+    if ((data['legs'] as List).isNotEmpty) {
       final leg = data['legs'][0];
       distance = leg['distance']['text'];
       duration = leg['duration']['text'];
diff --git a/lib/main.dart b/lib/main.dart
index 9c23809..9288759 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -173,7 +173,7 @@ class _MapScreenState extends State<MapScreen> {
       }
     });
     final directions = await DirectionsRepository()
-        .getDirections(origin: pos, destination: pos);
+        .getDirections(origin: _origin!.position, destination: pos);
     setState(() {
       _info = directions;
     });