diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 218ffb4..7e73a8e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -6,7 +6,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/ic_marker-playstore.png b/app/src/main/ic_marker-playstore.png
new file mode 100644
index 0000000..7dc5402
Binary files /dev/null and b/app/src/main/ic_marker-playstore.png differ
diff --git a/app/src/main/java/com/example/mad_2024_app/Activities/OpenStreetMap.kt b/app/src/main/java/com/example/mad_2024_app/Activities/OpenStreetMap.kt
index 36af1c7..665ebee 100644
--- a/app/src/main/java/com/example/mad_2024_app/Activities/OpenStreetMap.kt
+++ b/app/src/main/java/com/example/mad_2024_app/Activities/OpenStreetMap.kt
@@ -35,7 +35,10 @@ class OpenStreetMap : AppCompatActivity() {
GeoPoint(40.38956358584258, -3.629046081389352), // Teleco
GeoPoint(40.38992125672989, -3.6281366497769714), // ETSISI
GeoPoint(40.39037466191718, -3.6270256763598447), // Library
- GeoPoint(40.389855884803005, -3.626782180787362) // CITSEM
+ GeoPoint(40.389855884803005, -3.626782180787362), // CITSEM
+ GeoPoint(40.37192552382719, -3.5917083345440353), //La Gavia DUNKIN
+ GeoPoint(40.395484086123915, -3.687844694066538), // Bite Me Cafe Arganzuela
+ GeoPoint(40.3926706041883, -3.7076844647927683), // DUNKIN Plaza Rio
)
val gymkhanaNames = listOf(
"Tennis",
@@ -45,7 +48,10 @@ class OpenStreetMap : AppCompatActivity() {
"Telecommunications school",
"ETSISI",
"Library",
- "CITSEM"
+ "CITSEM",
+ "Gavia",
+ "Arganzuela",
+ "Plaza Rio"
)
@SuppressLint("MissingInflatedId")
@@ -116,7 +122,7 @@ class OpenStreetMap : AppCompatActivity() {
marker.position = location
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
marker.title = "Marker at ${locationsNames.get(locationsCoords.indexOf(location))} ${location.latitude}, ${location.longitude}"
- marker.icon = ContextCompat.getDrawable(this, R.drawable.ic_m3_chip_checked_circle)
+ marker.icon = ContextCompat.getDrawable(this, R.mipmap.ic_marker_foreground)
mapView.overlays.add(marker)
}
mapView.invalidate() // Refresh the map to display the new markers
@@ -137,7 +143,7 @@ class OpenStreetMap : AppCompatActivity() {
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
val locationIndex = locationsCoords.indexOf(location)
marker.title = "Marker at ${locationsNames[locationIndex]} ${location.latitude}, ${location.longitude}"
- marker.icon = ContextCompat.getDrawable(this, org.osmdroid.library.R.drawable.ic_menu_compass)
+ marker.icon = ContextCompat.getDrawable(this, R.mipmap.ic_marker_foreground)
mapView.overlays.add(marker)
}
mapView.invalidate()
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_marker.xml b/app/src/main/res/mipmap-anydpi-v26/ic_marker.xml
new file mode 100644
index 0000000..a59fb99
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_marker.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_marker_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_marker_round.xml
new file mode 100644
index 0000000..a59fb99
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_marker_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_marker.webp b/app/src/main/res/mipmap-hdpi/ic_marker.webp
new file mode 100644
index 0000000..73bf828
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_marker.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_marker_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_marker_foreground.webp
new file mode 100644
index 0000000..bc9221a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_marker_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_marker_round.webp b/app/src/main/res/mipmap-hdpi/ic_marker_round.webp
new file mode 100644
index 0000000..1bf9599
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_marker_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_marker.webp b/app/src/main/res/mipmap-mdpi/ic_marker.webp
new file mode 100644
index 0000000..0d6d7f5
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_marker.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_marker_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_marker_foreground.webp
new file mode 100644
index 0000000..d48ec53
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_marker_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_marker_round.webp b/app/src/main/res/mipmap-mdpi/ic_marker_round.webp
new file mode 100644
index 0000000..2315cb4
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_marker_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_marker.webp b/app/src/main/res/mipmap-xhdpi/ic_marker.webp
new file mode 100644
index 0000000..00867d2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_marker.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_marker_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_marker_foreground.webp
new file mode 100644
index 0000000..36ef37b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_marker_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_marker_round.webp b/app/src/main/res/mipmap-xhdpi/ic_marker_round.webp
new file mode 100644
index 0000000..3871793
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_marker_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_marker.webp b/app/src/main/res/mipmap-xxhdpi/ic_marker.webp
new file mode 100644
index 0000000..e937203
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_marker.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_marker_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_marker_foreground.webp
new file mode 100644
index 0000000..a2671c6
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_marker_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_marker_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_marker_round.webp
new file mode 100644
index 0000000..e0580e9
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_marker_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_marker.webp b/app/src/main/res/mipmap-xxxhdpi/ic_marker.webp
new file mode 100644
index 0000000..6479de7
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_marker.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_marker_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_marker_foreground.webp
new file mode 100644
index 0000000..c8ecc86
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_marker_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_marker_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_marker_round.webp
new file mode 100644
index 0000000..8ec2a50
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_marker_round.webp differ