Release 0.1.1

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 6
-        versionName "0.0.6"
+        versionCode 8
+        versionName "0.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -29,6 +29,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
+        debug {
+            applicationIdSuffix ".debug"
+            debuggable true
+        }
     }
 
     def isRunningOnTravis = System.getenv("CI") == "true"
@@ -79,9 +83,10 @@ dependencies {
     implementation 'androidx.core:core:1.3.0-rc01'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha06'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.browser:browser:1.2.0'
     implementation 'com.google.maps.android:android-maps-utils:0.5'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
@@ -95,6 +100,7 @@ dependencies {
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
     implementation 'com.airbnb.android:lottie:3.4.0'
+    implementation 'io.michaelrocks:bimap:1.0.2'
 
     // navigation library
     def nav_version = "2.3.0-alpha06"

app/src/debug/res/values-de/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EV Map (debug)</string>
+</resources>

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EV Map (debug)</string>
+</resources>

app/src/main/java/net/vonforst/evmap/MapsActivity.kt

@@ -5,6 +5,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.ContextCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
@@ -48,33 +50,39 @@ class MapsActivity : AppCompatActivity() {
     }
 
     fun navigateTo(charger: ChargeLocation) {
-        val intent = Intent(Intent.ACTION_VIEW)
-        val coord = charger.coordinates
-
         // google maps navigation
+        val coord = charger.coordinates
+        val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse("google.navigation:q=${coord.lat},${coord.lng}")
-        val pm = packageManager
-        if (intent.resolveActivity(pm) != null && prefs.navigateUseMaps) {
+        if (prefs.navigateUseMaps && intent.resolveActivity(packageManager) != null) {
             startActivity(intent);
         } else {
             // fallback: generic geo intent
-            intent.data = Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
-            if (intent.resolveActivity(pm) != null) {
-                startActivity(intent);
-            } else {
-                val cb = fragmentCallback ?: return
-                Snackbar.make(
-                    cb.getRootView(),
-                    R.string.no_maps_app_found,
-                    Snackbar.LENGTH_SHORT
-                )
-            }
+            showLocation(charger)
+        }
+    }
+
+    fun showLocation(charger: ChargeLocation) {
+        val coord = charger.coordinates
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.data = Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
+        if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+        } else {
+            val cb = fragmentCallback ?: return
+            Snackbar.make(
+                cb.getRootView(),
+                R.string.no_maps_app_found,
+                Snackbar.LENGTH_SHORT
+            )
         }
     }
 
     fun openUrl(url: String) {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-        startActivity(intent)
+        val intent = CustomTabsIntent.Builder()
+            .setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
+            .build()
+        intent.launchUrl(this, Uri.parse(url))
     }
 
     fun shareUrl(url: String) {

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -86,7 +86,8 @@ class DetailAdapter : DataBindingAdapter<DetailAdapter.Detail>() {
         val contentDescription: Int,
         val text: CharSequence,
         val detailText: CharSequence? = null,
-        val links: Boolean = true
+        val links: Boolean = true,
+        val clickable: Boolean = false
     ) : Equatable
 
     override fun getItemViewType(position: Int): Int = R.layout.item_detail
@@ -131,7 +132,8 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
             R.string.coordinates,
             loc.coordinates.formatDMS(),
             loc.coordinates.formatDecimal(),
-            false
+            links = false,
+            clickable = true
         )
     )
 }
@@ -298,4 +300,8 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
         }
         return value
     }
+}
+
+class DonationAdapter() : DataBindingAdapter<DonationItem>() {
+    override fun getItemViewType(position: Int): Int = R.layout.item_donation
 }

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -19,7 +19,7 @@ interface GoingElectricApi {
         @Query("ne_lat") ne_lat: Double, @Query("ne_lng") ne_lng: Double,
         @Query("clustering") clustering: Boolean,
         @Query("zoom") zoom: Float,
-        @Query("cluster_distance") clusterDistance: Int,
+        @Query("cluster_distance") clusterDistance: Int?,
         @Query("freecharging") freecharging: Boolean,
         @Query("freeparking") freeparking: Boolean,
         @Query("min_power") minPower: Int,

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

@@ -29,9 +29,6 @@ class AboutFragment : PreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.about, rootKey)
 
         findPreference<Preference>("version")?.summary = BuildConfig.VERSION_NAME
-
-        //TODO: disable donations until fully implemented
-        findPreference<Preference>("donate")?.isVisible = false
     }
 
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
@@ -44,6 +41,10 @@ class AboutFragment : PreferenceFragmentCompat() {
                 (activity as? MapsActivity)?.openUrl(getString(R.string.privacy_link))
                 true
             }
+            "faq" -> {
+                (activity as? MapsActivity)?.openUrl(getString(R.string.faq_link))
+                true
+            }
             "oss_licenses" -> {
                 LibsBuilder()
                     .withLicenseShown(true)

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

@@ -9,10 +9,14 @@ import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.DonationAdapter
 import net.vonforst.evmap.databinding.FragmentDonateBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel
 
@@ -40,5 +44,21 @@ class DonateFragment : Fragment() {
             navController,
             (requireActivity() as MapsActivity).appBarConfiguration
         )
+
+        binding.productsList.apply {
+            adapter = DonationAdapter().apply {
+                onClickListener = {
+                    vm.startPurchase(it, requireActivity())
+                }
+            }
+            layoutManager = LinearLayoutManager(context)
+        }
+
+        vm.purchaseSuccessful.observe(viewLifecycleOwner, Observer {
+            Snackbar.make(view, R.string.donation_successful, Snackbar.LENGTH_LONG).show()
+        })
+        vm.purchaseFailed.observe(viewLifecycleOwner, Observer {
+            Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
+        })
     }
 }

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

