Merge pull request #195 from ellenhp/ellenhp/localization_settings

Distance unit preference and 12/24 hour time

Author: ellenhp

cardinal-android/app/src/main/java/earth/maps/cardinal/data/AppPreferenceRepository.kt

@@ -17,6 +17,7 @@
 package earth.maps.cardinal.data
 
 import android.content.Context
+import android.text.format.DateFormat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -64,6 +65,9 @@ class AppPreferenceRepository @Inject constructor(
     private val _showZoomFabs = MutableStateFlow(true)
     val showZoomFabs: StateFlow<Boolean> = _showZoomFabs.asStateFlow()
 
+    private val _use24HourFormat = MutableStateFlow(DateFormat.is24HourFormat(context))
+    val use24HourFormat: StateFlow<Boolean> = _use24HourFormat.asStateFlow()
+
     private val _lastRoutingMode = MutableStateFlow(appPreferences.loadLastRoutingMode())
     val lastRoutingMode: StateFlow<String> = _lastRoutingMode.asStateFlow()
 
@@ -93,6 +97,7 @@ class AppPreferenceRepository @Inject constructor(
         loadAllowTransitInOfflineMode()
         loadContinuousLocationTracking()
         loadShowZoomFabs()
+        loadUse24HourFormat()
         loadLastRoutingMode()
         loadApiConfigurations()
     }
@@ -160,6 +165,11 @@ class AppPreferenceRepository @Inject constructor(
         _showZoomFabs.value = show
     }
 
+    private fun loadUse24HourFormat() {
+        val use24Hour = appPreferences.loadUse24HourFormat()
+        _use24HourFormat.value = use24Hour
+    }
+
     fun setAllowTransitInOfflineMode(allowTransitInOfflineMode: Boolean) {
         _allowTransitInOfflineMode.value = allowTransitInOfflineMode
         viewModelScope.launch {
@@ -181,6 +191,13 @@ class AppPreferenceRepository @Inject constructor(
         }
     }
 
+    fun setUse24HourFormat(use24Hour: Boolean) {
+        _use24HourFormat.value = use24Hour
+        viewModelScope.launch {
+            appPreferences.saveUse24HourFormat(use24Hour)
+        }
+    }
+
     private fun loadLastRoutingMode() {
         val mode = appPreferences.loadLastRoutingMode()
         _lastRoutingMode.value = mode

cardinal-android/app/src/main/java/earth/maps/cardinal/data/AppPreferences.kt

@@ -18,13 +18,14 @@ package earth.maps.cardinal.data
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.text.format.DateFormat
 import androidx.core.content.edit
 import java.util.Locale
 
 /**
  * Helper class to save and load app preferences using SharedPreferences.
  */
-class AppPreferences(context: Context) {
+class AppPreferences(private val context: Context) {
     private val prefs: SharedPreferences =
         context.getSharedPreferences("app_prefs", Context.MODE_PRIVATE)
 
@@ -41,6 +42,8 @@ class AppPreferences(context: Context) {
 
         private const val KEY_LAST_ROUTING_MODE = "last_routing_mode"
 
+        private const val KEY_USE_24_HOUR_FORMAT = "use_24_hour_format"
+
         // API configuration keys
         private const val KEY_PELIAS_BASE_URL = "pelias_base_url"
         private const val KEY_PELIAS_API_KEY = "pelias_api_key"
@@ -263,6 +266,25 @@ class AppPreferences(context: Context) {
             ?: DEFAULT_LAST_ROUTING_MODE
     }
 
+    /**
+     * Saves the use 24-hour format preference.
+     */
+    fun saveUse24HourFormat(use24Hour: Boolean) {
+        prefs.edit {
+            putBoolean(KEY_USE_24_HOUR_FORMAT, use24Hour)
+        }
+    }
+
+    /**
+     * Loads the saved use 24-hour format preference.
+     * Returns the system default as default value.
+     */
+    fun loadUse24HourFormat(): Boolean {
+        val systemDefault = DateFormat.is24HourFormat(context)
+        // Note: we're using the system default as the fallback, but storing user preference
+        return prefs.getBoolean(KEY_USE_24_HOUR_FORMAT, systemDefault)
+    }
+
     /**
      * Gets the default distance unit based on the system locale.
      * Returns imperial for countries that use imperial system (US, Liberia, Myanmar),

cardinal-android/app/src/main/java/earth/maps/cardinal/data/GeoUtils.kt

@@ -32,6 +32,8 @@ object GeoUtils {
     private const val METERS_TO_MILES = 1609.34
     private const val METERS_TO_FEET = 3.28084
 
+    private const val SHORT_DISTANCE_THRESHOLD_METERS = 200.0
+
     /**
      * Formats a distance in meters to a human-readable string based on the unit preference.
      *
@@ -98,6 +100,9 @@ object GeoUtils {
      * @return Formatted short distance string (e.g., "150 m" or "490 ft")
      */
     fun formatShortDistance(meters: Double, unitPreference: Int): String {
+        if (meters > SHORT_DISTANCE_THRESHOLD_METERS) {
+            return formatDistance(meters, unitPreference)
+        }
         return when (unitPreference) {
             AppPreferences.DISTANCE_UNIT_METRIC -> "${meters.roundToInt()} m"
             AppPreferences.DISTANCE_UNIT_IMPERIAL -> {
@@ -147,7 +152,8 @@ object GeoUtils {
 
         // Calculate the approximate delta in degrees for the given radius
         val latDelta = Math.toDegrees(radiusMeters / earthRadius)
-        val lonDelta = Math.toDegrees(radiusMeters / (earthRadius * cos(Math.toRadians(center.latitude))))
+        val lonDelta =
+            Math.toDegrees(radiusMeters / (earthRadius * cos(Math.toRadians(center.latitude))))
 
         // Create the bounding box with north, south, east, west boundaries
         return BoundingBox(

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt

@@ -737,8 +737,7 @@ fun AppContent(
                             try {
                                 val positions =
                                     earth.maps.cardinal.data.PolylineUtils.decodePolyline(
-                                        geometry.points,
-                                        geometry.precision
+                                        geometry.points, geometry.precision
                                     )
                                 allPositions.addAll(positions)
                             } catch (e: Exception) {
@@ -789,10 +788,9 @@ fun AppContent(
                     peekHeight = peekHeight,
                     content = {
                         earth.maps.cardinal.ui.directions.TransitItineraryDetailScreen(
-                            itinerary = itinerary,
-                            onBack = {
+                            itinerary = itinerary, onBack = {
                                 navController.popBackStack()
-                            }
+                            }, appPreferences = appPreferenceRepository
                         )
                     },
                     showToolbar = false,
@@ -842,12 +840,10 @@ fun AppContent(
             modifier = Modifier.align(Alignment.BottomCenter),
             visible = showToolbar,
             enter = slideInVertically(
-                initialOffsetY = { it },
-                animationSpec = tween(300)
+                initialOffsetY = { it }, animationSpec = tween(300)
             ),
             exit = slideOutVertically(
-                targetOffsetY = { it },
-                animationSpec = tween(300)
+                targetOffsetY = { it }, animationSpec = tween(300)
             ),
         ) {
             CardinalToolbar(navController, onSearchDoublePress = { homeViewModel.expandSearch() })
@@ -858,15 +854,12 @@ fun AppContent(
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun CardinalToolbar(
-    navController: NavController,
-    onSearchDoublePress: (() -> Unit)? = null
+    navController: NavController, onSearchDoublePress: (() -> Unit)? = null
 ) {
     FlexibleBottomAppBar {
         IconButton(onClick = {
             NavigationUtils.navigate(
-                navController,
-                screen = Screen.ManagePlaces(null),
-                popUpToHome = true
+                navController, screen = Screen.ManagePlaces(null), popUpToHome = true
             )
         }) {
             Icon(
@@ -888,9 +881,7 @@ private fun CardinalToolbar(
                 onSearchDoublePress?.invoke()
             } else {
                 NavigationUtils.navigate(
-                    navController,
-                    screen = Screen.HomeSearch,
-                    popUpToHome = true
+                    navController, screen = Screen.HomeSearch, popUpToHome = true
                 )
             }
         }) {
@@ -901,9 +892,7 @@ private fun CardinalToolbar(
         }
         IconButton(onClick = {
             NavigationUtils.navigate(
-                navController,
-                screen = Screen.NearbyTransit,
-                popUpToHome = true
+                navController, screen = Screen.NearbyTransit, popUpToHome = true
             )
         }) {
             Icon(
@@ -915,9 +904,7 @@ private fun CardinalToolbar(
         }
         IconButton(onClick = {
             NavigationUtils.navigate(
-                navController,
-                screen = Screen.OfflineAreas,
-                popUpToHome = true
+                navController, screen = Screen.OfflineAreas, popUpToHome = true
             )
         }) {
             Icon(

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/DirectionsScreen.kt

@@ -301,13 +301,11 @@ fun DirectionsScreen(
 
                     planState.planResponse != null -> {
                         TransitDirectionsScreen(
-                            viewModel = viewModel,
-                            onItineraryClick = { itinerary ->
+                            viewModel = viewModel, onItineraryClick = { itinerary ->
                                 NavigationUtils.navigate(
-                                    navController,
-                                    Screen.TransitItineraryDetail(itinerary)
+                                    navController, Screen.TransitItineraryDetail(itinerary)
                                 )
-                            }
+                            }, appPreferences = appPreferences
                         )
                     }
 
@@ -408,29 +406,29 @@ fun DirectionsScreen(
                 // Show quick suggestions when no search query
                 QuickSuggestions(
                     onMyLocationSelected = {
-                        // Check permissions before attempting to get location
-                        if (hasLocationPermission) {
-                            // Launch coroutine to get current location
-                            coroutineScope.launch {
-                                val myLocationPlace = viewModel.getCurrentLocationAsPlace()
-                                myLocationPlace?.let { place ->
-                                    // Update the appropriate place based on which field is focused
-                                    if (fieldFocusState == FieldFocusState.FROM) {
-                                        viewModel.updateFromPlace(place)
-                                    } else {
-                                        viewModel.updateToPlace(place)
-                                    }
-                                    // Clear focus state after selection
-                                    fieldFocusState = FieldFocusState.NONE
+                    // Check permissions before attempting to get location
+                    if (hasLocationPermission) {
+                        // Launch coroutine to get current location
+                        coroutineScope.launch {
+                            val myLocationPlace = viewModel.getCurrentLocationAsPlace()
+                            myLocationPlace?.let { place ->
+                                // Update the appropriate place based on which field is focused
+                                if (fieldFocusState == FieldFocusState.FROM) {
+                                    viewModel.updateFromPlace(place)
+                                } else {
+                                    viewModel.updateToPlace(place)
                                 }
+                                // Clear focus state after selection
+                                fieldFocusState = FieldFocusState.NONE
                             }
-                        } else {
-                            // Set pending request for auto-retry after permission grant
-                            pendingLocationRequest = fieldFocusState
-                            // Request location permission
-                            onRequestLocationPermission()
                         }
-                    },
+                    } else {
+                        // Set pending request for auto-retry after permission grant
+                        pendingLocationRequest = fieldFocusState
+                        // Request location permission
+                        onRequestLocationPermission()
+                    }
+                },
                     savedPlaces = savedPlaces,
                     onSavedPlaceSelected = { place ->
                         // Update the appropriate place based on which field is focused
@@ -682,8 +680,7 @@ private fun RoutingProfileSelector(
         val profileOptions = listOf(null) + availableProfiles
 
         SingleChoiceSegmentedButtonRow(
-            modifier = modifier
-                .fillMaxWidth()
+            modifier = modifier.fillMaxWidth()
         ) {
             profileOptions.forEach { profile ->
                 val isSelected = selectedProfile?.id == profile?.id