Skip to content
Snippets Groups Projects
Commit 50116036 authored by Wright, James M (UG - Computer Science)'s avatar Wright, James M (UG - Computer Science)
Browse files

Final version - bug fix galore

parent 5da787ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 110 additions and 95 deletions
.gradle/5.1.1/executionHistory/executionHistory.bin
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/5.1.1/executionHistory/executionHistory.lock
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/5.1.1/fileHashes/fileHashes.bin
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/5.1.1/fileHashes/fileHashes.lock
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/5.1.1/javaCompile/classAnalysis.bin
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/5.1.1/javaCompile/javaCompile.lock
+ 0
− 0
View file @ 50116036
No preview for this file type
.gradle/buildOutputCleanup/buildOutputCleanup.lock
+ 0
− 0
View file @ 50116036
No preview for this file type
.idea/workspace.xml
+ 49
− 54
View file @ 50116036
......@@ -20,11 +20,8 @@
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/SavedRoutes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/SavedRoutes.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserRating.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserRating.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/build/generated/not_namespaced_r_class_sources/" />
<ignored path="$PROJECT_DIR$/build/generated/source/r/" />
......@@ -119,16 +116,16 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="232" column="93" selection-start-line="232" selection-start-column="93" selection-end-line="232" selection-end-column="93" />
<state relative-caret-position="2142">
<caret line="309" column="24" selection-start-line="309" selection-start-column="24" selection-end-line="309" selection-end-column="24" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4697#4710#0" expanded="true" />
<element signature="e#4712#4726#0" expanded="true" />
<element signature="e#4966#7855#0" expanded="true" />
<element signature="e#7854#7855#0" expanded="true" />
<element signature="e#8318#8934#0" expanded="true" />
<element signature="e#8933#8934#0" expanded="true" />
<element signature="e#4725#4738#0" expanded="true" />
<element signature="e#4740#4754#0" expanded="true" />
<element signature="e#4994#7883#0" expanded="true" />
<element signature="e#7882#7883#0" expanded="true" />
<element signature="e#8346#9288#0" expanded="true" />
<element signature="e#9287#9288#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -149,8 +146,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-938">
<caret line="37" selection-start-line="37" selection-end-line="37" />
<state relative-caret-position="472">
<caret line="146" selection-start-line="146" selection-end-line="146" />
</state>
</provider>
</entry>
......@@ -173,15 +170,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/SavedRoutes.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="183" column="46" selection-start-line="183" selection-start-column="46" selection-end-line="183" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserRating.java">
<provider selected="true" editor-type-id="text-editor">
......@@ -245,9 +233,9 @@
<component name="Git.Settings">
<option name="PREVIOUS_COMMIT_AUTHORS">
<list>
<option value="James Wright &lt;jw01324@surrey.ac.uk&gt;" />
<option value="James Wright &lt;jw01324@surrey.ac.uk&gt; &amp; Orangzaib" />
<option value="James Wright &lt;jw01324@surrey.ac.uk&gt; &amp; Ronan" />
<option value="James Wright &lt;jw01324@surrey.ac.uk&gt;" />
</list>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -293,7 +281,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Login.java" />
<option value="$PROJECT_DIR$/src/main/res/layout/activity_view_routes.xml" />
<option value="$PROJECT_DIR$/src/main/res/layout/activity_driver__profile__passenger__view.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/User_Main.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Profile_Passenger_View.java" />
<option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
......@@ -305,6 +292,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserRating.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java" />
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java" />
</list>
</option>
......@@ -615,7 +603,14 @@
<option name="project" value="LOCAL" />
<updated>1557753397549</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="Bug fixes">
<created>1557757277410</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1557757277410</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TodoView">
......@@ -633,7 +628,7 @@
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info id="Designer" order="1" />
<window_info active="true" content_ui="combo" id="Project" order="2" visible="true" weight="0.32962227" />
<window_info content_ui="combo" id="Project" order="2" visible="true" weight="0.32962227" />
<window_info id="Structure" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" />
<window_info id="Image Layers" order="5" />
......@@ -644,12 +639,12 @@
<window_info anchor="bottom" id="TODO" order="1" sideWeight="0.49924013" weight="0.329582" />
<window_info anchor="bottom" id="Android Profiler" order="2" weight="0.329582" />
<window_info anchor="bottom" id="Debug" order="3" />
<window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49860835" weight="0.32969603" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.102584496" side_tool="true" visible="true" weight="0.3289166" />
<window_info active="true" anchor="bottom" id="Terminal" order="4" sideWeight="0.49821073" visible="true" weight="0.32969603" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.5017893" side_tool="true" visible="true" weight="0.32969603" />
<window_info anchor="bottom" id="Find" order="6" sideWeight="0.49900597" weight="0.3289166" />
<window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49900597" weight="0.32969603" />
<window_info anchor="bottom" id="Build" order="8" sideWeight="0.49622267" weight="0.3289166" />
<window_info anchor="bottom" id="Logcat" order="9" sideWeight="0.8974155" visible="true" weight="0.3289166" />
<window_info anchor="bottom" id="Logcat" order="9" sideWeight="0.8974155" weight="0.3289166" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="1" />
<window_info anchor="right" id="Gradle" order="2" />
......@@ -705,17 +700,10 @@
<MESSAGE value="re-push, missed some code" />
<MESSAGE value="Added Ronan's code for server computations in rating + bug fixes" />
<MESSAGE value="Added Orangzaib's Profile activities for marker clicks + fixed bug errors" />
<option name="LAST_COMMIT_MESSAGE" value="Added Orangzaib's Profile activities for marker clicks + fixed bug errors" />
<MESSAGE value="Bug fixes" />
<option name="LAST_COMMIT_MESSAGE" value="Bug fixes" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_register.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="241">
<caret line="22" column="34" selection-start-line="13" selection-start-column="4" selection-end-line="22" selection-end-column="34" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_terms.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
......@@ -1076,13 +1064,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-938">
<caret line="37" selection-start-line="37" selection-end-line="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserDriver_Profile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1493">
......@@ -1119,18 +1100,32 @@
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c3d4a4bb43d218ea8979263a5cb2f80/jars/classes.jar!/com/google/android/gms/maps/GoogleMap.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="482">
<caret line="747" column="13" selection-start-line="747" selection-start-column="13" selection-end-line="747" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="146" selection-start-line="146" selection-end-line="146" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="232" column="93" selection-start-line="232" selection-start-column="93" selection-end-line="232" selection-end-column="93" />
<state relative-caret-position="2142">
<caret line="309" column="24" selection-start-line="309" selection-start-column="24" selection-end-line="309" selection-end-column="24" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4697#4710#0" expanded="true" />
<element signature="e#4712#4726#0" expanded="true" />
<element signature="e#4966#7855#0" expanded="true" />
<element signature="e#7854#7855#0" expanded="true" />
<element signature="e#8318#8934#0" expanded="true" />
<element signature="e#8933#8934#0" expanded="true" />
<element signature="e#4725#4738#0" expanded="true" />
<element signature="e#4740#4754#0" expanded="true" />
<element signature="e#4994#7883#0" expanded="true" />
<element signature="e#7882#7883#0" expanded="true" />
<element signature="e#8346#9288#0" expanded="true" />
<element signature="e#9287#9288#0" expanded="true" />
</folding>
</state>
</provider>
......
src/main/java/com/example/liliyayankova/unirides/Driver_Main.java
+ 14
− 0
View file @ 50116036
package com.example.liliyayankova.unirides;
import android.content.Intent;
import android.location.Location;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.internal.NavigationMenu;
import android.support.design.internal.NavigationMenuItemView;
import android.support.design.widget.NavigationView;
......@@ -18,11 +20,22 @@ import android.view.View;
import android.widget.ImageButton;
import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.location.LocationListener;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
public class Driver_Main extends AppCompatActivity {
private DrawerLayout dl;
private ActionBarDrawerToggle dt;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -144,4 +157,5 @@ public class Driver_Main extends AppCompatActivity {
public void onBackPressed() {
// Do Here what ever you want do on back press;
}
}
\ No newline at end of file
src/main/java/com/example/liliyayankova/unirides/Map.java
+ 47
− 41
View file @ 50116036
......@@ -67,6 +67,7 @@ public class Map extends AppCompatActivity implements
private String firstName;
private String lastName;
private String userId;
private String userId2;
private LatLng latLng;
private DrawerLayout dl;
private ActionBarDrawerToggle dt;
......@@ -197,56 +198,23 @@ public class Map extends AppCompatActivity implements
mMap.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
@Override
public void onInfoWindowClick(Marker marker) {
//TODO: setting user id from the marker to be the id of driv3r to test routes - needs to be changed in future
userId = "Qg5xwj3cE9PexRlGdfmCdcU6bq73";
Toast.makeText(Map.this, userId, Toast.LENGTH_SHORT).show();
Intent driverprofile = new Intent(Map.this, UserDriver_Profile.class);
if(isDriver) {
if (isDriver) {
driverprofile.putExtra("userType", Login.userType.DRIVER);
}else{
} else {
driverprofile.putExtra("userType", Login.userType.PASSENGER);
}
driverprofile.putExtra("Uid",userId);
driverprofile.putExtra("Uid", userId);
startActivity(driverprofile);
}
});
if (!isDriver) {
dbRef.addListenerForSingleValueEvent(new ValueEventListener() {
@Override
public void onDataChange(@NonNull final DataSnapshot dataSnapshot) {
for (DataSnapshot child : dataSnapshot.child("drivers").getChildren()) {
Double latitude = child.child("latitude").getValue(Double.class);
Double longitude = child.child("longitude").getValue(Double.class);
latLng = new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude());
LatLng latLng2 = new LatLng(latitude, longitude);
firstName = child.child("first_name").getValue(String.class);
lastName = child.child("last_name").getValue(String.class);
//Toast.makeText(Map.this, firstName + lastName + ": " + (SphericalUtil.computeDistanceBetween(latLng, latLng2)), Toast.LENGTH_SHORT).show();
//TODO: setting user id from the marker to be the id of driv3r to test routes - needs to be changed in future
//userId = "Qg5xwj3cE9PexRlGdfmCdcU6bq73";
userId = child.getKey();
// Toast.makeText(Map.this, userId, Toast.LENGTH_SHORT).show();
Log.e("In radius", "ronan white");
if (SphericalUtil.computeDistanceBetween(latLng, latLng2) < 15000) {
Log.e("radius", latLng.toString() + " is 15km radius to " + latitude.toString() + ", " + longitude.toString());
mMap.addMarker(new MarkerOptions()
.position(latLng2)
.title(firstName + " " + lastName));
}
}
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
}
});
}
}
}
......@@ -313,6 +281,43 @@ public class Map extends AppCompatActivity implements
dbRef.child("drivers").child(userId).child("longitude").setValue(currentLocation.getLongitude());
}
if (!isDriver) {
dbRef.addListenerForSingleValueEvent(new ValueEventListener() {
@Override
public void onDataChange(@NonNull final DataSnapshot dataSnapshot) {
for (DataSnapshot child : dataSnapshot.child("drivers").getChildren()) {
Double latitude = child.child("latitude").getValue(Double.class);
Double longitude = child.child("longitude").getValue(Double.class);
latLng = new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude());
LatLng latLng2 = new LatLng(latitude, longitude);
firstName = child.child("first_name").getValue(String.class);
lastName = child.child("last_name").getValue(String.class);
//TODO: setting user id from the marker to be the id of driv3r to test routes - needs to be changed in future
//userId = "Qg5xwj3cE9PexRlGdfmCdcU6bq73";
FirebaseUser user = mFirebaseAuth.getInstance().getCurrentUser();
userId2 = user.getUid();
// Toast.makeText(Map.this, userId, Toast.LENGTH_SHORT).show();
Log.e("In radius", "ronan white");
if (SphericalUtil.computeDistanceBetween(latLng, latLng2) < 15000) {
Log.e("radius", latLng.toString() + " is 15km radius to " + latitude.toString() + ", " + longitude.toString());
mMap.addMarker(new MarkerOptions()
.position(latLng2)
.title(firstName + " " + lastName));
}
}
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
}
});
}
LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
MarkerOptions markerOptions = new MarkerOptions();
markerOptions.position(latLng);
......@@ -332,6 +337,7 @@ public class Map extends AppCompatActivity implements
LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
}
}
@Override
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment