From 6583b80eb7ccaa7e22d8593e9d21f6ea9fe94691 Mon Sep 17 00:00:00 2001
From: alejandrocalles <gabriel.jimenezcalles@epfl.ch>
Date: Sun, 2 Jun 2024 18:28:12 +0200
Subject: [PATCH] Make requested changes.

---
 .../com/github/swent/echo/compose/components/ListDrawer.kt | 7 +++++--
 .../main/java/com/github/swent/echo/di/GPSServiceModule.kt | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/swent/echo/compose/components/ListDrawer.kt b/app/src/main/java/com/github/swent/echo/compose/components/ListDrawer.kt
index 43b8d08ff..4dbdd7686 100644
--- a/app/src/main/java/com/github/swent/echo/compose/components/ListDrawer.kt
+++ b/app/src/main/java/com/github/swent/echo/compose/components/ListDrawer.kt
@@ -41,6 +41,8 @@ import com.mapbox.mapboxsdk.geometry.LatLng
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 
+const val KM_TO_M = 1000.0
+
 /**
  * Composable to display a list of events.
  *
@@ -78,6 +80,7 @@ fun ListDrawer(
         eventsList.forEach { event ->
             item {
                 val canModifyEvent = event.creator.userId == userId
+                val spaceBetweenItems = 12.dp
 
                 EventListItem(
                     event = event,
@@ -90,7 +93,7 @@ fun ListDrawer(
                     canModifyEvent = canModifyEvent,
                     distance = userLocation?.let { event.location.toLatLng().distanceTo(it) },
                 )
-                Spacer(modifier = Modifier.height(12.dp))
+                Spacer(modifier = Modifier.height(spaceBetweenItems))
             }
         }
     }
@@ -133,7 +136,7 @@ fun EventListItem(
                 val fmt = { format: String, value: Double ->
                     String.format(Locale.getDefault(), format, value)
                 }
-                if (it < 1000) fmt("%.0fm", it) else fmt("%.1fkm", it / 1000.0)
+                if (it < KM_TO_M) fmt("%.0fm", it) else fmt("%.1fkm", it / KM_TO_M)
             }
             ?.let { "$it • " } ?: ""
 
diff --git a/app/src/main/java/com/github/swent/echo/di/GPSServiceModule.kt b/app/src/main/java/com/github/swent/echo/di/GPSServiceModule.kt
index a998484b2..0c46ed56f 100644
--- a/app/src/main/java/com/github/swent/echo/di/GPSServiceModule.kt
+++ b/app/src/main/java/com/github/swent/echo/di/GPSServiceModule.kt
@@ -16,7 +16,6 @@ object GPSServiceModule {
     @Singleton
     @Provides
     fun provideGPSService(application: Application): GPSService {
-        val context = application.applicationContext
-        return GPSServiceImpl(context)
+        return GPSServiceImpl(application.applicationContext)
     }
 }