diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/MainActivity.java b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/MainActivity.java index 114c665..43c0e0d 100644 --- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/MainActivity.java +++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/MainActivity.java @@ -1,11 +1,13 @@ package gr.auth.databases.flavours; +import android.graphics.BitmapFactory; import android.os.Bundle; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; @@ -39,9 +41,73 @@ public class MainActivity extends FragmentActivity implements OnMapReadyCallback public void onMapReady(GoogleMap googleMap) { mMap = googleMap; - // Add a marker in Sydney and move the camera - LatLng sydney = new LatLng(-34, 151); - mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); - mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney)); + // Add markers and move the camera + LatLng uFleku = new LatLng(40.6357, 22.9367); + LatLng sSyxronaEstiatoria = new LatLng(40.6173, 22.9597); + LatLng uFlekuGarden = new LatLng(40.6354, 22.937); + LatLng mcDonalds = new LatLng(40.6463, 22.9206); + LatLng grill15 = new LatLng(40.6215, 22.961); + LatLng butterfliesAndHurricanes = new LatLng(40.6147, 22.9609); + LatLng theHoppyPub = new LatLng(40.6279, 22.9489); + LatLng bellevilleSinPatron = new LatLng(40.6337, 22.9518); + LatLng aitheroploo = new LatLng(40.6144, 22.9598); + LatLng odysseas = new LatLng(40.6369, 22.9534); + LatLng pulp = new LatLng(40.6321, 22.9479); + LatLng mcDonalds2 = new LatLng(40.5745, 22.9715); + LatLng gianoula = new LatLng(40.64, 22.9468); + + mMap.addMarker(new MarkerOptions() + .position(uFleku) + .title("U Fleků") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.pub_marker))); + mMap.addMarker(new MarkerOptions() + .position(sSyxronaEstiatoria) + .title("Σ σύγχρονα εστιατόρια") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.restaurant_marker))); + mMap.addMarker(new MarkerOptions() + .position(uFlekuGarden) + .title("U Fleků Garden") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.pub_marker))); + mMap.addMarker(new MarkerOptions() + .position(mcDonalds) + .title("McDonald\'s") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.fast_food_marker))); + mMap.addMarker(new MarkerOptions() + .position(grill15) + .title("Grill 15") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.fast_food_marker))); + mMap.addMarker(new MarkerOptions() + .position(butterfliesAndHurricanes) + .title("Butterflies and Hurricanes") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.cafeteria_marker))); + mMap.addMarker(new MarkerOptions() + .position(theHoppyPub) + .title("The Hoppy Pub") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.pub_marker))); + mMap.addMarker(new MarkerOptions() + .position(bellevilleSinPatron) + .title("Belleville sin patron") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.bar_marker))); + mMap.addMarker(new MarkerOptions() + .position(aitheroploo) + .title("Αιθερόπλοο") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.pub_marker))); + mMap.addMarker(new MarkerOptions() + .position(odysseas) + .title("Οδυσσέας") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.restaurant_marker))); + mMap.addMarker(new MarkerOptions() + .position(pulp) + .title("Pulp") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.bar_marker))); + mMap.addMarker(new MarkerOptions() + .position(mcDonalds2) + .title("McDonald\'s") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.fast_food_marker))); + mMap.addMarker(new MarkerOptions() + .position(gianoula) + .title("Γιαννούλα") + .icon(BitmapDescriptorFactory.fromResource(R.drawable.restaurant_marker))); + mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(grill15, 12.0f)); } } diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/bar_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/bar_marker.png new file mode 100644 index 0000000..16a8ceb Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/bar_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/cafeteria_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/cafeteria_marker.png new file mode 100644 index 0000000..1eb3dc5 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/cafeteria_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/fast_food_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/fast_food_marker.png new file mode 100644 index 0000000..d448737 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/fast_food_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/pub_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/pub_marker.png new file mode 100644 index 0000000..77688c3 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/pub_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/restaurant_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/restaurant_marker.png new file mode 100644 index 0000000..b33ed3b Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable-v24/restaurant_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/bar_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/bar_marker.png new file mode 100644 index 0000000..16a8ceb Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/bar_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/cafeteria_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/cafeteria_marker.png new file mode 100644 index 0000000..1eb3dc5 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/cafeteria_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/fast_food_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/fast_food_marker.png new file mode 100644 index 0000000..d448737 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/fast_food_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/pub_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/pub_marker.png new file mode 100644 index 0000000..77688c3 Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/pub_marker.png differ diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/restaurant_marker.png b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/restaurant_marker.png new file mode 100644 index 0000000..b33ed3b Binary files /dev/null and b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/drawable/restaurant_marker.png differ