Finished merge from main

Adapted tests Finally solved all issues
G12-Wanderwave · Apr 12, 2024 · 55c3cae · 55c3cae
1 parent 35963b1
commit 55c3cae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 38 deletions.
diff --git a/app/src/androidTest/java/ch/epfl/cs311/wanderwave/ui/MapTest.kt b/app/src/androidTest/java/ch/epfl/cs311/wanderwave/ui/MapTest.kt
diff --git a/app/src/main/java/ch/epfl/cs311/wanderwave/ui/screens/MapScreen.kt b/app/src/main/java/ch/epfl/cs311/wanderwave/ui/screens/MapScreen.kt
@@ -28,11 +28,9 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapStyleOptions
-import com.google.android.gms.maps.model.MarkerOptions
 import com.google.maps.android.compose.CameraPositionState
 import com.google.maps.android.compose.GoogleMap
 import com.google.maps.android.compose.MapProperties
@@ -108,9 +106,7 @@ fun WanderwaveGoogleMap(
 
 @Composable
 fun MapContent(viewModel: MapViewModel) {
-  val epfl = LatLng(46.518831258, 6.559331096)
-  val beacons = viewModel.uiState.collectAsStateWithLifecycle().value.beacons
-  Marker(state = MarkerState(position = epfl), title = "Marker at EPFL")
+  val beacons: List<Beacon> = viewModel.uiState.collectAsStateWithLifecycle().value.beacons
   DisplayBeacons(beacons = beacons)
 }
 
@@ -154,9 +150,9 @@ fun moveCamera(
 fun DisplayBeacons(beacons: List<Beacon>) {
   // Create each beacon from the list
   beacons.forEach() {
-      Marker(
-          state = MarkerState(position = it.location.toLatLng()),
-          title = it.id,
-      )
+    Marker(
+        state = MarkerState(position = it.location.toLatLng()),
+        title = it.id,
+    )
   }
 }