Release 0.6.1

(unbinding service that was not bound)

.travis.yml

@@ -34,7 +34,7 @@ cache:
 deploy:
   provider: releases
   api_key:
-    secure: B+V5Fz8k9HbpecyMjpJuLr8aVBrdwtDBDkQh4YQ8nu+Da4AiYwEJZseWXhOWs+oms0gNen9bBxsakQQKu7GKYDs8gIXZZtANWsc0gse8xo+cYT7NqEM3jP6mM3ytAv7VNRX3N2cdL7xazELK3/5+mghfORAAdXXYKUFGG5eTKoML8zgdPVN8E9QFqiusLXqoKhxOMCSE4NS+Di7CGlUmnidRTWg6yxhE085zljmYv2owS0NRbr5a4/zW6Z9xZPALGAqsOvIvpZHuOC2s0eMJWMmYGkK/Ws/LAVxfj4U+YkFp9hlZC0zEg/JoS19Gf57QmEu+vsoQ3uOBYBFv9NPI/R9kVH6o0hcOxId3J0u+ewSGWuceGLRpizXuMxKIvLTS5j6GWkxdSieWjwh/OuVB+ciAHNM31B7GP4FWnfz0ZaEVxI/tPenNipZdl9oXdyyBQQ00vPlYp0jT80XhaMh5rDwWMUPaEjRafvymcNyqZ0iVOr0rq1CbdT92STMSmA1U3/rmhtCMD5IGD0b+gQl+VpPKe1QXViYftVxCGL+s4ke4DUZD7HR20fGs8zu61Elnwci1HufbetKFL5TmxoKSLkWFSkzrtBaJnEruZIxhNUMkUL2UPynaOcPNzLoumjHXrUb3m3s0yE4OFelmJ6mJfXswP38sS8kj3wB7R/gC4rw=
+    secure: "XQR4GUrGkPKYVV0xMbJifX/ewKAnenBPlM/pPacQ9irAmYNYa/yEkySz4x1K6MP8cEnuJbxHFakcDqhNRCqD7Cq2NcnCi3qtTEXHK6ApLoVl/92eyiWxu/bYlidOEZb+YPcVNtTR253NiI8GYda+CrhLd4uCmsAgES+XPFJd/t2esMlDOSAp7xalZv/zFhhlB9+SevfPFMc6kkrqeHpKnMs9SK8ltVQmh3nch2KjtDvqgDW6d3nuwn7/HAer6/HY86hmA4Rh6Mo2cV6OloX0bdJ7hvA1GOT4p3+K3lWbTRxzE0o1DXAtT7+D158iKvxHFPuF3h+CTjSlLeiss6kQZL9nFjw/KhAvu+GJOp37PcMoI++mpMiFoWPlzKpp17BVKIDinYbgi8kiU4zG+QHhe2cY85SbfAplXUaysq7uzxEZwEUYHSAHNahshVooXRqvuzkthcH0/nvinfeXrzx2xDvQ3if1NENMRgttwewU0kvU61iKUwpcf/UN2bHK3DaPes0VzSH4PTHAGjoRpksDfqUwb7S8YxbYr+44aMbSPYN8Lbjda0BxPSKWwHM5/pi7FBJN1a1w3t7sV/EiACWUWr8OovmX4ljyCybbR0w9cPzRC1zAYeSUHslLXMTW2Pp9h594RnYh3q3VfeYlFCikFvuvrafwXmTkz35uhLb+2ws="
   file:
     - app/build/outputs/apk/foss/release/app-foss-release.apk
     - app/build/outputs/apk/google/release/app-google-release.apk

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 42
-        versionName "0.6.0"
+        versionCode 43
+        versionName "0.6.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt

@@ -83,7 +83,6 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
             val binder: CarLocationService.LocalBinder = ibinder as CarLocationService.LocalBinder
             locationService = binder.service
-            // TODO: check for location permission
             locationService?.requestLocationUpdates()
         }
 
@@ -133,8 +132,10 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     private fun unbindLocationService() {
-        locationService?.removeLocationUpdates()
-        cas.unbindService(serviceConnection)
+        locationService?.let { service ->
+            service.removeLocationUpdates()
+            cas.unbindService(serviceConnection)
+        }
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
@@ -429,6 +430,19 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 )
                 chargers =
                     response.body()?.chargelocations?.filterIsInstance(ChargeLocation::class.java)
+                chargers?.let {
+                    if (it.size < 6) {
+                        // try again with larger radius
+                        val response = api.getChargepointsRadius(
+                            location.latitude,
+                            location.longitude,
+                            searchRadius * 5,
+                            zoom = 16f
+                        )
+                        chargers =
+                            response.body()?.chargelocations?.filterIsInstance(ChargeLocation::class.java)
+                    }
+                }
             }
 
             // remove outdated availabilities

app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt

@@ -75,6 +75,7 @@ import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.ClusterIconGenerator
 import net.vonforst.evmap.ui.MarkerAnimator
 import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.utils.distanceBetween
 import net.vonforst.evmap.viewmodel.*
 
 
@@ -252,7 +253,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         if (requestingLocationUpdates && ContextCompat.checkSelfPermission(
                 requireContext(),
                 ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED
+            ) == PackageManager.PERMISSION_GRANTED && locationClient.isConnected
         ) {
             requestLocationUpdates()
         }
