Build 156

  - Fixed maps camera reset not working in maps panel

Author: Hamza417

.idea/misc.xml

@@ -34,7 +34,7 @@ import com.google.android.gms.maps.model.*
 import kotlinx.coroutines.*
 
 class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, attributeSet),
-                                                           SensorEventListener {
+        SensorEventListener {
 
     private val accelerometerReadings = FloatArray(3)
     private val magnetometerReadings = FloatArray(3)
@@ -80,10 +80,10 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
         isNorthOnly = GPSPreferences.isNorthOnly()
 
         polylineOptions = PolylineOptions()
-            .width(10f)
-            .jointType(JointType.ROUND)
-            .color(context.resolveAttrColor(R.attr.colorAppAccent))
-            .geodesic(false)
+                .width(10f)
+                .jointType(JointType.ROUND)
+                .color(context.resolveAttrColor(R.attr.colorAppAccent))
+                .geodesic(false)
 
         if (isCustomCoordinate) {
             customLatitude = MainPreferences.getCoordinates()[0].toDouble()
@@ -182,6 +182,10 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
             if (location.isNotNull()) {
                 moveMapCamera(LatLng(location!!.latitude, location!!.longitude), zoom)
                 addMarker(LatLng(location!!.latitude, location!!.longitude))
+            } else {
+                kotlin.runCatching {
+                    moveMapCamera(googleMap?.cameraPosition?.target!!, zoom)
+                }
             }
     }
 
@@ -340,7 +344,8 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
                     }.onFailure {
                         circle = googleMap?.addCircle(CircleOptions()
                                 .center(latLng)
-                                .radius(if (location!!.speed > 0F) location!!.speed.toDouble() else location?.accuracy?.toDouble() ?: 0.0)
+                                .radius(if (location!!.speed > 0F) location!!.speed.toDouble() else location?.accuracy?.toDouble()
+                                        ?: 0.0)
                                 .clickable(false)
                                 .fillColor(if (location!!.speed > 0F) ContextCompat.getColor(context, R.color.bearing_circle_color) else LocationPins.getCircleFillColor())
                                 .strokeColor(if (location!!.speed > 0F) ContextCompat.getColor(context, R.color.bearing_circle_stroke) else LocationPins.getCircleStrokeColor())
@@ -398,7 +403,7 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
             }
 
             polylineOptions?.add(LatLng(GPSPreferences.getTargetMarkerCoordinates()[0].toDouble(),
-                                        GPSPreferences.getTargetMarkerCoordinates()[1].toDouble()))
+                    GPSPreferences.getTargetMarkerCoordinates()[1].toDouble()))
 
             targetPolyline = googleMap?.addPolyline(polylineOptions!!)
 
@@ -452,23 +457,23 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
         isAnimating = true
         googleMap?.animateCamera(CameraUpdateFactory.newCameraPosition(
                 CameraPosition.builder()
-                    .target(latLng)
-                    .tilt(GPSPreferences.getMapTilt())
-                    .zoom(zoom)
-                    .bearing(bearing ?: 0F)
-                    .build()),
-                                 cameraSpeed,
-                                 object : GoogleMap.CancelableCallback {
-                                     override fun onFinish() {
-                                         viewHandler.postDelayed(sensorRegistrationRunnable, 100L)
-                                         isAnimating = false
-                                     }
-
-                                     override fun onCancel() {
-                                         viewHandler.postDelayed(sensorRegistrationRunnable, 100L)
-                                         isAnimating = false
-                                     }
-                                 })
+                        .target(latLng)
+                        .tilt(GPSPreferences.getMapTilt())
+                        .zoom(zoom)
+                        .bearing(bearing ?: 0F)
+                        .build()),
+                cameraSpeed,
+                object : GoogleMap.CancelableCallback {
+                    override fun onFinish() {
+                        viewHandler.postDelayed(sensorRegistrationRunnable, 100L)
+                        isAnimating = false
+                    }
+
+                    override fun onCancel() {
+                        viewHandler.postDelayed(sensorRegistrationRunnable, 100L)
+                        isAnimating = false
+                    }
+                })
     }
 
     fun setFirstLocation(location: Location?) {
@@ -504,7 +509,7 @@ class Maps(context: Context, attributeSet: AttributeSet) : CustomMaps(context, a
         }
 
         rotationAngle =
-            CompassAzimuth.calculate(gravity = accelerometer, magneticField = magnetometer)
+                CompassAzimuth.calculate(gravity = accelerometer, magneticField = magnetometer)
 
         if (isCompassRotation) {
             if (googleMap.isNotNull())

app/src/main/java/app/simple/positional/decorations/maps/Maps.kt

@@ -14,7 +14,6 @@ import app.simple.positional.preferences.GPSPreferences
 import app.simple.positional.preferences.MainPreferences
 import app.simple.positional.util.ImageLoader
 import app.simple.positional.util.ViewUtils.gone
-import app.simple.positional.util.ViewUtils.isNotVisible
 import app.simple.positional.util.ViewUtils.visible
 
 class MapsTools : DynamicCornerLinearLayout, SharedPreferences.OnSharedPreferenceChangeListener {
@@ -45,7 +44,7 @@ class MapsTools : DynamicCornerLinearLayout, SharedPreferences.OnSharedPreferenc
     }
 
     private fun initViews() {
-        val view = LayoutInflater.from(context).inflate(R.layout.maps_tools, this, true)
+        val view = LayoutInflater.from(context).inflate(R.layout.tools_maps, this, true)
 
         align = view.findViewById(R.id.tools_align_btn)
         location = view.findViewById(R.id.current_location)

app/src/main/java/app/simple/positional/decorations/maps/MapsTools.kt

@@ -10,11 +10,9 @@ import app.simple.positional.R
 import app.simple.positional.decorations.corners.DynamicCornerLinearLayout
 import app.simple.positional.decorations.ripple.DynamicRippleImageButton
 import app.simple.positional.decorations.views.LocationButton
-import app.simple.positional.preferences.MainPreferences
 import app.simple.positional.preferences.TrailPreferences
 import app.simple.positional.singleton.SharedPreferences.getSharedPreferences
 import app.simple.positional.util.ImageLoader
-import app.simple.positional.util.LocationExtension
 import app.simple.positional.util.ViewUtils.gone
 import app.simple.positional.util.ViewUtils.visible
 
@@ -44,7 +42,7 @@ class TrailTools : DynamicCornerLinearLayout, SharedPreferences.OnSharedPreferen
     }
 
     private fun initViews() {
-        val view = LayoutInflater.from(context).inflate(R.layout.trail_tools, this, true)
+        val view = LayoutInflater.from(context).inflate(R.layout.tools_trails, this, true)
 
         location = view.findViewById(R.id.current_location)
         remove = view.findViewById(R.id.remove_flag)