Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Charunirathnayake committed Jan 10, 2020
1 parent 449ff9b commit 1b63c74
Show file tree
Hide file tree
Showing 9 changed files with 304 additions and 19 deletions.
1 change: 1 addition & 0 deletions miniproject/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_database","dependencies":["firebase_core"]},{"name":"geoflutterfire","dependencies":["cloud_firestore"]},{"name":"geolocator","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","dependencies":[]},{"name":"google_maps_flutter","dependencies":[]},{"name":"google_sign_in","dependencies":[]},{"name":"location","dependencies":[]},{"name":"location_permissions","dependencies":[]}]}
4 changes: 2 additions & 2 deletions miniproject/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
android:label="miniproject"
android:icon="@mipmap/ic_launcher">

<meta-data
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyAF0n_CYFQ7IutamYthHQdrQGoUtEh6PI0"/>
android:value="AIzaSyAF0n_CYFQ7IutamYthHQdrQGoUtEh6PI0"/>

<activity
android:name=".MainActivity"
Expand Down
15 changes: 15 additions & 0 deletions miniproject/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ buildscript {
jcenter()
}

subprojects {
project.configurations.all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'com.android.support'
&& !details.requested.name.contains('multidex') ) {
details.useVersion "27.1.1"
}
if (details.requested.group == 'androidx.core'
&& !details.requested.name.contains('androidx') ) {
details.useVersion "1.0.1"
}
}
}
}

dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand Down
3 changes: 3 additions & 0 deletions miniproject/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
android.useAndroidX=true
android.enableJetifier=true
org.gradle.jvmargs=-Xmx1536M

android.enableR8=true
1 change: 1 addition & 0 deletions miniproject/android/settings_aar.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ':app'
2 changes: 1 addition & 1 deletion miniproject/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void main(){
theme: ThemeData(
primarySwatch: Colors.brown
),
home:LoginInterface(),
home:GetMap(),
debugShowCheckedModeBanner: false,
)
);
Expand Down
124 changes: 119 additions & 5 deletions miniproject/lib/map_screen/first_screen.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
/*import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
class First extends StatefulWidget {
Expand All @@ -24,7 +24,7 @@ class Map extends StatefulWidget {
class Map_state extends State<Map> {
GoogleMapController mapController;
static const _initialPosition = LatLng(12.97, 77.58);
static const _initialPosition = LatLng(6.7184, 80.7741);
LatLng _lastPosition = _initialPosition;
final Set<Marker> _makers = {};
Expand All @@ -42,11 +42,13 @@ class Map_state extends State<Map> {
markers: _makers,
onCameraMove: _onCameraMove,
),
Positioned(child: FloatingActionButton(onPressed: _onAddMarkerPressed,),
Positioned(child: FloatingActionButton(onPressed: _onAddMarkerPressed,tooltip: "Add Maker",backgroundColor: Color(0xffBA680B),),
top: 40,
right: 10,

)
),
Icon(Icons.add_location,color:Colors.white),
]);
}
Expand All @@ -58,9 +60,121 @@ class Map_state extends State<Map> {
void _onCameraMove(CameraPosition position) {
setState(() {
_lastPosition=position.target;
});
}
void _onAddMarkerPressed() {
}
}*/
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_database/firebase_database.dart';
import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:location/location.dart';
import 'package:miniproject/app_screen/Login.dart';


class GetMap extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return GetMapState();
}
}

class GetMapState extends State<GetMap> {
static const _initialPosition = LatLng(6.7185992, 80.7879343);
GoogleMapController mapController;

LatLng _lastPosition = _initialPosition;

final Set<Marker> _markers = {};

Location location = new Location();
Firestore firestore = Firestore.instance;
// Geoflutterfire geo = Geoflutterfire();
static String userId;

final DatabaseReference database = FirebaseDatabase.instance
.reference()
.child('Tour_Guide')
.child('traveller_geoPoint');

@override
void initState() {
super.initState();
getDriversMarkers();
/*FirebaseAuth.instance.currentUser().then((currentUser) => {
if (currentUser == null)
{
Navigator.push(context,
MaterialPageRoute(builder: (context) => LoginInterface()))
}
else
{getDriversMarkers(), userId = currentUser.uid}
});*/
}

@override
Widget build(BuildContext context) {

return Scaffold(
/*appBar: AppBar(
title: Text('Get Map'),
),*/
body: Stack(
children: <Widget>[
GoogleMap(
initialCameraPosition:
CameraPosition(target: _initialPosition, zoom: 10),
onMapCreated: onCreated,
myLocationEnabled: true,
myLocationButtonEnabled: true,
mapType: MapType.normal,
compassEnabled: true,
markers: _markers,
onCameraMove: _onCameraMove,
)
],
),
);
}

void _onCameraMove(CameraPosition position) {
setState(() {
_lastPosition = position.target;
});
}

void onCreated(GoogleMapController controller) {
// _startQuery();
getDriversMarkers();
setState(() {
mapController = controller;
});
}

getDriversMarkers() {
database.once().then((DataSnapshot snapshot) {
Map<dynamic, dynamic> values = snapshot.value;
print(values);

values.forEach((key, values) {
if (userId == values['uid']) {
print('${values["latitude"]}/${values["longitude"]}');
var markers = Marker(
markerId:
MarkerId('${values["latitude"]} ${values["longitude"]}'),
position: LatLng(values["latitude"], values["longitude"]),
icon: BitmapDescriptor.defaultMarker,
infoWindow: InfoWindow(title: 'Magic Marker', snippet: 'buhaha'));
_markers.add(markers);
}
});
print('markersssss: $_markers');
});
}
}

Loading

0 comments on commit 1b63c74

Please sign in to comment.