From 589568ed048bc43f573b7b0c501635d29a6f1420 Mon Sep 17 00:00:00 2001
From: petermcneil <petermcneil@users.noreply.github.com>
Date: Thu, 9 May 2019 16:21:07 +0100
Subject: [PATCH] Added a compass image to hunt mode

---
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |   2 +-
 .../peter/drop/activities/FindHuntActivity.kt |  54 ++++++--
 app/src/main/res/drawable/compass.png         | Bin 0 -> 13291 bytes
 .../main/res/layout/activity_find_hunt.xml    | 119 ++++++++++--------
 5 files changed, 115 insertions(+), 62 deletions(-)
 create mode 100644 app/src/main/res/drawable/compass.png

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 67c3a35..d685aa4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8.152" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8.152" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 2a9c72b..8f17e6b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 28
         versionCode 1
-        versionName "1.2.3"
+        versionName "1.2.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/kotlin/mcneil/peter/drop/activities/FindHuntActivity.kt b/app/src/main/kotlin/mcneil/peter/drop/activities/FindHuntActivity.kt
index aa85944..0286de3 100644
--- a/app/src/main/kotlin/mcneil/peter/drop/activities/FindHuntActivity.kt
+++ b/app/src/main/kotlin/mcneil/peter/drop/activities/FindHuntActivity.kt
@@ -3,12 +3,14 @@ package mcneil.peter.drop.activities
 import android.Manifest
 import android.app.ProgressDialog
 import android.content.pm.PackageManager
+import android.graphics.Matrix
 import android.location.Criteria
 import android.location.Location
 import android.location.LocationListener
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.widget.ImageView
 import android.widget.SeekBar
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -56,6 +58,7 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
 
     private var distance = 0
     private var callbackDisabled = false
+    private var cancelTimeout = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -65,17 +68,17 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
         pd.setCancelable(false)
 
         fm = supportFragmentManager
-        cancelDropDialog = AlertDialog.Builder(this).setMessage(R.string.cancel_drop_dialog)
-            .setPositiveButton(R.string.are_you_sure) { _, _ ->
-                removeSearchUI()
-            }.create()
+        cancelDropDialog = AlertDialog.Builder(this)
+            .setMessage(R.string.cancel_drop_dialog)
+            .setPositiveButton(R.string.are_you_sure) { _, _ -> removeSearchUI() }
+            .create()
 
         find_a_drop_btn.setOnClickListener(this)
         cancel_this_drop.setOnClickListener(this)
         show_drop.setOnClickListener(this)
         radius_text.text = getString(R.string.radius_text, progressToRadius(1))
         radius_seekbar.setOnSeekBarChangeListener(this)
-
+        needle.setImageDrawable(resources.getDrawable(R.drawable.compass, null))
         snackbar = Snackbar.make(findViewById(android.R.id.content), "Couldn't find a drop, try increasing the radius", Snackbar.LENGTH_LONG)
     }
 
@@ -94,8 +97,11 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
 
     override fun callback(ret: Pair<String, Drop>) {
         if (::timeout.isInitialized && !timeout.isDone) {
+            Log.d(TAG, "callback: Interrupting timeout")
             timeout.cancel(true)
-        } else if (callbackDisabled) {
+            cancelTimeout = true
+        }
+        if (callbackDisabled) {
             Log.d(TAG, "callback: Disabled because timeout has been reached")
         } else {
             Log.d(TAG, "callback: Found a drop")
@@ -157,15 +163,20 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
                 firebaseUtil.findNewDrop(currentLocation, this@FindHuntActivity, radius)
 
                 //Start a timeout for finding a drop
-                //If the
                 timeout = doAsync {
                     var timeNow = System.currentTimeMillis()
                     while ((timeNow - timeBefore) < TIMEOUT_MILLISECONDS) {
                         timeNow = System.currentTimeMillis()
                     }
-                    callbackDisabled = true
-                    pd.cancel()
-                    snackbar.show()
+                    if(cancelTimeout) {
+                        Log.d(TAG, "timeout: Cancelled and resetting")
+                        cancelTimeout = false
+                    } else {
+                        callbackDisabled = true
+                        pd.cancel()
+                        Log.d(TAG, "timeout: Showing snackbar")
+                        snackbar.show()
+                    }
                 }
             }
         }
