diff --git a/app.apk b/app.apk
index f85bdb5..76fee3c 100644
Binary files a/app.apk and b/app.apk differ
diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle
index e7767d9..aeffb6a 100644
--- a/client/android/app/build.gradle
+++ b/client/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.temkaatranshprojects.client"
- minSdkVersion flutter.minSdkVersion
+ minSdkVersion 20
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
diff --git a/client/android/app/src/main/AndroidManifest.xml b/client/android/app/src/main/AndroidManifest.xml
index 278d75e..a1905e5 100644
--- a/client/android/app/src/main/AndroidManifest.xml
+++ b/client/android/app/src/main/AndroidManifest.xml
@@ -33,5 +33,7 @@
+
diff --git a/client/android/app/src/main/kotlin/com/temkaatranshprojects/client/MainActivity.kt b/client/android/app/src/main/kotlin/com/temkaatranshprojects/client/MainActivity.kt
index 5f24228..33bdcf7 100644
--- a/client/android/app/src/main/kotlin/com/temkaatranshprojects/client/MainActivity.kt
+++ b/client/android/app/src/main/kotlin/com/temkaatranshprojects/client/MainActivity.kt
@@ -3,4 +3,5 @@ package com.temkaatranshprojects.client
import io.flutter.embedding.android.FlutterActivity
class MainActivity: FlutterActivity() {
+
}
diff --git a/client/lib/main.dart b/client/lib/main.dart
index e942fbe..ffa3ce3 100644
--- a/client/lib/main.dart
+++ b/client/lib/main.dart
@@ -36,8 +36,9 @@ class App extends StatelessWidget {
// 15. add other cities rates (done)
// 16. change app name (done)
// 17. make russian application (done)
-// 18. update readme (done_
+// 18. update readme (done)
// 19. fix buttons (done)
+// 20. add google map (done)
// flutter build apk --release
// build/app/outputs/flutter-apk/app-release.apk
diff --git a/client/lib/ui/app_bar/app_bar.dart b/client/lib/ui/app_bar/app_bar.dart
index b4a9992..9dcbd48 100644
--- a/client/lib/ui/app_bar/app_bar.dart
+++ b/client/lib/ui/app_bar/app_bar.dart
@@ -23,6 +23,11 @@ class DepartmentsAppBar extends StatelessWidget with PreferredSizeWidget {
width: 30,
height: 35,
child: Icon(Icons.settings)
+ ),
+ SizedBox(
+ width: 30,
+ height: 35,
+ child: Icon(Icons.location_city)
)
],
),
diff --git a/client/lib/ui/body/map.dart b/client/lib/ui/body/map.dart
new file mode 100644
index 0000000..0500cf5
--- /dev/null
+++ b/client/lib/ui/body/map.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+
+class GoogleMapTab extends StatefulWidget {
+ final LatLng userPosition;
+ final List