Make navigator sighting compass larger

#1796
kylecorry31 · Nov 5, 2023 · 7e06449 · 7e06449
1 parent c3322f5
commit 7e06449
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/SightingCompassView.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/SightingCompassView.kt
@@ -1,6 +1,7 @@
 package com.kylecorry.trail_sense.navigation.ui
 
 import android.view.View
+import androidx.camera.view.PreviewView
 import androidx.core.view.isVisible
 import com.kylecorry.andromeda.alerts.Alerts
 import com.kylecorry.andromeda.camera.Camera
@@ -32,6 +33,7 @@ class SightingCompassView(
 
     init {
         camera.setShowTorch(false)
+        camera.setScaleType(PreviewView.ScaleType.FILL_CENTER)
     }
 
     fun start() {
@@ -72,6 +74,7 @@ class SightingCompassView(
 
     fun update(){
         if (!isRunning()){
+            compass.range = 180f
             return
         }
         scope.launch {
@@ -95,11 +98,10 @@ class SightingCompassView(
         } catch (e: Exception) {
             e.printStackTrace()
         }
-        compass.range = 180f
-        camera.isVisible = false
-        reticle.isVisible = false
         fovRunner.cancel()
         zoomRunner.cancel()
+        camera.isVisible = false
+        reticle.isVisible = false
     }
 
     fun isRunning(): Boolean {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/views/CameraView.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/views/CameraView.kt
@@ -58,6 +58,8 @@ class CameraView(context: Context, attrs: AttributeSet?) : FrameLayout(context,
     private var isStarted = false
     private val startLock = Any()
 
+    private var onSingleTapCallback: (e: MotionEvent) -> Unit = {}
+
     fun start(
         resolution: Size? = null,
         lifecycleOwner: LifecycleOwner? = null,
@@ -253,9 +255,14 @@ class CameraView(context: Context, attrs: AttributeSet?) : FrameLayout(context,
                 val newZoom = (zoom + remainingZoom / 2).coerceIn(0f, 1f)
                 zoomListener?.invoke(newZoom)
                 setZoom(newZoom)
+                return true
             }
             return super.onDoubleTap(e)
         }
+
+        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            return callOnClick() || super.onSingleTapConfirmed(e)
+        }
     }
 
     private val scaleListener = object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
@@ -265,8 +272,9 @@ class CameraView(context: Context, attrs: AttributeSet?) : FrameLayout(context,
                 val newZoom = (zoom - 1 + detector.scaleFactor ).coerceIn(0f, 1f)
                 zoomListener?.invoke(newZoom)
                 setZoom(newZoom)
+                return true
             }
-            return true
+            return false
         }
     }
 

diff --git a/app/src/main/res/layout/activity_navigator.xml b/app/src/main/res/layout/activity_navigator.xml
@@ -51,8 +51,8 @@
 
     <com.kylecorry.trail_sense.shared.views.CameraView
         android:id="@+id/view_camera"
-        android:layout_width="200dp"
-        android:layout_height="248dp"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/circular_display_size"
         android:keepScreenOn="true"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@id/linear_compass"
@@ -63,13 +63,13 @@
     <View
         android:id="@+id/view_camera_line"
         android:layout_width="1dp"
-        android:layout_height="248dp"
+        android:layout_height="0dp"
         android:background="@color/orange_40"
         android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@id/linear_compass"
+        app:layout_constraintBottom_toBottomOf="@id/view_camera"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/linear_compass" />
+        app:layout_constraintTop_toTopOf="@id/view_camera" />
 
 
     <com.kylecorry.trail_sense.navigation.ui.RoundCompassView