Display distances on triangulation location headers

#1966
kylecorry31 · Oct 11, 2023 · 88de8a7 · 88de8a7
1 parent 5346eb6
commit 88de8a7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/triangulate/ui/FragmentToolTriangulate.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/triangulate/ui/FragmentToolTriangulate.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.text.buildSpannedString
+import androidx.core.text.scale
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.kylecorry.andromeda.alerts.Alerts
@@ -174,18 +176,34 @@ class FragmentToolTriangulate : BoundFragment<FragmentToolTriangulateBinding>()
             return
         }
 
-        binding.triangulateTitle.subtitle.text = if (shouldCalculateMyLocation) {
-            null
-        } else {
-            // TODO: Display this on each location instead
-            getDistanceToDestination(2)?.let {
-                formatService.formatDistance(it, Units.getDecimalPlaces(it.units))
-            }
-        }
+        binding.location1Title.text = getLocationTitle(1)
+        binding.location2Title.text = getLocationTitle(2)
 
         // TODO: Display distance between locations
     }
 
+    private fun getLocationTitle(locationIdx: Int): CharSequence {
+        val distance = getDistanceToDestination(locationIdx)
+        val formattedDistance = distance?.let {
+            formatService.formatDistance(it, Units.getDecimalPlaces(it.units))
+        }
+        return buildSpannedString {
+            append(getString(if (locationIdx == 1) R.string.beacon_1 else R.string.beacon_2))
+            if (distance != null) {
+                appendLine()
+                scale(0.75f) {
+                    append(
+                        if (shouldCalculateMyLocation) {
+                            getString(R.string.distance_away_from_self, formattedDistance)
+                        } else {
+                            getString(R.string.distance_away_from_destination, formattedDistance)
+                        }
+                    )
+                }
+            }
+        }
+    }
+
     private fun updateInstructions() {
         if (!isBound) {
             return

diff --git a/app/src/main/res/layout/fragment_tool_triangulate.xml b/app/src/main/res/layout/fragment_tool_triangulate.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:rightButtonIcon="@drawable/ic_copy"
+            app:showSubtitle="false"
             tools:title="10.0000, 40.0000" />
 
         <com.kylecorry.trail_sense.navigation.paths.ui.PathView

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1343,6 +1343,10 @@
     <string name="triangulate_self_location_1_instructions">Choose a known location that you can see and record the direction from where you are to that location.</string>
     <string name="triangulate_self_location_2_instructions">Choose another known location that you can see and record the direction from where you are to that location.</string>
     <string name="location_to_triangulate">Location to triangulate</string>
+    <!--The distance away from your current location. Ex. 30 m away-->
+    <string name="distance_away_from_self">%s away</string>
+    <!--The distance away from the destination. Ex. 30 m from destination-->
+    <string name="distance_away_from_destination">%s from destination</string>
     <plurals name="map_group_summary">
         <item quantity="one">%d map</item>
         <item quantity="other">%d maps</item>