@@ -690,12 +691,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
         }
         map.setOnCameraMoveStartedListener { reason ->
-            if (reason == AnyMap.OnCameraMoveStartedListener.REASON_GESTURE
-                && vm.myLocationEnabled.value == true
-            ) {
-                // disable location following when manually scrolling the map
-                vm.myLocationEnabled.value = false
-                removeLocationUpdates()
+            if (reason == AnyMap.OnCameraMoveStartedListener.REASON_GESTURE) {
+                if (vm.myLocationEnabled.value == true) {
+                    // disable location following when manually scrolling the map
+                    vm.myLocationEnabled.value = false
+                    removeLocationUpdates()
+                }
+                if (vm.layersMenuOpen.value == true) {
+                    // close layers menu if open
+                    closeLayersMenu()
+                }
             }
         }
         map.setOnMarkerClickListener { marker ->
@@ -1165,9 +1170,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         if (location == null || vm.myLocationEnabled.value == false) return
 
         val latLng = LatLng(location.latitude, location.longitude)
-        vm.location.value = latLng
-        val camUpdate = map.cameraUpdateFactory.newLatLng(latLng)
-        map.animateCamera(camUpdate)
+        val oldLoc = vm.location.value
+        if (latLng != oldLoc && (oldLoc == null || distanceBetween(
+                latLng.latitude,
+                latLng.longitude,
+                oldLoc.latitude,
+                oldLoc.longitude
+            ) > 1)
+        ) {
+            // only update map if location changed by more than 1 meter
+            vm.location.value = latLng
+            val camUpdate = map.cameraUpdateFactory.newLatLng(latLng)
+            map.animateCamera(camUpdate)
+        }
     }
 
     override fun onPause() {

app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt

@@ -50,6 +50,25 @@ fun invisibleUnless(view: View, visible: Boolean) {
     view.visibility = if (visible) View.VISIBLE else View.INVISIBLE
 }
 
+@BindingAdapter("invisibleUnlessAnimated")
+fun invisibleUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
+    if (oldValue == newValue) return
+
+    view.animate().cancel()
+    if (newValue) {
+        view.visibility = View.VISIBLE
+        view.alpha = 0f
+        view.animate().alpha(1f).withEndAction {
+            view.alpha = 1f
+        }
+    } else {
+        view.animate().alpha(0f).withEndAction {
+            view.alpha = 1f
+            view.visibility = View.INVISIBLE
+        }
+    }
+}
+
 @BindingAdapter("isFabActive")
 fun isFabActive(view: FloatingActionButton, isColored: Boolean) {
     val color = view.context.theme.obtainStyledAttributes(

app/src/main/res/layout/detail_view.xml

@@ -74,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="30dp"
                 android:ellipsize="end"
-                android:maxLines="1"
+                android:maxLines="@{expanded ? 3 : 1}"
                 android:text="@{charger.data.name}"
                 android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
                 app:layout_constrainedWidth="true"
@@ -126,8 +126,8 @@
                 android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
                 android:textColor="@android:color/white"
                 app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(availability.data.status.values())}"
-                app:goneUnlessAnimated="@{availability.data != null && !expanded}"
-                app:goneUnless="@{availability.data != null}"
+                app:invisibleUnlessAnimated="@{availability.data != null && !expanded}"
+                app:invisibleUnless="@{availability.data != null}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"
@@ -323,14 +323,30 @@
                 android:layout_marginBottom="2dp"
                 android:contentDescription="@string/verified"
                 android:tooltipText="@string/verified_desc"
-                app:goneUnless="@{ charger.data.verified && charger.data.faultReport == null }"
+                app:goneUnless="@{ charger.data.verified }"
                 app:layout_constraintBottom_toBottomOf="@+id/txtName"
-                app:layout_constraintStart_toEndOf="@+id/txtName"
+                app:layout_constraintStart_toEndOf="@+id/imgFaultReport"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 app:srcCompat="@drawable/ic_verified"
                 app:tint="@color/available"
                 tools:targetApi="o" />
 
+            <ImageView
+                android:id="@+id/imgFaultReport"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginBottom="2dp"
+                android:contentDescription="@string/fault_report"
+                android:tooltipText="@string/fault_report"
+                app:goneUnless="@{ charger.data.faultReport != null }"
+                app:layout_constraintBottom_toBottomOf="@+id/txtName"
+                app:layout_constraintStart_toEndOf="@+id/txtName"
+                app:layout_constraintTop_toTopOf="@+id/txtName"
+                app:srcCompat="@drawable/ic_map_marker_fault"
+                tools:targetApi="o" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>

fastlane/metadata/android/de-DE/changelogs/43.txt

@@ -0,0 +1,5 @@
+Verbesserungen:
+- Kartentypenmenü wird bei Verschieben der Karte automatisch geschlossen
+- Android Auto: Suchradius vergrößert, wenn wenige Ladestationen in der Nähe sind
+- Verifizierungstatus wird unabhängig von Störungsmeldungen angezeigt
+- Abstürze behoben

fastlane/metadata/android/en-US/changelogs/43.txt

@@ -0,0 +1,5 @@
+Improvements:
+- Close map type menu when moving map
+- Android Auto: Increased search radius when few chargers are closeby
+- Verification status will be shown independently of fault reports
+- Fixed crashes