@@ -188,12 +199,14 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
         find_a_drop_btn.visibility = View.GONE
         radius_seekbar.visibility = View.GONE
         radius_text.visibility = View.GONE
+        find_hunt_heading.visibility = View.GONE
 
         find_hunt_explanation.text = getString(R.string.searching_drop)
 
         find_hunt_distance.visibility = View.VISIBLE
         find_hunt_bearing.visibility = View.VISIBLE
         cancel_this_drop.visibility = View.VISIBLE
+        needle.visibility = View.VISIBLE
 
         updateSearchUI()
         pd.dismiss()
@@ -203,7 +216,9 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
         find_hunt_distance.visibility = View.GONE
         find_hunt_bearing.visibility = View.GONE
         cancel_this_drop.visibility = View.GONE
+        needle.visibility = View.GONE
 
+        find_hunt_heading.visibility = View.VISIBLE
         find_a_drop_btn.visibility = View.VISIBLE
         radius_seekbar.visibility = View.VISIBLE
         radius_text.visibility = View.VISIBLE
@@ -215,11 +230,12 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
     private fun updateSearchUI() {
         if (::foundDrop.isInitialized && ::currentLocation.isInitialized) {
             distance = Math.round(currentLocation.distanceTo(foundDropLoc))
-            val bearing = currentLocation.bearingTo(foundDropLoc)
+            val bearing = bearing()
 
             find_hunt_distance.text = getString(R.string.f_dm_hunt_distance, distance)
             find_hunt_bearing.text = getString(R.string.f_dm_hunt_bearing, bearing)
 
+            rotateImage(bearing )
             //If the distance is under 10m, show the drop
             if (distance < DISTANCE_TO_DROP) {
                 Log.d(TAG, "updateSearchUI: User found the drop!")
@@ -234,6 +250,22 @@ class FindHuntActivity : AppCompatActivity(), View.OnClickListener, ACallback<Pa
         }
     }
 
+    private fun bearing(): Float {
+        val b = currentLocation.bearingTo(foundDropLoc) % 360
+        return if (b < 0) {
+            b + 360
+        } else {
+            b
+        }
+    }
+
+    private fun rotateImage(angle: Float) {
+        val matrix = Matrix()
+        needle.scaleType =ImageView.ScaleType.MATRIX
+        matrix.postRotate(angle, (needle.drawable.intrinsicWidth / 2).toFloat(), (needle.drawable.intrinsicHeight / 2).toFloat())
+        needle.imageMatrix = matrix
+    }
+
     private fun startLocationUpdates() {
         startedUpdates = true
         val coarse = ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
diff --git a/app/src/main/res/drawable/compass.png b/app/src/main/res/drawable/compass.png
new file mode 100644
index 0000000000000000000000000000000000000000..b190a3977f12c7ce3216bddb13d4e1cb601fbbf3
GIT binary patch
literal 13291
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_find_hunt.xml b/app/src/main/res/layout/activity_find_hunt.xml
index 4bd52e6..aaa0e98 100644
--- a/app/src/main/res/layout/activity_find_hunt.xml
+++ b/app/src/main/res/layout/activity_find_hunt.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+                                              xmlns:tools="http://schemas.android.com/tools"
                                               android:layout_width="match_parent"
-                                              android:orientation="vertical"
-                                              android:layout_height="@dimen/fragment_container">
+                                              android:layout_height="match_parent"
+                                              android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/f_dm_compass"
@@ -13,6 +14,27 @@
             android:textSize="30sp"
             android:layout_marginTop="50dp"/>
 
+    <androidx.appcompat.widget.AppCompatTextView
+            android:text="@string/f_dm_compass_explanation"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:id="@+id/find_hunt_explanation"
+            android:textSize="20sp"
+            android:layout_marginTop="50dp"
+            android:textAlignment="center"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            tools:srcCompat="@drawable/compass"
+            android:layout_gravity="center"
+            android:id="@+id/needle"
+            android:visibility="gone"
+            android:padding="10dp"
+            android:layout_marginTop="50dp"
+            android:background="#77FFFFFF"/>
+
     <androidx.appcompat.widget.AppCompatTextView
             android:text="@string/f_dm_hunt_distance"
             android:layout_width="wrap_content"
@@ -30,69 +52,68 @@
             android:layout_gravity="center"
             android:id="@+id/find_hunt_bearing"
             android:textSize="25sp"
-            android:layout_marginTop="50dp"
+            android:layout_marginTop="25dp"
             android:visibility="gone"/>
 
+
     <androidx.appcompat.widget.AppCompatTextView
-            android:text="@string/f_dm_compass_explanation"
+            android:text="@string/safety_message_short"
             android:layout_width="300dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:id="@+id/find_hunt_explanation"
+            android:id="@+id/find_hunt_saftey"
             android:textSize="20sp"
-            android:layout_marginTop="50dp" android:textAlignment="center"/>
+            android:layout_marginTop="25dp"
+            android:textAlignment="center"/>
 
     <androidx.appcompat.widget.AppCompatTextView
-            android:text="@string/safety_message_short"
-            android:layout_width="300dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:id="@+id/radius_text"
             android:layout_gravity="center"
-            android:id="@+id/find_hunt_saftey"
-            android:textSize="20sp"
             android:layout_marginTop="50dp"
-            android:textAlignment="center"/>
+            android:text="@string/radius_text"
+            android:textSize="20sp"/>
 
-    <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content"
-                                                 android:layout_height="wrap_content"
-                                                 android:id="@+id/radius_text"
-                                                 android:layout_gravity="center"
-                                                 android:layout_marginTop="50dp"
-                                                 android:text="@string/radius_text"
-                                                 android:textSize="20sp"/>
+    <androidx.appcompat.widget.AppCompatSeekBar
+            android:layout_width="350dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="50dp"
+            android:layout_height="wrap_content"
+            android:progressTint="#FF9800"
+            android:max="150"
+            android:progress="1"
+            android:id="@+id/radius_seekbar"/>
 
-    <androidx.appcompat.widget.AppCompatSeekBar android:layout_width="350dp"
-                                                android:layout_gravity="center"
-                                                android:layout_marginTop="50dp"
-                                                android:layout_height="wrap_content"
-                                                android:progressTint="#FF9800"
-                                                android:max="150"
-                                                android:progress="1"
-                                                android:id="@+id/radius_seekbar"/>
+    <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="350dp"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content"
+            android:id="@+id/find_a_drop_btn"
+            android:layout_marginTop="50dp"
+            android:text="@string/find_a_drop_btn"
+            android:background="#2196F3"
+            android:textAllCaps="true"/>
 
-    <androidx.appcompat.widget.AppCompatButton android:layout_width="350dp"
-                                               android:layout_gravity="center"
-                                               android:layout_height="wrap_content"
-                                               android:id="@+id/find_a_drop_btn"
-                                               android:layout_marginTop="50dp"
-                                               android:text="@string/find_a_drop_btn" android:background="#2196F3"
-                                               android:textAllCaps="true"/>
+    <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="350dp"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content"
+            android:id="@+id/show_drop"
+            android:layout_marginTop="10dp"
+            android:text="@string/show_drop"
+            android:background="#4CAF50"
+            android:visibility="gone"/>
 
-    <androidx.appcompat.widget.AppCompatButton android:layout_width="350dp"
-                                               android:layout_gravity="center"
-                                               android:layout_height="wrap_content"
-                                               android:id="@+id/show_drop"
-                                               android:layout_marginTop="50dp"
-                                               android:text="@string/show_drop"
-                                               android:background="#4CAF50"
-                                               android:visibility="gone"/>
+    <androidx.appcompat.widget.AppCompatButton
+            android:layout_width="350dp"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content"
+            android:id="@+id/cancel_this_drop"
+            android:layout_marginTop="40dp"
+            android:text="@string/cancel_this_drop"
+            android:background="#F44336"
+            android:visibility="gone"/>
 
-    <androidx.appcompat.widget.AppCompatButton android:layout_width="350dp"
-                                               android:layout_gravity="center"
-                                               android:layout_height="wrap_content"
-                                               android:id="@+id/cancel_this_drop"
-                                               android:layout_marginTop="50dp"
-                                               android:text="@string/cancel_this_drop"
-                                               android:background="#F44336"
-                                               android:visibility="gone"/>
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file