@@ -2,7 +2,6 @@ package net.vonforst.evmap.fragment
 
 import android.os.Bundle
 import android.view.*
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
@@ -18,8 +17,6 @@ import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.FiltersAdapter
 import net.vonforst.evmap.databinding.FragmentFilterBinding
-import net.vonforst.evmap.ui.exitCircularReveal
-import net.vonforst.evmap.ui.startCircularReveal
 import net.vonforst.evmap.viewmodel.FilterViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
@@ -44,12 +41,6 @@ class FilterFragment : Fragment() {
         binding.vm = vm
 
         setHasOptionsMenu(true)
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object :
-            OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                exitAfterTransition()
-            }
-        })
 
         return binding.root
     }
@@ -75,10 +66,8 @@ class FilterFragment : Fragment() {
             )
         }
 
-        view.startCircularReveal()
-
         toolbar.setNavigationOnClickListener {
-            exitAfterTransition()
+            findNavController().popBackStack()
         }
     }
 
@@ -92,17 +81,11 @@ class FilterFragment : Fragment() {
             R.id.menu_apply -> {
                 lifecycleScope.launch {
                     vm.saveFilterValues()
-                    exitAfterTransition()
+                    findNavController().popBackStack()
                 }
                 true
             }
             else -> super.onOptionsItemSelected(item)
         }
     }
-
-    private fun exitAfterTransition() {
-        view?.exitCircularReveal {
-            findNavController().popBackStack()
-        }
-    }
 }

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

@@ -7,12 +7,15 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
+import android.transition.TransitionManager
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.SharedElementCallback
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
@@ -39,10 +42,14 @@ import com.google.android.gms.maps.model.*
 import com.google.android.libraries.places.api.model.Place
 import com.google.android.libraries.places.widget.Autocomplete
 import com.google.android.libraries.places.widget.model.AutocompleteActivityMode
+import com.google.android.material.transition.MaterialArcMotion
+import com.google.android.material.transition.MaterialContainerTransform
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
 import com.mahc.custombottomsheetbehavior.MergedAppBarLayoutBehavior
+import io.michaelrocks.bimap.HashBiMap
+import io.michaelrocks.bimap.MutableBiMap
 import kotlinx.android.synthetic.main.fragment_map.*
 import net.vonforst.evmap.*
 import net.vonforst.evmap.adapter.ConnectorAdapter
@@ -78,8 +85,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
     private lateinit var detailAppBarBehavior: MergedAppBarLayoutBehavior
-    private var markers: Map<Marker, ChargeLocation> = emptyMap()
+    private var markers: MutableBiMap<Marker, ChargeLocation> = HashBiMap()
     private var clusterMarkers: List<Marker> = emptyList()
+    private var searchResultMarker: Marker? = null
 
     private lateinit var clusterIconGenerator: ClusterIconGenerator
     private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -87,11 +95,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private lateinit var favToggle: MenuItem
     private val backPressedCallback = object : OnBackPressedCallback(false) {
         override fun handleOnBackPressed() {
+            val value = vm.layersMenuOpen.value
+            if (value != null && value) {
+                closeLayersMenu()
+                return
+            }
+
             val state = bottomSheetBehavior.state
             if (state != STATE_COLLAPSED && state != STATE_HIDDEN) {
                 bottomSheetBehavior.state = STATE_COLLAPSED
             } else if (state == STATE_COLLAPSED) {
                 vm.chargerSparse.value = null
+            } else if (state == STATE_HIDDEN) {
+                vm.searchResult.value = null
             }
         }
     }
@@ -178,6 +194,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
         }
