Merge pull request #149 from PeriodPals/feat/geolocation/change-map-s…

…ervices-names-to-GPS Feat/geolocation/change map services names to gps
PeriodPals · Nov 7, 2024 · a751761 · a751761
2 parents 8f7b780 + 6d928a3
commit a751761
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/app/src/androidTest/java/com/android/periodpals/ui/map/MapScreenTest.kt b/app/src/androidTest/java/com/android/periodpals/ui/map/MapScreenTest.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.navigation.compose.rememberNavController
 import com.android.periodpals.resources.C.Tag.MapScreen
 import com.android.periodpals.resources.C.Tag.TopAppBar
-import com.android.periodpals.services.LocationServiceImpl
+import com.android.periodpals.services.GPSServiceImpl
 import com.android.periodpals.ui.navigation.NavigationActions
 import org.junit.Before
 import org.junit.Rule
@@ -45,7 +45,7 @@ class MapScreenTest {
       ArgumentCaptor<ActivityResultCallback<Map<String, Boolean>>>
 
   // The location service
-  private lateinit var locationService: LocationServiceImpl
+  private lateinit var locationService: GPSServiceImpl
 
   @Before
   fun setup() {
@@ -59,7 +59,7 @@ class MapScreenTest {
             any<ActivityResultContracts.RequestMultiplePermissions>(),
             any<ActivityResultCallback<Map<String, Boolean>>>())
 
-    locationService = LocationServiceImpl(activity)
+    locationService = GPSServiceImpl(activity)
 
     // Verify registerForActivityResult is called and capture the callback
     verify(activity)

diff --git a/app/src/main/java/com/android/periodpals/MainActivity.kt b/app/src/main/java/com/android/periodpals/MainActivity.kt
@@ -15,7 +15,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navigation
 import com.android.periodpals.model.authentication.AuthenticationModelSupabase
 import com.android.periodpals.model.authentication.AuthenticationViewModel
-import com.android.periodpals.services.LocationServiceImpl
+import com.android.periodpals.services.GPSServiceImpl
 import com.android.periodpals.ui.alert.AlertListsScreen
 import com.android.periodpals.ui.alert.CreateAlertScreen
 import com.android.periodpals.ui.authentication.SignInScreen
@@ -35,7 +35,7 @@ import org.osmdroid.config.Configuration
 
 class MainActivity : ComponentActivity() {
 
-  private val locationService = LocationServiceImpl(this)
+  private val locationService = GPSServiceImpl(this)
 
   private val supabaseClient =
       createSupabaseClient(
@@ -67,7 +67,7 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun PeriodPalsApp(
-    locationService: LocationServiceImpl,
+    locationService: GPSServiceImpl,
     authenticationViewModel: AuthenticationViewModel,
 ) {
   val navController = rememberNavController()

diff --git a/app/src/main/java/com/android/periodpals/model/location/GPSLocation.kt b/app/src/main/java/com/android/periodpals/model/location/GPSLocation.kt
@@ -0,0 +1,17 @@
+package com.android.periodpals.model.location
+
+import org.osmdroid.util.GeoPoint
+
+data class GPSLocation(val lat: Double, val long: Double) {
+
+  /**
+   * Transform this location into a [GeoPoint].
+   *
+   * @return The respective [GeoPoint].
+   */
+  fun toGeoPoint() = GeoPoint(lat, long)
+
+  companion object {
+    val DEFAULT_LOCATION = GPSLocation(46.5191, 6.5668)
+  }
+}
diff --git a/...id/periodpals/services/LocationService.kt → ...android/periodpals/services/GPSService.kt b/...id/periodpals/services/LocationService.kt → ...android/periodpals/services/GPSService.kt
@@ -1,7 +1,7 @@
 package com.android.periodpals.services
 
 /** A service that provides the user location. */
-interface LocationService {
+interface GPSService {
 
   /** Requests the user for permission to access their location. */
   fun requestUserPermissionForLocation()

diff --git a/...eriodpals/services/LocationServiceImpl.kt → ...oid/periodpals/services/GPSServiceImpl.kt b/...eriodpals/services/LocationServiceImpl.kt → ...oid/periodpals/services/GPSServiceImpl.kt
@@ -20,7 +20,7 @@ enum class LocationAccessType {
  *
  * @param activity The screen from which the location service is being launched from.
  */
-class LocationServiceImpl(private val activity: ComponentActivity) : LocationService {
+class GPSServiceImpl(private val activity: ComponentActivity) : GPSService {
 
   private val TAG = "LocationServiceImpl: registerForActivityResult"
 

diff --git a/app/src/main/java/com/android/periodpals/ui/map/Map.kt b/app/src/main/java/com/android/periodpals/ui/map/Map.kt
@@ -14,8 +14,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.viewinterop.AndroidView
 import com.android.periodpals.resources.C.Tag.MapScreen
+import com.android.periodpals.services.GPSServiceImpl
 import com.android.periodpals.services.LocationAccessType
-import com.android.periodpals.services.LocationServiceImpl
 import com.android.periodpals.ui.navigation.BottomNavigationMenu
 import com.android.periodpals.ui.navigation.LIST_TOP_LEVEL_DESTINATION
 import com.android.periodpals.ui.navigation.NavigationActions
@@ -37,7 +37,7 @@ private const val TAG = "MapView"
 private const val SCREEN_TITLE = "Map"
 
 @Composable
-fun MapScreen(locationService: LocationServiceImpl, navigationActions: NavigationActions) {
+fun MapScreen(locationService: GPSServiceImpl, navigationActions: NavigationActions) {
   val context = LocalContext.current
   val fusedLocationClient = remember { LocationServices.getFusedLocationProviderClient(context) }
   val mapView = remember { MapView(context) }

diff --git a/...dpals/services/LocationServiceImplTest.kt → ...periodpals/services/GPSServiceImplTest.kt b/...dpals/services/LocationServiceImplTest.kt → ...periodpals/services/GPSServiceImplTest.kt
@@ -21,7 +21,7 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.verify
 
 @RunWith(MockitoJUnitRunner::class)
-class LocationServiceImplTest {
+class GPSServiceImplTest {
 
   @Mock private lateinit var activity: ComponentActivity // Mock the "screen"
 
@@ -32,7 +32,7 @@ class LocationServiceImplTest {
   private lateinit var permissionCallbackCaptor:
       ArgumentCaptor<ActivityResultCallback<Map<String, Boolean>>>
 
-  private lateinit var locationService: LocationServiceImpl
+  private lateinit var locationService: GPSServiceImpl
 
   @Before
   fun setup() {
@@ -44,7 +44,7 @@ class LocationServiceImplTest {
             any<ActivityResultCallback<Map<String, Boolean>>>())
 
     // Create the actual (not mocked) location service instance
-    locationService = LocationServiceImpl(activity)
+    locationService = GPSServiceImpl(activity)
 
     // And then we verify that upon creating the location service,
     // registerForActivityResult was called. We also capture the callback.