+        binding.fabLayers.setOnClickListener {
+            openLayersMenu()
+        }
         binding.detailView.goingelectricButton.setOnClickListener {
             val charger = vm.charger.value?.data
             if (charger != null) {
@@ -188,7 +207,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT
         }
         binding.search.setOnClickListener {
-            val fields = listOf(Place.Field.LAT_LNG)
+            val fields = listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)
             val intent: Intent = Autocomplete.IntentBuilder(
                 AutocompleteActivityMode.OVERLAY, fields
             )
@@ -221,6 +240,30 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
+    private fun openLayersMenu() {
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = binding.fabLayers
+            endView = binding.layersSheet
+            pathMotion = MaterialArcMotion()
+            duration = 250
+            scrimColor = Color.TRANSPARENT
+        }
+        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+        vm.layersMenuOpen.value = true
+    }
+
+    private fun closeLayersMenu() {
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = binding.layersSheet
+            endView = binding.fabLayers
+            pathMotion = MaterialArcMotion()
+            duration = 200
+            scrimColor = Color.TRANSPARENT
+        }
+        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+        vm.layersMenuOpen.value = false
+    }
+
     private fun toggleFavorite() {
         val favs = vm.favorites.value ?: return
         val charger = vm.chargerSparse.value ?: return
@@ -240,7 +283,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
             override fun onStateChanged(bottomSheet: View, newState: Int) {
                 vm.bottomSheetState.value = newState
-                backPressedCallback.isEnabled = newState != STATE_HIDDEN
+                updateBackPressedCallback()
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner, Observer {
@@ -251,8 +294,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 binding.fabDirections.show()
                 detailAppBarBehavior.setToolbarTitle(it.name)
                 updateFavoriteToggle()
+                highlightMarker(it)
             } else {
                 bottomSheetBehavior.state = STATE_HIDDEN
+                unhighlightAllMarkers()
             }
         })
         vm.chargepoints.observe(viewLifecycleOwner, Observer {
@@ -262,6 +307,72 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         vm.favorites.observe(viewLifecycleOwner, Observer {
             updateFavoriteToggle()
         })
+        vm.searchResult.observe(viewLifecycleOwner, Observer { place ->
+            val map = this.map ?: return@Observer
+            searchResultMarker?.remove()
+            searchResultMarker = null
+
+            if (place != null) {
+                if (place.viewport != null) {
+                    map.animateCamera(CameraUpdateFactory.newLatLngBounds(place.viewport, 0))
+                } else {
+                    map.animateCamera(CameraUpdateFactory.newLatLngZoom(place.latLng, 12f))
+                }
+
+                searchResultMarker = map.addMarker(MarkerOptions().position(place.latLng!!))
+            }
+
+            updateBackPressedCallback()
+        })
+        vm.layersMenuOpen.observe(viewLifecycleOwner, Observer { open ->
+            binding.fabLayers.visibility = if (open) View.GONE else View.VISIBLE
+            binding.layersSheet.visibility = if (open) View.VISIBLE else View.GONE
+            updateBackPressedCallback()
+        })
+        vm.mapType.observe(viewLifecycleOwner, Observer {
+            map?.mapType = it
+        })
+        vm.mapTrafficEnabled.observe(viewLifecycleOwner, Observer {
+            map?.isTrafficEnabled = it
+        })
+    }
+
+    private fun updateBackPressedCallback() {
+        backPressedCallback.isEnabled =
+            vm.bottomSheetState.value != STATE_HIDDEN || vm.searchResult.value != null
+                    || (vm.layersMenuOpen.value ?: false)
+    }
+
+    private fun unhighlightAllMarkers() {
+        markers.forEach { (m, c) ->
+            m.setIcon(
+                chargerIconGenerator.getBitmapDescriptor(
+                    getMarkerTint(c)
+                )
+            )
+        }
+    }
+
+    private fun highlightMarker(charger: ChargeLocation) {
+        val marker = markers.inverse[charger] ?: return
+        // highlight this marker
+        marker.setIcon(
+            chargerIconGenerator.getBitmapDescriptor(
+                getMarkerTint(charger), highlight = true
+            )
+        )
+        animator.animateMarkerBounce(marker)
+
+        // un-highlight all other markers
+        markers.forEach { (m, c) ->
+            if (m != marker) {
+                m.setIcon(
+                    chargerIconGenerator.getBitmapDescriptor(
+                        getMarkerTint(c)
+                    )
+                )
+            }
+        }
     }
 
     private fun updateFavoriteToggle() {
@@ -321,7 +432,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
 
         binding.detailView.details.apply {
-            adapter = DetailAdapter()
+            adapter = DetailAdapter().apply {
+                onClickListener = {
+                    when (it.icon) {
+                        R.drawable.ic_location -> {
+                            val charger = vm.chargerSparse.value
+                            if (charger != null) {
+                                (activity as? MapsActivity)?.showLocation(charger)
+                            }
+                        }
+                    }
+                }
+            }
             itemAnimator = null
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
@@ -336,7 +458,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onMapReady(map: GoogleMap) {
         this.map = map
-        map.uiSettings.isTiltGesturesEnabled = false;
+        map.uiSettings.isTiltGesturesEnabled = false
+        map.isIndoorEnabled = false
+        map.uiSettings.isIndoorLevelPickerEnabled = false
         map.setOnCameraIdleListener {
             vm.mapPosition.value = MapPosition(
                 map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
@@ -358,7 +482,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         }
         map.setOnMapClickListener {
-            vm.chargerSparse.value = null
+            if (backPressedCallback.isEnabled) {
+                backPressedCallback.handleOnBackPressed()
+            }
         }
 
         // set padding so that compass is not obstructed by toolbar
@@ -457,34 +583,35 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val chargers = chargepoints.filterIsInstance<ChargeLocation>()
 
         val chargepointIds = chargers.map { it.id }.toSet()
-        markers = markers.filter {
+        // remove markers that disappeared
+        markers.entries.toList().forEach {
             if (!chargepointIds.contains(it.value.id)) {
-                val tint = getMarkerTint(it.value)
                 if (it.key.isVisible) {
-                    animator.animateMarkerDisappear(it.key, tint)
+                    val tint = getMarkerTint(it.value)
+                    val highlight = it.value == vm.chargerSparse.value
+                    animator.animateMarkerDisappear(it.key, tint, highlight)
                 } else {
                     it.key.remove()
                 }
-                false
-            } else {
-                true
+                markers.remove(it.key)
             }
         }
-        markers = markers + chargers.filter {
+        // add new markers
+        chargers.filter {
             !markers.containsValue(it)
-        }.map { charger ->
+        }.forEach { charger ->
             val tint = getMarkerTint(charger)
+            val highlight = charger == vm.chargerSparse.value
             val marker = map.addMarker(
                 MarkerOptions()
                     .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
                     .icon(
-                        chargerIconGenerator.getBitmapDescriptor(tint)
+                        chargerIconGenerator.getBitmapDescriptor(tint, highlight = highlight)
                     )
             )
-            animator.animateMarkerAppear(marker, tint)
-
-            marker to charger
-        }.toMap()
+            animator.animateMarkerAppear(marker, tint, highlight)
+            markers[marker] = charger
+        }
         clusterMarkers = clusters.map { cluster ->
             map.addMarker(
                 MarkerOptions()
@@ -524,19 +651,36 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             })
         }
         filterView?.setOnClickListener {
-            onOptionsItemSelected(filterItem)
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.menu_filter -> {
-                requireView().findNavController().navigate(
-                    R.id.action_map_to_filterFragment
-                )
-                true
+            val popup = PopupMenu(requireContext(), it, Gravity.END)
+            popup.menuInflater.inflate(R.menu.popup_filter, popup.menu)
+            popup.setOnMenuItemClickListener {
+                when (it.itemId) {
+                    R.id.menu_edit_filters -> {
+                        requireView().findNavController().navigate(
+                            R.id.action_map_to_filterFragment
+                        )
+                        true
+                    }
+                    R.id.menu_filters_active -> {
+                        vm.filtersActive.value = !vm.filtersActive.value!!
+                        true
+                    }
+                    else -> false
+                }
             }
-            else -> super.onOptionsItemSelected(item)
+
+            val checkItem = popup.menu.findItem(R.id.menu_filters_active)
+            vm.filtersActive.observe(viewLifecycleOwner, Observer {
+                checkItem.isChecked = it
+            })
+            popup.show()
+        }
+
+        filterView?.setOnLongClickListener {
+            requireView().findNavController().navigate(
+                R.id.action_map_to_filterFragment
+            )
+            true
         }
     }
 
@@ -544,9 +688,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         when (requestCode) {
             REQUEST_AUTOCOMPLETE -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    val place = Autocomplete.getPlaceFromIntent(data!!)
-                    val zoom = 12f
-                    map?.animateCamera(CameraUpdateFactory.newLatLngZoom(place.latLng, zoom))
+                    vm.searchResult.value = Autocomplete.getPlaceFromIntent(data!!)
                 }
             }
             else -> super.onActivityResult(requestCode, resultCode, data)

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

@@ -6,6 +6,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.use
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -97,6 +98,17 @@ fun setBackgroundTintAvailability(view: View, available: List<ChargepointStatus>
     view.backgroundTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
 }
 
+@BindingAdapter("selectableItemBackground")
+fun applySelectableItemBackground(view: View, apply: Boolean) {
+    if (apply) {
+        view.context.obtainStyledAttributes(intArrayOf(R.attr.selectableItemBackground)).use {
+            view.background = it.getDrawable(0)
+        }
+    } else {
+        view.background = null
+    }
+}
+
 private fun availabilityColor(
     status: List<ChargepointStatus>?,
     context: Context

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

@@ -42,7 +42,7 @@ class ClusterIconGenerator(context: Context) : IconGenerator(context) {
 
 
 class ChargerIconGenerator(val context: Context) {
-    data class BitmapData(val tint: Int, val scale: Int, val alpha: Int)
+    data class BitmapData(val tint: Int, val scale: Int, val alpha: Int, val highlight: Boolean)
 
     val cacheSize = 4 * 1024 * 1024; // 4MiB
     val cache = object : LruCache<BitmapData, Bitmap>(cacheSize) {
@@ -52,6 +52,7 @@ class ChargerIconGenerator(val context: Context) {
     }
     val oversize = 1f  // increase to add padding for overshoot scale animation
     val icon = R.drawable.ic_map_marker_charging
+    val highlightIcon = R.drawable.ic_map_marker_highlight
 
     init {
         preloadCache()
@@ -66,10 +67,12 @@ class ChargerIconGenerator(val context: Context) {
             R.color.charger_11kw,
             R.color.charger_low
         )
-        for (tint in tints) {
-            for (scale in 0..20) {
-                val data = BitmapData(tint, scale, 255)
-                cache.put(data, generateBitmap(data))
+        for (highlight in listOf(false, true)) {
+            for (tint in tints) {
+                for (scale in 0..20) {
+                    val data = BitmapData(tint, scale, 255, highlight)
+                    cache.put(data, generateBitmap(data))
+                }
             }
         }
     }
@@ -77,9 +80,10 @@ class ChargerIconGenerator(val context: Context) {
     fun getBitmapDescriptor(
         @ColorRes tint: Int,
         scale: Int = 20,
-        alpha: Int = 255
+        alpha: Int = 255,
+        highlight: Boolean = false
     ): BitmapDescriptor? {
-        val data = BitmapData(tint, scale, alpha)
+        val data = BitmapData(tint, scale, alpha, highlight)
         val cachedImg = cache[data]
         return if (cachedImg != null) {
             BitmapDescriptorFactory.fromBitmap(cachedImg)
@@ -120,6 +124,18 @@ class ChargerIconGenerator(val context: Context) {
         )
 
         vd.draw(canvas)
+
+        if (data.highlight) {
+            val highlightDrawable = context.getDrawable(highlightIcon)!!
+            highlightDrawable.setBounds(
+                leftPadding.toInt(), topPadding.toInt(),
+                leftPadding.toInt() + vd.intrinsicWidth,
+                topPadding.toInt() + vd.intrinsicHeight
+            )
+            highlightDrawable.alpha = data.alpha
+            highlightDrawable.draw(canvas)
+        }
+
         return bm
     }
 }

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

@@ -1,12 +1,14 @@
 package net.vonforst.evmap.ui
 
 import android.animation.ValueAnimator
+import android.view.animation.BounceInterpolator
 import androidx.core.animation.addListener
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
 import com.google.android.gms.maps.model.Marker
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
+import kotlin.math.max
 
 fun getMarkerTint(charger: ChargeLocation): Int = when {
     charger.maxPower >= 100 -> R.color.charger_100kw
@@ -21,7 +23,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
 
     fun animateMarkerAppear(
         marker: Marker,
-        tint: Int
+        tint: Int,
+        highlight: Boolean
     ) {
         animatingMarkers[marker]?.cancel()
         animatingMarkers.remove(marker)
@@ -37,7 +40,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                 }
                 val scale = animationState.animatedValue as Int
                 marker.setIcon(
-                    gen.getBitmapDescriptor(tint, scale = scale)
+                    gen.getBitmapDescriptor(tint, scale = scale, highlight = highlight)
                 )
             }
             addListener(onEnd = {
@@ -50,7 +53,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
 
     fun animateMarkerDisappear(
         marker: Marker,
-        tint: Int
+        tint: Int,
+        highlight: Boolean
     ) {
         animatingMarkers[marker]?.cancel()
         animatingMarkers.remove(marker)
@@ -66,7 +70,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                 }
                 val scale = animationState.animatedValue as Int
                 marker.setIcon(
-                    gen.getBitmapDescriptor(tint, scale = scale)
+                    gen.getBitmapDescriptor(tint, scale = scale, highlight = highlight)
                 )
             }
             addListener(onEnd = {
@@ -77,4 +81,25 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         animatingMarkers[marker] = anim
         anim.start()
     }
+
+    fun animateMarkerBounce(marker: Marker) {
+        animatingMarkers[marker]?.cancel()
+        animatingMarkers.remove(marker)
+
+        val anim = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 700
+            interpolator = BounceInterpolator()
+            addUpdateListener { state ->
+                if (!marker.isVisible) {
+                    cancel()
+                    animatingMarkers.remove(marker)
+                    return@addUpdateListener
+                }
+                val t = max(1f - state.animatedValue as Float, 0f) / 2
+                marker.setAnchor(0.5f, 1.0f + t)
+            }
+        }
+        animatingMarkers[marker] = anim
+        anim.start()
+    }
 }

app/src/main/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -1,9 +1,12 @@
 package net.vonforst.evmap.viewmodel
 
+import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import com.android.billingclient.api.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.adapter.Equatable
 
 class DonateViewModel(application: Application) : AndroidViewModel(application),
     PurchasesUpdatedListener {
@@ -12,18 +15,99 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         .enablePendingPurchases()
         .build()
 
-    val products: MutableLiveData<List<SkuDetails>> by lazy {
-        MutableLiveData<List<SkuDetails>>().apply {
-            value = null
+    init {
+        billingClient.startConnection(object : BillingClientStateListener {
+            override fun onBillingServiceDisconnected() {
+            }
 
-            val params = SkuDetailsParams.newBuilder().setType(BillingClient.SkuType.INAPP).build()
-            billingClient.querySkuDetailsAsync(params) { result, details ->
-                value = details
+            override fun onBillingSetupFinished(p0: BillingResult?) {
+                loadProducts()
+
+                // consume pending purchases
+                val purchases = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
+                purchases.purchasesList.forEach {
+                    if (!it.isAcknowledged) {
+                        consumePurchase(it.purchaseToken, false)
+                    }
+                }
+            }
+
+        })
+    }
+
+    private fun loadProducts() {
+        val params = SkuDetailsParams.newBuilder()
+            .setType(BillingClient.SkuType.INAPP)
+            .setSkusList(
+                listOf(
+                    "donate_1_eur", "donate_2_eur", "donate_5_eur", "donate_10_eur"
+                ) +
+                        if (BuildConfig.DEBUG) {
+                            listOf(
+                                "android.test.purchased", "android.test.canceled",
+                                "android.test.item_unavailable"
+                            )
+                        } else {
+                            emptyList()
+                        }
+            )
+            .build()
+        billingClient.querySkuDetailsAsync(params) { result, details ->
+            if (result.responseCode == BillingClient.BillingResponseCode.OK) {
+                products.value = Resource.success(details
+                    .sortedBy { it.priceAmountMicros }
+                    .map { DonationItem(it) }
+                )
+            } else {
+                products.value = Resource.error(result.debugMessage, null)
             }
         }
     }
 
-    override fun onPurchasesUpdated(result: BillingResult, purchases: List<Purchase>?) {
-        TODO("Not yet implemented")
+    val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
+        MutableLiveData<Resource<List<DonationItem>>>().apply {
+            value = Resource.loading(null)
+        }
     }
-}
+
+    val purchaseSuccessful = SingleLiveEvent<Nothing>()
+    val purchaseFailed = SingleLiveEvent<Nothing>()
+
+    override fun onPurchasesUpdated(result: BillingResult, purchases: List<Purchase>?) {
+        if (result.responseCode == BillingClient.BillingResponseCode.OK && purchases != null) {
+            for (purchase in purchases) {
+                val purchaseToken = purchase.purchaseToken
+                consumePurchase(purchaseToken)
+            }
+        } else if (result.responseCode == BillingClient.BillingResponseCode.USER_CANCELED) {
+            // Handle an error caused by a user cancelling the purchase flow.
+        } else {
+            purchaseFailed.call()
+        }
+    }
+
+    private fun consumePurchase(purchaseToken: String, showSuccess: Boolean = true) {
+        val params = ConsumeParams.newBuilder()
+            .setPurchaseToken(purchaseToken)
+            .build()
+        billingClient.consumeAsync(params) { _, _ ->
+            if (showSuccess) purchaseSuccessful.call()
+        }
+    }
+
+    fun startPurchase(it: DonationItem, activity: Activity) {
+        val flowParams = BillingFlowParams.newBuilder()
+            .setSkuDetails(it.sku)
+            .build()
+        val response = billingClient.launchBillingFlow(activity, flowParams)
+        if (response.responseCode != BillingClient.BillingResponseCode.OK) {
+            purchaseFailed.call()
+        }
+    }
+
+    override fun onCleared() {
+        billingClient.endConnection()
+    }
+}
+
+data class DonationItem(val sku: SkuDetails) : Equatable

app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt

@@ -74,17 +74,25 @@ internal fun getFilters(
 
 internal fun filtersWithValue(
     filters: LiveData<List<Filter<FilterValue>>>,
-    filterValues: LiveData<List<FilterValue>>
+    filterValues: LiveData<List<FilterValue>>,
+    active: LiveData<Boolean>? = null
 ): MediatorLiveData<List<FilterWithValue<out FilterValue>>> =
     MediatorLiveData<List<FilterWithValue<out FilterValue>>>().apply {
-        listOf(filters, filterValues).forEach {
+        listOf(filters, filterValues, active).forEach {
+            if (it == null) return@forEach
             addSource(it) {
                 val filters = filters.value ?: return@addSource
-                val values = filterValues.value ?: return@addSource
-                value = filters.map { filter ->
-                    val value =
-                        values.find { it.key == filter.key } ?: filter.defaultValue()
-                    FilterWithValue(filter, filter.valueClass.cast(value))
+                value = if (active != null && !active.value!!) {
+                    filters.map { filter ->
+                        FilterWithValue(filter, filter.defaultValue())
+                    }
+                } else {
+                    val values = filterValues.value ?: return@addSource
+                    filters.map { filter ->
+                        val value =
+                            values.find { it.key == filter.key } ?: filter.defaultValue()
+                        FilterWithValue(filter, filter.valueClass.cast(value))
+                    }
                 }
             }
         }

app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt

@@ -2,7 +2,9 @@ package net.vonforst.evmap.viewmodel
 
 import android.app.Application
 import androidx.lifecycle.*
+import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.libraries.places.api.model.Place
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
@@ -21,6 +23,16 @@ import retrofit2.Response
 
 data class MapPosition(val bounds: LatLngBounds, val zoom: Float)
 
+internal fun getClusterDistance(zoom: Float): Int? {
+    return when (zoom) {
+        in 0.0..7.0 -> 100
+        in 7.0..11.5 -> 75
+        in 11.5..12.5 -> 60
+        in 12.5..13.0 -> 45
+        else -> null
+    }
+}
+
 class MapViewModel(application: Application, geApiKey: String) : AndroidViewModel(application) {
     private var api = GoingElectricApi.create(geApiKey, context = application)
     private var db = AppDatabase.getInstance(application)
@@ -43,7 +55,7 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
     private val filters = getFilters(application, plugs)
 
     private val filtersWithValue: LiveData<List<FilterWithValue<out FilterValue>>> by lazy {
-        filtersWithValue(filters, filterValues)
+        filtersWithValue(filters, filterValues, filtersActive)
     }
 
     val filtersCount: LiveData<Int> by lazy {
@@ -112,11 +124,42 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
     val myLocationEnabled: MutableLiveData<Boolean> by lazy {
         MutableLiveData<Boolean>()
     }
+    val layersMenuOpen: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = false
+        }
+    }
 
     val favorites: LiveData<List<ChargeLocation>> by lazy {
         db.chargeLocationsDao().getAllChargeLocations()
     }
 
+    val searchResult: MutableLiveData<Place> by lazy {
+        MutableLiveData<Place>()
+    }
+
+    val mapType: MutableLiveData<Int> by lazy {
+        MutableLiveData<Int>().apply {
+            value = GoogleMap.MAP_TYPE_NORMAL
+        }
+    }
+
+    val mapTrafficEnabled: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = false
+        }
+    }
+
+    val filtersActive: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = true
+        }
+    }
+
+    fun setMapType(type: Int) {
+        mapType.value = type
+    }
+
     fun insertFavorite(charger: ChargeLocation) {
         viewModelScope.launch {
             db.chargeLocationsDao().insert(charger)
@@ -166,13 +209,14 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
         }
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = minConnectors <= 1
+        val useClustering = minConnectors <= 1 && zoom < 13
+        val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
 
         val response = api.getChargepoints(
             bounds.southwest.latitude, bounds.southwest.longitude,
             bounds.northeast.latitude, bounds.northeast.longitude,
-            clustering = zoom < 13 && useClustering, zoom = zoom,
-            clusterDistance = 70, freecharging = freecharging, minPower = minPower,
+            clustering = useClustering, zoom = zoom,
+            clusterDistance = clusterDistance, freecharging = freecharging, minPower = minPower,
             freeparking = freeparking, plugs = connectors
         )
 

app/src/main/java/net/vonforst/evmap/viewmodel/Utils.kt

@@ -1,7 +1,10 @@
 package net.vonforst.evmap.viewmodel
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
+import androidx.annotation.MainThread
+import androidx.annotation.Nullable
+import androidx.lifecycle.*
+import java.util.concurrent.atomic.AtomicBoolean
+
 
 inline fun <VM : ViewModel> viewModelFactory(crossinline f: () -> VM) =
     object : ViewModelProvider.Factory {
@@ -32,4 +35,31 @@ data class Resource<out T>(val status: Status, val data: T?, val message: String
             return Resource(Status.LOADING, data, null)
         }
     }
+}
+
+class SingleLiveEvent<T> : MutableLiveData<T>() {
+    private val mPending: AtomicBoolean = AtomicBoolean(false)
+
+    @MainThread
+    override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
+        super.observe(owner, Observer {
+            if (mPending.compareAndSet(true, false)) {
+                observer.onChanged(it)
+            }
+        })
+    }
+
+    @MainThread
+    override fun setValue(@Nullable t: T?) {
+        mPending.set(true)
+        super.setValue(t)
+    }
+
+    /**
+     * Used for cases where T is Void, to make calls cleaner.
+     */
+    @MainThread
+    fun call() {
+        value = null
+    }
 }

app/src/main/res/drawable/ic_layers.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16zM12,4.53L17.74,9 12,13.47 6.26,9 12,4.53z" />
+</vector>

app/src/main/res/drawable/ic_map_marker_charging.xml

@@ -6,9 +6,7 @@
     <path
         android:fillColor="#FFFFFF"
         android:pathData="M109.8,0h13.6c33.9,1.9 67.1,18.5 87.7,45.8c13.5,17.2 21,38.6 22.7,60.3v8.1c-0.8,42.1 -27.7,76.6 -51,109.4c-26.2,37 -50.4,77.3 -57.1,122.9c-1.8,7.7 0.4,18.5 -8.9,22c-2.2,-1.7 -4.7,-3.1 -6.2,-5.4c-2.7,-25.5 -9.1,-50.7 -20,-73.9c-12.3,-27.1 -29.5,-51.6 -47,-75.6C33,199 23,184.2 14.7,168.3c-13,-23.8 -17.9,-51.9 -12.5,-78.6c4.4,-21.1 15.4,-40.6 30.6,-55.7C53.3,14 81.1,1.8 109.8,0z" />
-    <!--<path android:fillColor="#802C27" android:pathData="M107.2,74.1c18.9,-4.8 40.4,5.5 47.7,23.7c6.1,14.5 1.9,32.5 -9.9,42.9c-12.6,11.5 -32.4,14 -47.5,6c-13.9,-6.8 -23,-22.6 -21.3,-38.1C77.6,92 91.1,77.7 107.2,74.1z"/>-->
     <path
         android:fillColor="#808080"
         android:pathData="M90.9,57.3v68.2h18.6v55.8l43.4,-74.4h-24.8l24.8,-49.6H90.9z" />
-    <!--<path android:fillColor="#802C27" android:pathData="M159,85.3L159,85.3l-20.8,-20.9l-5.9,5.9l11.8,11.8c-5.3,2 -9,7.1 -9,13.1c0,7.7 6.3,14 14,14c2,0 3.9,-0.4 5.6,-1.2v40.4c0,3.1 -2.5,5.6 -5.6,5.6s-5.6,-2.5 -5.6,-5.6v-25.2c0,-6.2 -5,-11.2 -11.2,-11.2h-5.6V72.8c0,-6.2 -5,-11.2 -11.2,-11.2H81.8c-6.2,0 -11.2,5 -11.2,11.2v89.7h56.1v-42.1h8.4v28c0,7.7 6.3,14 14,14s14,-6.3 14,-14V95.2C163.1,91.3 161.6,87.8 159,85.3M149.1,100.8c-3.1,0 -5.6,-2.5 -5.6,-5.6c0,-3.1 2.5,-5.6 5.6,-5.6s5.6,2.5 5.6,5.6C154.7,98.3 152.2,100.8 149.1,100.8M93.1,145.6v-25.2H81.8l22.4,-42.1v28h11.2L93.1,145.6z"/>-->
 </vector>

app/src/main/res/drawable/ic_map_marker_highlight.xml

@@ -0,0 +1,12 @@
+<vector android:height="44.11976dp"
+    android:viewportHeight="368.4"
+    android:viewportWidth="233.8"
+    android:width="28dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--<path
+        android:fillColor="#FFFFFF"
+        android:pathData="M109.8,0h13.6c33.9,1.9 67.1,18.5 87.7,45.8c13.5,17.2 21,38.6 22.7,60.3v8.1c-0.8,42.1 -27.7,76.6 -51,109.4c-26.2,37 -50.4,77.3 -57.1,122.9c-1.8,7.7 0.4,18.5 -8.9,22c-2.2,-1.7 -4.7,-3.1 -6.2,-5.4c-2.7,-25.5 -9.1,-50.7 -20,-73.9c-12.3,-27.1 -29.5,-51.6 -47,-75.6C33,199 23,184.2 14.7,168.3c-13,-23.8 -17.9,-51.9 -12.5,-78.6c4.4,-21.1 15.4,-40.6 30.6,-55.7C53.3,14 81.1,1.8 109.8,0z" />-->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M90.9,57.3v68.2h18.6v55.8l43.4,-74.4h-24.8l24.8,-49.6H90.9z" />
+</vector>

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

@@ -1,38 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
         <import type="net.vonforst.evmap.viewmodel.DonateViewModel" />
 
+        <import type="net.vonforst.evmap.viewmodel.Status" />
+
         <variable
             name="vm"
             type="DonateViewModel" />
     </data>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/toolbar_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true">
+            android:fitsSystemWindows="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:actionBarSize" />
+                android:layout_height="wrap_content" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
+        <TextView
+            android:id="@+id/textView20"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/donations_info"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_container" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/products_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:data="@{vm.products}" />
-    </LinearLayout>
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            app:data="@{vm.products.data}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView20"
+            tools:listitem="@layout/item_donation" />
+
+        <ProgressBar
+            android:id="@+id/progressBar3"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/products_list"
+            app:goneUnless="@{vm.products.status == Status.LOADING}" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -106,7 +106,7 @@
             app:backgroundTint="?android:colorBackground"
             app:borderWidth="0dp"
             app:isFabActive="@{ vm.myLocationEnabled }"
-            app:layout_behavior=".ui.HideOnScrollFabBehavior" />
+            app:layout_behavior="net.vonforst.evmap.ui.HideOnScrollFabBehavior" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/bottom_sheet"
@@ -120,7 +120,7 @@
             app:behavior_peekHeight="@dimen/peek_height"
             app:bottomsheetbehavior_defaultState="stateHidden"
             app:layout_behavior="@string/BottomSheetBehaviorGoogleMapsLike"
-            tools:bottomsheetbehavior_defaultState="stateAnchorPoint">
+            tools:bottomsheetbehavior_defaultState="stateHidden">
 
             <include
                 android:id="@+id/detail_view"
@@ -148,5 +148,35 @@
             android:layout_height="wrap_content"
             app:layout_behavior="@string/MergedAppBarLayoutBehavior"
             android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_layers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="12dp"
+            android:layout_marginTop="96dp"
+            app:backgroundTint="?android:colorBackground"
+            app:borderWidth="0dp"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/ic_layers" />
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/layers_sheet"
+            android:layout_height="wrap_content"
+            android:layout_width="200dp"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="8dp"
+            android:layout_marginTop="96dp"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <include
+                android:id="@+id/layers"
+                layout="@layout/map_layers"
+                app:vm="@{vm}" />
+        </androidx.cardview.widget.CardView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>

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

@@ -13,7 +13,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:clickable="@{item.clickable}"
+        app:selectableItemBackground="@{item.clickable}">
 
         <TextView
             android:id="@+id/textView9"

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="net.vonforst.evmap.viewmodel.DonationItem" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:padding="16dp">
+
+            <TextView
+                android:id="@+id/textView15"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{item.sku.title}"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/textView21"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Spende" />
+
+            <TextView
+                android:id="@+id/textView21"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{item.sku.price}"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textColor="?android:textColorSecondary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="1,00 €" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</layout>

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

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="net.vonforst.evmap.viewmodel.MapViewModel" />
+
+        <import type="com.google.android.gms.maps.GoogleMap" />
+
+        <variable
+            name="vm"
+            type="MapViewModel" />
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:colorBackground"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+
+        <TextView
+            android:id="@+id/textView22"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/map_type"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <RadioGroup
+            android:id="@+id/radioGroup"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView22">
+
+            <RadioButton
+                android:id="@+id/rbStandard"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_NORMAL)}"
+                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_NORMAL)}"
+                android:text="@string/map_type_normal" />
+
+            <RadioButton
+                android:id="@+id/rbSatellite"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_HYBRID)}"
+                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_HYBRID)}"
+                android:text="@string/map_type_satellite" />
+
+            <RadioButton
+                android:id="@+id/rbTerrain"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="@{vm.mapType.equals(GoogleMap.MAP_TYPE_TERRAIN)}"
+                android:onClick="@{() -> vm.setMapType(GoogleMap.MAP_TYPE_TERRAIN)}"
+                android:text="@string/map_type_terrain" />
+        </RadioGroup>
+
+        <TextView
+            android:id="@+id/textView23"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/map_details"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/radioGroup" />
+
+        <CheckBox
+            android:id="@+id/cbTraffic"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/map_traffic"
+            android:checked="@={vm.mapTrafficEnabled}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView23" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/menu/popup_filter.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_filters_active"
+        android:title="@string/menu_filters_active"
+        android:checkable="true"
+        android:checked="true" />
+    <item
+        android:id="@+id/menu_edit_filters"
+        android:title="@string/menu_edit_filters" />
+</menu>

app/src/main/res/values-de/strings.xml

@@ -64,4 +64,16 @@
     <string name="show_less">weniger…</string>
     <string name="favorites_empty_state">Wenn du Ladestationen als Favorit markierst, tauchen sie hier auf.</string>
     <string name="donate">Spenden</string>
+    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 30% Gebühren ab.</string>
+    <string name="donation_successful">Vielen Dank! ❤️</string>
+    <string name="donation_failed">Etwas ist schiefgelaufen. 😕</string>
+    <string name="map_type_normal">Standard</string>
+    <string name="map_type_satellite">Satellit</string>
+    <string name="map_type_terrain">Gelände</string>
+    <string name="map_type">Kartentyp</string>
+    <string name="map_details">Kartendetails</string>
+    <string name="map_traffic">Verkehr</string>
+    <string name="faq">FAQ</string>
+    <string name="menu_filters_active">Filter aktiv</string>
+    <string name="menu_edit_filters">Filter bearbeiten…</string>
 </resources>

app/src/main/res/values/donottranslate.xml

@@ -3,4 +3,5 @@
     <string name="shared_element_picture">picture</string>
     <string name="github_link">https://github.com/johan12345/EVMap</string>
     <string name="privacy_link">https://evmap.vonforst.net/privacy.html</string>
+    <string name="faq_link">https://evmap.vonforst.net/faq.html</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -63,4 +63,16 @@
     <string name="show_less">less…</string>
     <string name="favorites_empty_state">If you add chargers as favorites, they will show up here.</string>
     <string name="donate">Donate</string>
+    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 30% off every donation.</string>
+    <string name="donation_successful">Thank you! ❤️</string>
+    <string name="donation_failed">Something went wrong. 😕</string>
+    <string name="map_type_normal">Default</string>
+    <string name="map_type_satellite">Satellite</string>
+    <string name="map_type_terrain">Terrain</string>
+    <string name="map_type">Map type</string>
+    <string name="map_details">Map details</string>
+    <string name="map_traffic">Traffic</string>
+    <string name="faq">FAQ</string>
+    <string name="menu_filters_active">Filters active</string>
+    <string name="menu_edit_filters">Edit filters…</string>
 </resources>

app/src/main/res/xml/about.xml

@@ -14,6 +14,10 @@
             android:title="@string/copyright"
             android:summary="@string/copyright_summary" />
 
+        <Preference
+            android:key="faq"
+            android:title="@string/faq" />
+
         <Preference
             android:key="donate"
             android:title="@string/donate" />

app/src/test/java/net/vonforst/evmap/viewmodel/MapViewModelTest.kt

@@ -0,0 +1,24 @@
+package net.vonforst.evmap.viewmodel
+
+import org.junit.Test
+
+class MapViewModelTest {
+    @Test
+    fun testGetClusterDistance() {
+        var zoom = 0.0f
+        var previousDistance: Int? = 999
+        while (zoom < 20.0f) {
+            val distance = getClusterDistance(zoom)
+            if (previousDistance != null) {
+                if (distance != null) {
+                    assert(distance <= previousDistance)
+                }
+            } else {
+                assert(distance == null)
+            }
+
+            previousDistance = distance
+            zoom += 0.1f
+        }
+    }
+}