Release 0.1.7

Add error message when internet is not available
Fix startkey in GE API
2025-12-25 08:07:46 -05:00 · 2020-06-14 19:21:19 +02:00 · 2020-06-14 19:19:27 +02:00 · 2020-06-14 17:48:40 +02:00 · 2020-06-14 12:34:36 +02:00 · 2020-06-14 12:33:05 +02:00
59 changed files with 1995 additions and 230 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "net.vonforst.evmap"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 7
-        versionName "0.0.7"
+        versionCode 15
+        versionName "0.1.7"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -80,17 +80,14 @@ dependencies {
    implementation "androidx.activity:activity-ktx:1.1.0"
    implementation "androidx.fragment:fragment-ktx:1.2.4"
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core:1.3.0-rc01'
+    implementation 'androidx.core:core:1.3.0'
    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-beta01'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.maps.android:android-maps-utils:0.5'
+    implementation 'androidx.browser:browser:1.2.0'
    implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.android.libraries.places:places:2.2.0'
    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
    implementation 'com.squareup.retrofit2:converter-moshi:2.7.2'
    implementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
@@ -101,8 +98,17 @@ dependencies {
    implementation 'com.airbnb.android:lottie:3.4.0'
    implementation 'io.michaelrocks:bimap:1.0.2'

+    // Google Maps v3 Beta
+    implementation name:'maps-sdk-3.0.0-beta', ext:'aar'
+    implementation name:'places-maps-sdk-3.0.0-beta', ext:'aar'
+    implementation 'com.google.maps.android:android-maps-utils-v3:1.3.3'
+    implementation 'com.google.android.gms:play-services-basement:17.3.0'
+    implementation 'com.google.android.gms:play-services-base:17.3.0'
+    implementation 'com.google.android.gms:play-services-gcm:17.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
+
    // navigation library
-    def nav_version = "2.3.0-alpha06"
+    def nav_version = "2.3.0-beta01"
    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

@@ -118,7 +124,7 @@ dependencies {
    implementation "androidx.room:room-ktx:$room_version"

    // billing library
-    def billing_version = "2.2.0"
+    def billing_version = "2.2.1"
    implementation "com.android.billingclient:billing:$billing_version"
    implementation "com.android.billingclient:billing-ktx:$billing_version"

--- a/app/libs/maps-sdk-3.0.0-beta.aar
+++ b/app/libs/maps-sdk-3.0.0-beta.aar
--- a/app/libs/places-maps-sdk-3.0.0-beta.aar
+++ b/app/libs/places-maps-sdk-3.0.0-beta.aar
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -1,19 +1,27 @@
 package net.vonforst.evmap

+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 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
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.utils.LocaleContextWrapper
+

 const val REQUEST_LOCATION_PERMISSION = 1

@@ -28,6 +36,14 @@ class MapsActivity : AppCompatActivity() {
    var fragmentCallback: FragmentCallback? = null
    private lateinit var prefs: PreferenceDataSource

+    override fun attachBaseContext(newBase: Context) {
+        return super.attachBaseContext(
+            LocaleContextWrapper.wrap(
+                newBase, PreferenceDataSource(newBase).language
+            )
+        );
+    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -45,36 +61,44 @@ class MapsActivity : AppCompatActivity() {
        findViewById<NavigationView>(R.id.nav_view).setupWithNavController(navController)

        prefs = PreferenceDataSource(this)
+
+        checkPlayServices()
    }

    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) {
@@ -84,4 +108,19 @@ class MapsActivity : AppCompatActivity() {
        }
        startActivity(intent)
    }
+
+    private fun checkPlayServices(): Boolean {
+        val request = 9000
+        val apiAvailability = GoogleApiAvailability.getInstance()
+        val resultCode = apiAvailability.isGooglePlayServicesAvailable(this)
+        if (resultCode != ConnectionResult.SUCCESS) {
+            if (apiAvailability.isUserResolvableError(resultCode)) {
+                apiAvailability.getErrorDialog(this, resultCode, request).show()
+            } else {
+                Log.d("EVMap", "This device is not supported.")
+            }
+            return false
+        }
+        return true
+    }
 }
--- a/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.Observable
@@ -17,16 +18,22 @@ import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.api.goingelectric.OpeningHoursDays
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceBinding
+import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceLargeBinding
 import net.vonforst.evmap.databinding.ItemFilterSliderBinding
+import net.vonforst.evmap.fragment.MultiSelectDialog
 import net.vonforst.evmap.viewmodel.*
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle

 interface Equatable {
    override fun equals(other: Any?): Boolean;
 }

-abstract class DataBindingAdapter<T : Equatable>() :
-    ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback()) {
+abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
+    ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback(getKey)) {

    var onClickListener: ((T) -> Unit)? = null

@@ -47,14 +54,20 @@ abstract class DataBindingAdapter<T : Equatable>() :
    open fun bind(holder: ViewHolder<T>, item: T) {
        holder.binding.setVariable(BR.item, item)
        holder.binding.executePendingBindings()
-        holder.binding.root.setOnClickListener {
-            val listener = onClickListener ?: return@setOnClickListener
-            listener(item)
+        if (onClickListener != null) {
+            holder.binding.root.setOnClickListener {
+                val listener = onClickListener ?: return@setOnClickListener
+                listener(item)
+            }
        }
    }

-    class DiffCallback<T : Equatable> : DiffUtil.ItemCallback<T>() {
-        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = oldItem === newItem
+    class DiffCallback<T : Equatable>(val getKey: ((T) -> Any)?) : DiffUtil.ItemCallback<T>() {
+        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = if (getKey != null) {
+            (getKey)(oldItem) == (getKey)(newItem)
+        } else {
+            oldItem === newItem
+        }

        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean = oldItem == newItem
    }
@@ -86,10 +99,19 @@ 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,
+        val hoursDays: OpeningHoursDays? = null
    ) : Equatable

-    override fun getItemViewType(position: Int): Int = R.layout.item_detail
+    override fun getItemViewType(position: Int): Int {
+        val item = getItem(position)
+        if (item.hoursDays != null) {
+            return R.layout.item_detail_openinghours
+        } else {
+            return R.layout.item_detail
+        }
+    }
 }

 fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail> {
@@ -112,12 +134,24 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
            R.string.network,
            loc.network
        ) else null,
-        // TODO: separate layout for opening hours with expandable details
-        if (loc.openinghours != null) DetailAdapter.Detail(
+        if (loc.faultReport != null) DetailAdapter.Detail(
+            R.drawable.ic_fault_report,
+            R.string.fault_report,
+            loc.faultReport.created?.let {
+                ctx.getString(R.string.fault_report_date,
+                    loc.faultReport.created
+                        .atZone(ZoneId.systemDefault())
+                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)))
+            } ?: "",
+            loc.faultReport.description ?: "",
+            clickable = true
+        ) else null,
+        if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailAdapter.Detail(
            R.drawable.ic_hours,
            R.string.hours,
            loc.openinghours.getStatusText(ctx),
-            loc.openinghours.description
+            loc.openinghours.description,
+            hoursDays = loc.openinghours.days
        ) else null,
        if (loc.cost != null) DetailAdapter.Detail(
            R.drawable.ic_cost,
@@ -131,7 +165,8 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
            R.string.coordinates,
            loc.coordinates.formatDMS(),
            loc.coordinates.formatDecimal(),
-            false
+            links = false,
+            clickable = true
        )
    )
 }
@@ -156,11 +191,18 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
    val itemids = mutableMapOf<String, Long>()
    var maxId = 0L

-    override fun getItemViewType(position: Int): Int = when (getItem(position).filter) {
-        is BooleanFilter -> R.layout.item_filter_boolean
-        is MultipleChoiceFilter -> R.layout.item_filter_multiple_choice
-        is SliderFilter -> R.layout.item_filter_slider
-    }
+    override fun getItemViewType(position: Int): Int =
+        when (val filter = getItem(position).filter) {
+            is BooleanFilter -> R.layout.item_filter_boolean
+            is MultipleChoiceFilter -> {
+                if (filter.manyChoices) {
+                    R.layout.item_filter_multiple_choice_large
+                } else {
+                    R.layout.item_filter_multiple_choice
+                }
+            }
+            is SliderFilter -> R.layout.item_filter_slider
+        }

    override fun bind(
        holder: ViewHolder<FilterWithValue<FilterValue>>,
@@ -175,10 +217,18 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                )
            }
            is MultipleChoiceFilterValue -> {
-                setupMultipleChoice(
-                    holder.binding as ItemFilterMultipleChoiceBinding,
-                    item.filter as MultipleChoiceFilter, item.value
-                )
+                val filter = item.filter as MultipleChoiceFilter
+                if (filter.manyChoices) {
+                    setupMultipleChoiceMany(
+                        holder.binding as ItemFilterMultipleChoiceLargeBinding,
+                        filter, item.value
+                    )
+                } else {
+                    setupMultipleChoice(
+                        holder.binding as ItemFilterMultipleChoiceBinding,
+                        filter, item.value
+                    )
+                }
            }
        }
    }
@@ -266,6 +316,27 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
        updateButtons()
    }

+    private fun setupMultipleChoiceMany(
+        binding: ItemFilterMultipleChoiceLargeBinding,
+        filter: MultipleChoiceFilter,
+        value: MultipleChoiceFilterValue
+    ) {
+        if (value.all) {
+            value.values = filter.choices.keys.toMutableSet()
+            binding.notifyPropertyChanged(BR.item)
+        }
+
+        binding.btnEdit.setOnClickListener {
+            val dialog = MultiSelectDialog.getInstance(filter.name, filter.choices, value.values)
+            dialog.okListener = { selected ->
+                value.values = selected.toMutableSet()
+                value.all = value.values == filter.choices.keys
+                binding.item = binding.item
+            }
+            dialog.show((binding.root.context as AppCompatActivity).supportFragmentManager, null)
+        }
+    }
+
    private fun setupSlider(
        binding: ItemFilterSliderBinding,
        filter: SliderFilter,
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricAdapters.kt
@@ -2,6 +2,7 @@ package net.vonforst.evmap.api.goingelectric

 import com.squareup.moshi.*
 import java.lang.reflect.Type
+import java.time.Instant
 import java.time.LocalTime


@@ -65,7 +66,8 @@ internal class ChargepointListItemJsonAdapter(val moshi: Moshi) :
 }

 internal class JsonObjectOrFalseAdapter<T> private constructor(
-    private val objectDelegate: JsonAdapter<T>?
+    private val objectDelegate: JsonAdapter<T>,
+    private val clazz: Class<*>
 ) : JsonAdapter<T>() {

    class Factory() : JsonAdapter.Factory {
@@ -80,27 +82,32 @@ internal class JsonObjectOrFalseAdapter<T> private constructor(
            )) {
                false -> null
                true -> JsonObjectOrFalseAdapter(
-                    moshi.adapter(clazz)
+                    moshi.adapter(clazz), clazz
                )
            }
        }
    }

-    override fun fromJson(reader: JsonReader) = when (reader.peek()) {
+    @Suppress("UNCHECKED_CAST")
+    override fun fromJson(reader: JsonReader): T? = when (reader.peek()) {
        JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
            false -> null // Response was false
-            else ->
-                throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
+            else -> {
+                if (this.clazz == FaultReport::class.java) {
+                    FaultReport(null, null) as T
+                } else {
+                    throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
+                }
+            }
        }
-        JsonReader.Token.BEGIN_OBJECT -> objectDelegate?.fromJson(reader)
-        JsonReader.Token.STRING -> objectDelegate?.fromJson(reader)
-        JsonReader.Token.NUMBER -> objectDelegate?.fromJson(reader)
+        JsonReader.Token.BEGIN_OBJECT -> objectDelegate.fromJson(reader)
+        JsonReader.Token.STRING -> objectDelegate.fromJson(reader)
+        JsonReader.Token.NUMBER -> objectDelegate.fromJson(reader)
        else ->
            throw IllegalStateException("Non-object-non-boolean value for @JsonObjectOrFalse field")
    }

-    override fun toJson(writer: JsonWriter, value: T?) =
-        objectDelegate?.toJson(writer, value) ?: Unit
+    override fun toJson(writer: JsonWriter, value: T?) = objectDelegate.toJson(writer, value)
 }

 private fun hasJsonObjectOrFalseAnnotation(annotations: Set<Annotation>?) =
@@ -139,4 +146,14 @@ internal class HoursAdapter {
        }
    }

+}
+
+internal class InstantAdapter {
+    @FromJson
+    fun fromJson(value: Long?): Instant? = value?.let {
+        Instant.ofEpochSecond(it)
+    }
+
+    @ToJson
+    fun toJson(value: Instant?): Long? = value?.epochSecond
 }
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
@@ -3,6 +3,7 @@ package net.vonforst.evmap.api.goingelectric
 import android.content.Context
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
+import net.vonforst.evmap.BuildConfig
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import retrofit2.Call
@@ -19,11 +20,14 @@ 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,
-        @Query("plugs") plugs: String?
+        @Query("plugs") plugs: String?,
+        @Query("chargecards") chargecards: String?,
+        @Query("networks") networks: String?,
+        @Query("startkey") startkey: Int?
    ): Response<ChargepointList>

    @GET("chargepoints/")
@@ -36,7 +40,7 @@ interface GoingElectricApi {
    suspend fun getNetworks(): Response<StringList>

    @GET("chargepoints/chargecardlist/")
-    suspend fun getChargeCards(): Response<StringList>
+    suspend fun getChargeCards(): Response<ChargeCardList>

    companion object {
        private val cacheSize = 10L * 1024 * 1024; // 10MB
@@ -54,7 +58,9 @@ interface GoingElectricApi {
                    original = original.newBuilder().url(url).build()
                    chain.proceed(original)
                }
-                addNetworkInterceptor(StethoInterceptor())
+                if (BuildConfig.DEBUG) {
+                    addNetworkInterceptor(StethoInterceptor())
+                }
                if (context != null) {
                    cache(Cache(context.getCacheDir(), cacheSize))
                }
@@ -64,6 +70,7 @@ interface GoingElectricApi {
                .add(ChargepointListItemJsonAdapterFactory())
                .add(JsonObjectOrFalseAdapter.Factory())
                .add(HoursAdapter())
+                .add(InstantAdapter())
                .build()

            val retrofit = Retrofit.Builder()
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
@@ -12,8 +12,11 @@ import kotlinx.android.parcel.Parcelize
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
 import java.time.DayOfWeek
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 import java.util.*
 import kotlin.math.abs
 import kotlin.math.floor
@@ -21,7 +24,8 @@ import kotlin.math.floor
@JsonClass(generateAdapter = true)
 data class ChargepointList(
    val status: String,
-    val chargelocations: List<ChargepointListItem>
+    val chargelocations: List<ChargepointListItem>,
+    @JsonObjectOrFalse val startkey: Int?
 )

@JsonClass(generateAdapter = true)
@@ -30,6 +34,12 @@ data class StringList(
    val result: List<String>
 )

+@JsonClass(generateAdapter = true)
+data class ChargeCardList(
+    val status: String,
+    val result: List<ChargeCard>
+)
+
 sealed class ChargepointListItem

@JsonClass(generateAdapter = true)
@@ -42,7 +52,7 @@ data class ChargeLocation(
    val chargepoints: List<Chargepoint>,
    @JsonObjectOrFalse val network: String?,
    val url: String,
-    // @Json(name = "fault_report") val faultReport: Boolean, <- Object or false in detail, true or false in overview
+    @Embedded(prefix="fault_report_") @JsonObjectOrFalse @Json(name = "fault_report") val faultReport: FaultReport?,
    val verified: Boolean,
    // only shown in details:
    @JsonObjectOrFalse val operator: String?,
@@ -107,6 +117,10 @@ data class OpeningHours(
    @JsonObjectOrFalse val description: String?,
    @Embedded val days: OpeningHoursDays?
 ) {
+    val isEmpty: Boolean
+        get() = description == "Leider noch keine Informationen zu Öffnungszeiten vorhanden."
+                && days == null && !twentyfourSeven
+
    fun getStatusText(ctx: Context): CharSequence {
        if (twentyfourSeven) {
            return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
@@ -134,8 +148,6 @@ data class OpeningHours(
                    ), 0
                )
            }
-        } else if (description != null) {
-            return description
        } else {
            return ""
        }
@@ -155,9 +167,12 @@ data class OpeningHoursDays(
 ) {
    fun getHoursForDate(date: LocalDate): Hours {
        // TODO: check for holidays
+        return getHoursForDayOfWeek(date.dayOfWeek)
+    }

+    fun getHoursForDayOfWeek(dayOfWeek: DayOfWeek?): Hours {
        @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
-        return when (date.dayOfWeek) {
+        return when (dayOfWeek) {
            DayOfWeek.MONDAY -> monday
            DayOfWeek.TUESDAY -> tuesday
            DayOfWeek.WEDNESDAY -> wednesday
@@ -165,6 +180,7 @@ data class OpeningHoursDays(
            DayOfWeek.FRIDAY -> friday
            DayOfWeek.SATURDAY -> saturday
            DayOfWeek.SUNDAY -> sunday
+            null -> holiday
        }
    }
 }
@@ -172,7 +188,16 @@ data class OpeningHoursDays(
 data class Hours(
    val start: LocalTime?,
    val end: LocalTime?
-)
+) {
+    override fun toString(): String {
+        if (start != null && end != null) {
+            val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+            return "${start.format(fmt)} - ${end.format(fmt)}"
+        } else {
+            return "closed"
+        }
+    }
+}

@JsonClass(generateAdapter = true)
@Parcelize
@@ -242,4 +267,15 @@ data class Chargepoint(val type: String, val power: Double, val count: Int) : Eq
        const val CEE_BLAU = "CEE Blau"
        const val CEE_ROT = "CEE Rot"
    }
-}
+}
+
+@JsonClass(generateAdapter = true)
+data class FaultReport(val created: Instant?, val description: String?)
+
+@Entity
+@JsonClass(generateAdapter = true)
+data class ChargeCard(
+    @Json(name = "card_id") @PrimaryKey val id: Long,
+    val name: String,
+    val url: String
+)
--- a/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/AboutFragment.kt
@@ -41,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)
--- a/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
-import com.google.android.gms.maps.model.LatLng
+import com.google.android.libraries.maps.model.LatLng
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.FavoritesAdapter
--- a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
+++ b/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()
-        }
-    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -7,12 +7,14 @@ 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.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
@@ -29,16 +31,20 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.TransitionInflater
+import androidx.transition.TransitionManager
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
-import com.google.android.gms.maps.CameraUpdateFactory
-import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.OnMapReadyCallback
-import com.google.android.gms.maps.SupportMapFragment
-import com.google.android.gms.maps.model.*
+import com.google.android.libraries.maps.CameraUpdateFactory
+import com.google.android.libraries.maps.GoogleMap
+import com.google.android.libraries.maps.OnMapReadyCallback
+import com.google.android.libraries.maps.SupportMapFragment
+import com.google.android.libraries.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.snackbar.Snackbar
+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
@@ -82,6 +88,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
    private lateinit var detailAppBarBehavior: MergedAppBarLayoutBehavior
    private var markers: MutableBiMap<Marker, ChargeLocation> = HashBiMap()
    private var clusterMarkers: List<Marker> = emptyList()
+    private var searchResultMarker: Marker? = null
+    private var connectionErrorSnackbar: Snackbar? = null

    private lateinit var clusterIconGenerator: ClusterIconGenerator
    private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -89,11 +97,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
            }
        }
    }
@@ -180,17 +196,25 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                }
            }
        }
+        binding.fabLayers.setOnClickListener {
+            openLayersMenu()
+        }
        binding.detailView.goingelectricButton.setOnClickListener {
            val charger = vm.charger.value?.data
            if (charger != null) {
                (activity as? MapsActivity)?.openUrl("https:${charger.url}")
            }
        }
+        binding.detailView.btnChargeprice.setOnClickListener {
+            val charger = vm.charger.value?.data ?: return@setOnClickListener
+            (activity as? MapsActivity)?.openUrl(
+                "https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=going_electric")
+        }
        binding.detailView.topPart.setOnClickListener {
            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
            )
@@ -223,6 +247,32 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        }
    }

+    private fun openLayersMenu() {
+        binding.fabLayers.tag = false
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = binding.fabLayers
+            endView = binding.layersSheet
+            setPathMotion(MaterialArcMotion())
+            duration = 250
+            scrimColor = Color.TRANSPARENT
+        }
+        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+        vm.layersMenuOpen.value = true
+    }
+
+    private fun closeLayersMenu() {
+        binding.fabLayers.tag = true
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = binding.layersSheet
+            endView = binding.fabLayers
+            setPathMotion(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
@@ -242,7 +292,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

            override fun onStateChanged(bottomSheet: View, newState: Int) {
                vm.bottomSheetState.value = newState
-                backPressedCallback.isEnabled = newState != STATE_HIDDEN
+                updateBackPressedCallback()
+
+                if (vm.layersMenuOpen.value!! && newState !in listOf(BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING, BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN, BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED)) {
+                    closeLayersMenu()
+                }
            }
        })
        vm.chargerSparse.observe(viewLifecycleOwner, Observer {
@@ -259,13 +313,72 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                unhighlightAllMarkers()
            }
        })
-        vm.chargepoints.observe(viewLifecycleOwner, Observer {
-            val chargepoints = it.data
-            if (chargepoints != null) updateMap(chargepoints)
+        vm.chargepoints.observe(viewLifecycleOwner, Observer { res ->
+            when (res.status) {
+                Status.ERROR -> {
+                    val view = view ?: return@Observer
+
+                    connectionErrorSnackbar?.dismiss()
+                    connectionErrorSnackbar = Snackbar
+                        .make(view, R.string.connection_error, Snackbar.LENGTH_INDEFINITE)
+                        .setAction(R.string.retry) {
+                            connectionErrorSnackbar?.dismiss()
+                            vm.reloadChargepoints()
+                        }
+                    connectionErrorSnackbar!!.show()
+                }
+                Status.SUCCESS -> {
+                    connectionErrorSnackbar?.dismiss()
+                }
+                Status.LOADING -> {
+                }
+            }
+
+            val chargepoints = res.data
+            if (chargepoints != null) {
+                updateMap(chargepoints)
+            }
        })
        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
+        })
+
+        updateBackPressedCallback()
+    }
+
+    private fun updateBackPressedCallback() {
+        backPressedCallback.isEnabled =
+            vm.bottomSheetState.value != null && vm.bottomSheetState.value != STATE_HIDDEN
+                    || vm.searchResult.value != null
+                    || (vm.layersMenuOpen.value ?: false)
    }

    private fun unhighlightAllMarkers() {
@@ -357,7 +470,21 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        }

        binding.detailView.details.apply {
-            adapter = DetailAdapter()
+            adapter = DetailAdapter().apply {
+                onClickListener = {
+                    val charger = vm.chargerSparse.value
+                    if (charger != null) {
+                        when (it.icon) {
+                            R.drawable.ic_location -> {
+                                (activity as? MapsActivity)?.showLocation(charger)
+                            }
+                            R.drawable.ic_fault_report -> {
+                                (activity as? MapsActivity)?.openUrl("https:${charger.url}")
+                            }
+                        }
+                    }
+                }
+            }
            itemAnimator = null
            layoutManager =
                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
@@ -372,7 +499,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
@@ -394,7 +523,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
@@ -561,19 +692,48 @@ 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 {
+            // enable/disable filters
+            vm.filtersActive.value = !vm.filtersActive.value!!
+            // haptic feedback
+            filterView.performHapticFeedback(
+                HapticFeedbackConstants.LONG_PRESS,
+                HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING
+            )
+            // show snackbar
+            Snackbar.make(
+                requireView(), if (vm.filtersActive.value!!) {
+                    R.string.filters_activated
+                } else {
+                    R.string.filters_deactivated
+                }, Snackbar.LENGTH_SHORT
+            ).show()
+            true
        }
    }

@@ -581,9 +741,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)
--- a/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
@@ -0,0 +1,114 @@
+package net.vonforst.evmap.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.core.widget.doAfterTextChanged
+import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.dialog_multi_select.*
+import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.DataBindingAdapter
+import net.vonforst.evmap.adapter.Equatable
+import java.util.*
+import kotlin.collections.HashMap
+import kotlin.collections.HashSet
+
+class MultiSelectDialog : AppCompatDialogFragment() {
+    companion object {
+        fun getInstance(
+            title: String,
+            data: Map<String, String>,
+            selected: Set<String>
+        ): MultiSelectDialog {
+            val dialog = MultiSelectDialog()
+            dialog.arguments = Bundle().apply {
+                putString("title", title)
+                putSerializable("data", HashMap(data))
+                putSerializable("selected", HashSet(selected))
+            }
+            return dialog
+        }
+    }
+
+    var okListener: ((Set<String>) -> Unit)? = null
+    var cancelListener: (() -> Unit)? = null
+    private lateinit var items: List<MultiSelectItem>
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.dialog_multi_select, container)
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        // dialog with 95% screen height
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            (resources.displayMetrics.heightPixels * 0.95).toInt()
+        )
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val data = requireArguments().getSerializable("data") as HashMap<String, String>
+        val selected = requireArguments().getSerializable("selected") as HashSet<String>
+        val title = requireArguments().getString("title")
+
+        dialogTitle.text = title
+        val adapter = Adapter()
+        list.adapter = adapter
+        list.layoutManager = LinearLayoutManager(view.context)
+
+        items = data.entries.toList().sortedBy { it.key }.map {
+            MultiSelectItem(it.key, it.value, it.key in selected)
+        }
+        adapter.submitList(items)
+
+        etSearch.doAfterTextChanged { text ->
+            adapter.submitList(search(items, text.toString()))
+        }
+
+        btnCancel.setOnClickListener {
+            cancelListener?.let { listener ->
+                listener()
+            }
+            dismiss()
+        }
+        btnOK.setOnClickListener {
+            okListener?.let { listener ->
+                val result = items.filter { it.selected }.map { it.key }.toSet()
+                listener(result)
+            }
+            dismiss()
+        }
+        btnAll.setOnClickListener {
+            items = items.map { MultiSelectItem(it.key, it.name, true) }
+            adapter.submitList(search(items, etSearch.text.toString()))
+        }
+        btnNone.setOnClickListener {
+            items = items.map { MultiSelectItem(it.key, it.name, false) }
+            adapter.submitList(search(items, etSearch.text.toString()))
+        }
+    }
+
+    private fun search(
+        items: List<MultiSelectItem>,
+        text: String
+    ): List<MultiSelectItem> {
+        return items.filter { item ->
+            // search for string within name
+            text.toLowerCase(Locale.getDefault()) in item.name.toLowerCase(Locale.getDefault())
+        }
+    }
+
+    class Adapter() : DataBindingAdapter<MultiSelectItem>({ it.key }) {
+        override fun getItemViewType(position: Int) = R.layout.dialog_multi_select_item
+    }
+}
+
+data class MultiSelectItem(val key: String, val name: String, var selected: Boolean) : Equatable
--- a/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt
@@ -1,5 +1,6 @@
 package net.vonforst.evmap.fragment

+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
@@ -11,7 +12,8 @@ import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R


-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
@@ -33,4 +35,26 @@ class SettingsFragment : PreferenceFragmentCompat() {
        }
    }

+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "language" -> {
+                activity?.let {
+                    it.finish();
+                    it.startActivity(it.intent);
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        preferenceManager.sharedPreferences
+            .unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
+    }
+
 }
--- a/app/src/main/java/net/vonforst/evmap/storage/ChargeCardDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/ChargeCardDao.kt
@@ -0,0 +1,47 @@
+package net.vonforst.evmap.storage
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import net.vonforst.evmap.api.goingelectric.ChargeCard
+import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import java.time.Duration
+import java.time.Instant
+
+@Dao
+interface ChargeCardDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(vararg chargeCards: ChargeCard)
+
+    @Delete
+    suspend fun delete(vararg chargeCards: ChargeCard)
+
+    @Query("SELECT * FROM chargeCard")
+    fun getAllChargeCards(): LiveData<List<ChargeCard>>
+}
+
+class ChargeCardRepository(
+    private val api: GoingElectricApi, private val scope: CoroutineScope,
+    private val dao: ChargeCardDao, private val prefs: PreferenceDataSource
+) {
+    fun getChargeCards(): LiveData<List<ChargeCard>> {
+        scope.launch {
+            updateChargeCards()
+        }
+        return dao.getAllChargeCards()
+    }
+
+    private suspend fun updateChargeCards() {
+        if (Duration.between(prefs.lastChargeCardUpdate, Instant.now()) < Duration.ofDays(1)) return
+
+        val response = api.getChargeCards()
+        if (!response.isSuccessful) return
+
+        for (card in response.body()!!.result) {
+            dao.insert(card)
+        }
+
+        prefs.lastChargeCardUpdate = Instant.now()
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/storage/Database.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/Database.kt
@@ -7,6 +7,7 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
+import net.vonforst.evmap.api.goingelectric.ChargeCard
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.viewmodel.BooleanFilterValue
 import net.vonforst.evmap.viewmodel.MultipleChoiceFilterValue
@@ -18,20 +19,27 @@ import net.vonforst.evmap.viewmodel.SliderFilterValue
        BooleanFilterValue::class,
        MultipleChoiceFilterValue::class,
        SliderFilterValue::class,
-        Plug::class
-    ], version = 5
+        Plug::class,
+        Network::class,
+        ChargeCard::class
+    ], version = 7
 )
@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
    abstract fun chargeLocationsDao(): ChargeLocationsDao
    abstract fun filterValueDao(): FilterValueDao
    abstract fun plugDao(): PlugDao
+    abstract fun networkDao(): NetworkDao
+    abstract fun chargeCardDao(): ChargeCardDao

    companion object {
        private lateinit var context: Context
        private val database: AppDatabase by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
            Room.databaseBuilder(context, AppDatabase::class.java, "evmap.db")
-                .addMigrations(MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5)
+                .addMigrations(
+                    MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6,
+                    MIGRATION_7
+                )
                .build()
        }

@@ -86,5 +94,25 @@ abstract class AppDatabase : RoomDatabase() {
                }
            }
        }
+
+        private val MIGRATION_6 = object : Migration(5, 6) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.beginTransaction()
+                try {
+                    db.execSQL("ALTER TABLE `ChargeLocation` ADD `fault_report_created` INTEGER")
+                    db.execSQL("ALTER TABLE `ChargeLocation` ADD `fault_report_description` TEXT")
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+            }
+        }
+
+        private val MIGRATION_7 = object : Migration(6, 7) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("CREATE TABLE IF NOT EXISTS `Network` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))")
+                db.execSQL("CREATE TABLE IF NOT EXISTS `ChargeCard` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))")
+            }
+        }
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/storage/NetworkDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/NetworkDao.kt
@@ -0,0 +1,49 @@
+package net.vonforst.evmap.storage
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import java.time.Duration
+import java.time.Instant
+
+@Entity
+data class Network(@PrimaryKey val name: String)
+
+@Dao
+interface NetworkDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(vararg networks: Network)
+
+    @Delete
+    suspend fun delete(vararg networks: Network)
+
+    @Query("SELECT * FROM network")
+    fun getAllNetworks(): LiveData<List<Network>>
+}
+
+class NetworkRepository(
+    private val api: GoingElectricApi, private val scope: CoroutineScope,
+    private val dao: NetworkDao, private val prefs: PreferenceDataSource
+) {
+    fun getNetworks(): LiveData<List<Network>> {
+        scope.launch {
+            updateNetworks()
+        }
+        return dao.getAllNetworks()
+    }
+
+    private suspend fun updateNetworks() {
+        if (Duration.between(prefs.lastNetworkUpdate, Instant.now()) < Duration.ofDays(1)) return
+
+        val response = api.getNetworks()
+        if (!response.isSuccessful) return
+
+        for (name in response.body()!!.result) {
+            dao.insert(Network(name))
+        }
+
+        prefs.lastNetworkUpdate = Instant.now()
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -18,4 +18,19 @@ class PreferenceDataSource(context: Context) {
        set(value) {
            sp.edit().putLong("last_plug_update", value.toEpochMilli()).apply()
        }
+
+    var lastNetworkUpdate: Instant
+        get() = Instant.ofEpochMilli(sp.getLong("last_network_update", 0L))
+        set(value) {
+            sp.edit().putLong("last_network_update", value.toEpochMilli()).apply()
+        }
+
+    var lastChargeCardUpdate: Instant
+        get() = Instant.ofEpochMilli(sp.getLong("last_chargecard_update", 0L))
+        set(value) {
+            sp.edit().putLong("last_chargecard_update", value.toEpochMilli()).apply()
+        }
+
+    val language: String
+        get() = sp.getString("language", "default")!!
 }
--- a/app/src/main/java/net/vonforst/evmap/storage/TypeConverters.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/TypeConverters.kt
@@ -5,6 +5,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.api.goingelectric.ChargerPhoto
+import java.time.Instant
 import java.time.LocalTime

 class Converters {
@@ -49,11 +50,23 @@ class Converters {

    @TypeConverter
    fun toLocalTime(value: String?): LocalTime? {
-        return value.let {
+        return value?.let {
            LocalTime.parse(it)
        }
    }

+    @TypeConverter
+    fun fromInstant(value: Instant?): Long? {
+        return value?.toEpochMilli()
+    }
+
+    @TypeConverter
+    fun toInstant(value: Long?): Instant? {
+        return value?.let {
+            Instant.ofEpochMilli(it)
+        }
+    }
+
    @TypeConverter
    fun fromStringSet(value: Set<String>?): String {
        return stringSetAdapter.toJson(value)
--- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
@@ -6,6 +6,8 @@ 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.core.text.HtmlCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -97,6 +99,26 @@ 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
+    }
+}
+
+@BindingAdapter("htmlText")
+fun setHtmlTextValue(textView: TextView, htmlText: String?) {
+    if (htmlText == null) {
+        textView.text = null
+    } else {
+        textView.text = HtmlCompat.fromHtml(htmlText, HtmlCompat.FROM_HTML_MODE_LEGACY)
+    }
+}
+
 private fun availabilityColor(
    status: List<ChargepointStatus>?,
    context: Context
--- a/app/src/main/java/net/vonforst/evmap/ui/Clustering.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/Clustering.kt
@@ -0,0 +1,41 @@
+package net.vonforst.evmap.ui;
+
+import com.google.android.libraries.maps.model.LatLng
+import com.google.maps.android.clustering.ClusterItem
+import com.google.maps.android.clustering.algo.NonHierarchicalDistanceBasedAlgorithm
+import net.vonforst.evmap.api.goingelectric.ChargeLocation
+import net.vonforst.evmap.api.goingelectric.ChargeLocationCluster
+import net.vonforst.evmap.api.goingelectric.ChargepointListItem
+import net.vonforst.evmap.api.goingelectric.Coordinate
+
+
+fun cluster(
+    result: List<ChargepointListItem>,
+    zoom: Float,
+    clusterDistance: Int
+): List<ChargepointListItem> {
+    val clusters = result.filterIsInstance<ChargeLocationCluster>()
+    val locations = result.filterIsInstance<ChargeLocation>()
+
+    val clusterItems = locations.map { ChargepointClusterItem(it) }
+
+    val algo = NonHierarchicalDistanceBasedAlgorithm<ChargepointClusterItem>()
+    algo.maxDistanceBetweenClusteredItems = clusterDistance
+    algo.addItems(clusterItems)
+    return algo.getClusters(zoom).map {
+        if (it.size == 1) {
+            it.items.first().charger
+        } else {
+            ChargeLocationCluster(it.size, Coordinate(it.position.latitude, it.position.longitude))
+        }
+    } + clusters
+}
+
+private class ChargepointClusterItem(val charger: ChargeLocation) : ClusterItem {
+    override fun getSnippet(): String? = null
+
+    override fun getTitle(): String? = charger.name
+
+    override fun getPosition(): LatLng = LatLng(charger.coordinates.lat, charger.coordinates.lng)
+
+}
--- a/app/src/main/java/net/vonforst/evmap/ui/HideOnExpandFabBehavior.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/HideOnExpandFabBehavior.kt
@@ -0,0 +1,112 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.widget.NestedScrollView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
+
+
+class HideOnExpandFabBehavior(context: Context, attrs: AttributeSet) :
+    FloatingActionButton.Behavior(context, attrs) {
+
+    override fun onStartNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        directTargetChild: View,
+        target: View,
+        axes: Int,
+        type: Int
+    ): Boolean {
+        return axes == ViewCompat.SCROLL_AXIS_VERTICAL || super.onStartNestedScroll(
+            coordinatorLayout,
+            child,
+            directTargetChild,
+            target,
+            axes,
+            type
+        )
+    }
+
+    override fun layoutDependsOn(
+        parent: CoordinatorLayout,
+        child: FloatingActionButton,
+        dependency: View
+    ): Boolean {
+        if (dependency is NestedScrollView) {
+            try {
+                val behavior = BottomSheetBehaviorGoogleMapsLike.from<View>(dependency)
+                behavior.addBottomSheetCallback(object :
+                    BottomSheetBehaviorGoogleMapsLike.BottomSheetCallback() {
+                    override fun onSlide(bottomSheet: View, slideOffset: Float) {
+
+                    }
+
+                    override fun onStateChanged(bottomSheet: View, newState: Int) {
+                        onDependentViewChanged(parent, child, dependency)
+                    }
+                })
+                return true
+            } catch (e: IllegalArgumentException) {
+            }
+        }
+        return false
+    }
+
+    override fun onDependentViewChanged(
+        parent: CoordinatorLayout,
+        child: FloatingActionButton,
+        dependency: View
+    ): Boolean {
+        val behavior = BottomSheetBehaviorGoogleMapsLike.from<View>(dependency)
+        when (behavior.state) {
+            BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING -> {
+
+            }
+            BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN -> {
+                if (child.tag as? Boolean != false) child.show()
+            }
+            BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED -> {
+                if (child.tag as? Boolean != false) child.show()
+            }
+            else -> {
+                child.hide()
+            }
+        }
+        return false
+    }
+
+    override fun onNestedScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: FloatingActionButton,
+        target: View,
+        dxConsumed: Int,
+        dyConsumed: Int,
+        dxUnconsumed: Int,
+        dyUnconsumed: Int,
+        type: Int,
+        consumed: IntArray
+    ) {
+        super.onNestedScroll(
+            coordinatorLayout,
+            child,
+            target,
+            dxConsumed,
+            dyConsumed,
+            dxUnconsumed,
+            dyUnconsumed,
+            type,
+            consumed
+        )
+        if (dyConsumed > 0 && child.getVisibility() == View.VISIBLE) {
+            // User scrolled down and the FAB is currently visible -> hide the FAB
+            child.hide();
+        } else if (dyConsumed < 0 && child.getVisibility() != View.VISIBLE) {
+            // User scrolled up and the FAB is currently not visible -> show the FAB
+            child.show();
+        }
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/IconGenerators.kt
@@ -11,8 +11,8 @@ import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.widget.TextViewCompat
-import com.google.android.gms.maps.model.BitmapDescriptor
-import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import com.google.android.libraries.maps.model.BitmapDescriptor
+import com.google.android.libraries.maps.model.BitmapDescriptorFactory
 import com.google.maps.android.ui.IconGenerator
 import com.google.maps.android.ui.SquareTextView
 import net.vonforst.evmap.R
--- a/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt
@@ -5,7 +5,7 @@ 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 com.google.android.libraries.maps.model.Marker
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import kotlin.math.max
--- a/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
+++ b/app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt
@@ -0,0 +1,42 @@
+package net.vonforst.evmap.utils
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.res.Configuration
+import android.os.Build
+import java.util.*
+
+
+class LocaleContextWrapper(base: Context?) : ContextWrapper(base) {
+    companion object {
+        fun wrap(context: Context, language: String): ContextWrapper {
+            val config: Configuration = context.resources.configuration
+            var sysLocale: Locale? = null
+            sysLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                config.locales.get(0)
+            } else {
+                @Suppress("DEPRECATION")
+                config.locale
+            }
+            var ctx = context
+            if (language != "" && language != "default" && sysLocale.language != language) {
+                val locale = Locale(language)
+                Locale.setDefault(locale)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    config.setLocale(locale)
+                } else {
+                    @Suppress("DEPRECATION")
+                    config.locale = locale
+                }
+                ctx = context.createConfigurationContext(config)
+            }
+            return LocaleContextWrapper(ctx)
+        }
+
+        @TargetApi(Build.VERSION_CODES.N)
+        fun setSystemLocale(config: Configuration, locale: Locale?) {
+            config.setLocale(locale)
+        }
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt
@@ -54,7 +54,10 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
            .build()
        billingClient.querySkuDetailsAsync(params) { result, details ->
            if (result.responseCode == BillingClient.BillingResponseCode.OK) {
-                products.value = Resource.success(details.map { DonationItem(it) })
+                products.value = Resource.success(details
+                    .sortedBy { it.priceAmountMicros }
+                    .map { DonationItem(it) }
+                )
            } else {
                products.value = Resource.error(result.debugMessage, null)
            }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt
@@ -2,7 +2,7 @@ package net.vonforst.evmap.viewmodel

 import android.app.Application
 import androidx.lifecycle.*
-import com.google.android.gms.maps.model.LatLng
+import com.google.android.libraries.maps.model.LatLng
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
@@ -10,12 +10,10 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
+import net.vonforst.evmap.api.goingelectric.ChargeCard
 import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.storage.Plug
-import net.vonforst.evmap.storage.PlugRepository
-import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.storage.*
 import kotlin.math.abs
 import kotlin.reflect.KClass
 import kotlin.reflect.full.cast
@@ -28,7 +26,9 @@ internal fun mapPowerInverse(power: Int) = powerSteps

 internal fun getFilters(
    application: Application,
-    plugs: LiveData<List<Plug>>
+    plugs: LiveData<List<Plug>>,
+    networks: LiveData<List<Network>>,
+    chargeCards: LiveData<List<ChargeCard>>
 ): LiveData<List<Filter<FilterValue>>> {
    return MediatorLiveData<List<Filter<FilterValue>>>().apply {
        val plugNames = mapOf(
@@ -42,49 +42,79 @@ internal fun getFilters(
            Chargepoint.CEE_BLAU to application.getString(R.string.plug_cee_blau),
            Chargepoint.CEE_ROT to application.getString(R.string.plug_cee_rot)
        )
-        addSource(plugs) { plugs ->
-            val plugMap = plugs.map { plug ->
-                plug.name to (plugNames[plug.name] ?: plug.name)
-            }.toMap()
-            value = listOf(
-                BooleanFilter(application.getString(R.string.filter_free), "freecharging"),
-                BooleanFilter(application.getString(R.string.filter_free_parking), "freeparking"),
-                SliderFilter(
-                    application.getString(R.string.filter_min_power), "min_power",
-                    powerSteps.size - 1,
-                    mapping = ::mapPower,
-                    inverseMapping = ::mapPowerInverse,
-                    unit = "kW"
-                ),
-                MultipleChoiceFilter(
-                    application.getString(R.string.filter_connectors), "connectors",
-                    plugMap,
-                    commonChoices = setOf(Chargepoint.TYPE_2, Chargepoint.CCS, Chargepoint.CHADEMO)
-                ),
-                SliderFilter(
-                    application.getString(R.string.filter_min_connectors),
-                    "min_connectors",
-                    10
-                )
-            )
+        listOf(plugs, networks, chargeCards).forEach { source ->
+            addSource(source) { _ ->
+                buildFilters(plugs, plugNames, networks, chargeCards, application)
+            }
        }
    }
 }

+private fun MediatorLiveData<List<Filter<FilterValue>>>.buildFilters(
+    plugs: LiveData<List<Plug>>,
+    plugNames: Map<String, String>,
+    networks: LiveData<List<Network>>,
+    chargeCards: LiveData<List<ChargeCard>>,
+    application: Application
+) {
+    val plugMap = plugs.value?.map { plug ->
+        plug.name to (plugNames[plug.name] ?: plug.name)
+    }?.toMap() ?: return
+    val networkMap = networks.value?.map { it.name to it.name }?.toMap() ?: return
+    val chargecardMap = chargeCards.value?.map { it.id.toString() to it.name }?.toMap() ?: return
+    value = listOf(
+        BooleanFilter(application.getString(R.string.filter_free), "freecharging"),
+        BooleanFilter(application.getString(R.string.filter_free_parking), "freeparking"),
+        SliderFilter(
+            application.getString(R.string.filter_min_power), "min_power",
+            powerSteps.size - 1,
+            mapping = ::mapPower,
+            inverseMapping = ::mapPowerInverse,
+            unit = "kW"
+        ),
+        MultipleChoiceFilter(
+            application.getString(R.string.filter_connectors), "connectors",
+            plugMap,
+            commonChoices = setOf(Chargepoint.TYPE_2, Chargepoint.CCS, Chargepoint.CHADEMO)
+        ),
+        SliderFilter(
+            application.getString(R.string.filter_min_connectors),
+            "min_connectors",
+            10
+        ),
+        MultipleChoiceFilter(
+            application.getString(R.string.filter_networks), "networks",
+            networkMap, manyChoices = true
+        ),
+        MultipleChoiceFilter(
+            application.getString(R.string.filter_chargecards), "chargecards",
+            chargecardMap, manyChoices = true
+        )
+    )
+}
+

 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))
+                    }
                }
            }
        }
@@ -99,9 +129,14 @@ class FilterViewModel(application: Application, geApiKey: String) :
    private val plugs: LiveData<List<Plug>> by lazy {
        PlugRepository(api, viewModelScope, db.plugDao(), prefs).getPlugs()
    }
-
+    private val networks: LiveData<List<Network>> by lazy {
+        NetworkRepository(api, viewModelScope, db.networkDao(), prefs).getNetworks()
+    }
+    private val chargeCards: LiveData<List<ChargeCard>> by lazy {
+        ChargeCardRepository(api, viewModelScope, db.chargeCardDao(), prefs).getChargeCards()
+    }
    private val filters: LiveData<List<Filter<FilterValue>>> by lazy {
-        getFilters(application, plugs)
+        getFilters(application, plugs, networks, chargeCards)
    }

    private val filterValues: LiveData<List<FilterValue>> by lazy {
@@ -136,7 +171,8 @@ data class MultipleChoiceFilter(
    override val name: String,
    override val key: String,
    val choices: Map<String, String>,
-    val commonChoices: Set<String>? = null
+    val commonChoices: Set<String>? = null,
+    val manyChoices: Boolean = false
 ) : Filter<MultipleChoiceFilterValue>() {
    override val valueClass: KClass<MultipleChoiceFilterValue> = MultipleChoiceFilterValue::class
    override fun defaultValue() = MultipleChoiceFilterValue(key, mutableSetOf(), true)
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -2,25 +2,34 @@ package net.vonforst.evmap.viewmodel

 import android.app.Application
 import androidx.lifecycle.*
-import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.libraries.maps.GoogleMap
+import com.google.android.libraries.maps.model.LatLngBounds
+import com.google.android.libraries.places.api.model.Place
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
-import net.vonforst.evmap.api.goingelectric.ChargeLocation
-import net.vonforst.evmap.api.goingelectric.ChargepointList
-import net.vonforst.evmap.api.goingelectric.ChargepointListItem
-import net.vonforst.evmap.api.goingelectric.GoingElectricApi
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.storage.Plug
-import net.vonforst.evmap.storage.PlugRepository
-import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.api.goingelectric.*
+import net.vonforst.evmap.storage.*
+import net.vonforst.evmap.ui.cluster
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.io.IOException

 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)
@@ -40,10 +49,16 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
    private val plugs: LiveData<List<Plug>> by lazy {
        PlugRepository(api, viewModelScope, db.plugDao(), prefs).getPlugs()
    }
-    private val filters = getFilters(application, plugs)
+    private val networks: LiveData<List<Network>> by lazy {
+        NetworkRepository(api, viewModelScope, db.networkDao(), prefs).getNetworks()
+    }
+    private val chargeCards: LiveData<List<ChargeCard>> by lazy {
+        ChargeCardRepository(api, viewModelScope, db.chargeCardDao(), prefs).getChargeCards()
+    }
+    private val filters = getFilters(application, plugs, networks, chargeCards)

    private val filtersWithValue: LiveData<List<FilterWithValue<out FilterValue>>> by lazy {
-        filtersWithValue(filters, filterValues)
+        filtersWithValue(filters, filterValues, filtersActive)
    }

    val filtersCount: LiveData<Int> by lazy {
@@ -62,9 +77,7 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
                value = Resource.loading(emptyList())
                listOf(mapPosition, filtersWithValue).forEach {
                    addSource(it) {
-                        val pos = mapPosition.value ?: return@addSource
-                        val filters = filtersWithValue.value ?: return@addSource
-                        loadChargepoints(pos, filters)
+                        reloadChargepoints()
                    }
                }
            }
@@ -112,11 +125,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)
@@ -129,6 +173,12 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
        }
    }

+    fun reloadChargepoints() {
+        val pos = mapPosition.value ?: return
+        val filters = filtersWithValue.value ?: return
+        loadChargepoints(pos, filters)
+    }
+
    private fun loadChargepoints(
        mapPosition: MapPosition,
        filters: List<FilterWithValue<out FilterValue>>
@@ -148,53 +198,110 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
        zoom: Float,
        filters: List<FilterWithValue<out FilterValue>>
    ): Resource<List<ChargepointListItem>> {
-        val freecharging =
-            (filters.find { it.value.key == "freecharging" }!!.value as BooleanFilterValue).value
-        val freeparking =
-            (filters.find { it.value.key == "freeparking" }!!.value as BooleanFilterValue).value
-        val minPower =
-            (filters.find { it.value.key == "min_power" }!!.value as SliderFilterValue).value
-        val minConnectors =
-            (filters.find { it.value.key == "min_connectors" }!!.value as SliderFilterValue).value
+        val freecharging = getBooleanValue(filters, "freecharging")
+        val freeparking = getBooleanValue(filters, "freeparking")
+        val minPower = getSliderValue(filters, "min_power")
+        val minConnectors = getSliderValue(filters, "min_connectors")

-        val connectorsVal =
-            filters.find { it.value.key == "connectors" }!!.value as MultipleChoiceFilterValue
-        val connectors = if (connectorsVal.all) null else connectorsVal.values.joinToString(",")
+        val connectorsVal = getMultipleChoiceValue(filters, "connectors")
        if (connectorsVal.values.isEmpty() && !connectorsVal.all) {
            // no connectors chosen
            return Resource.success(emptyList())
        }
+        val connectors = formatMultipleChoice(connectorsVal)
+
+        val chargeCardsVal = getMultipleChoiceValue(filters, "chargecards")
+        if (chargeCardsVal.values.isEmpty() && !chargeCardsVal.all) {
+            // no chargeCards chosen
+            return Resource.success(emptyList())
+        }
+        val chargeCards = formatMultipleChoice(chargeCardsVal)
+
+        val networksVal = getMultipleChoiceValue(filters, "networks")
+        if (networksVal.values.isEmpty() && !networksVal.all) {
+            // no networks chosen
+            return Resource.success(emptyList())
+        }
+        val networks = formatMultipleChoice(networksVal)

        // do not use clustering if filters need to be applied locally.
-        val useClustering = minConnectors <= 1
+        val useClustering = zoom < 13
+        val geClusteringAvailable = minConnectors <= 1
+        val useGeClustering = useClustering && geClusteringAvailable
+        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 = 40, freecharging = freecharging, minPower = minPower,
-            freeparking = freeparking, plugs = connectors
-        )
-
-        if (!response.isSuccessful || response.body()!!.status != "ok") {
-            return Resource.error(response.message(), chargepoints.value?.data)
-        } else {
-            val data = response.body()!!.chargelocations.filter { it ->
-                // apply filters which GoingElectric does not support natively
-                if (it is ChargeLocation) {
-                    it.chargepoints
-                        .filter { it.power >= minPower }
-                        .filter { if (!connectorsVal.all) it.type in connectorsVal.values else true }
-                        .sumBy { it.count } >= minConnectors
+        var startkey: Int? = null
+        val data = mutableListOf<ChargepointListItem>()
+        do {
+            // load all pages of the response
+            try {
+                val response = api.getChargepoints(
+                    bounds.southwest.latitude,
+                    bounds.southwest.longitude,
+                    bounds.northeast.latitude,
+                    bounds.northeast.longitude,
+                    clustering = useGeClustering,
+                    zoom = zoom,
+                    clusterDistance = clusterDistance,
+                    freecharging = freecharging,
+                    minPower = minPower,
+                    freeparking = freeparking,
+                    plugs = connectors,
+                    chargecards = chargeCards,
+                    networks = networks,
+                    startkey = startkey
+                )
+                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                    return Resource.error(response.message(), chargepoints.value?.data)
                } else {
-                    true
+                    val body = response.body()!!
+                    data.addAll(body.chargelocations)
+                    startkey = body.startkey
                }
+            } catch (e: IOException) {
+                return Resource.error(e.message, chargepoints.value?.data)
            }
+        } while (startkey != null && startkey < 10000)

-            return Resource.success(data)
+        var result = data.filter { it ->
+            // apply filters which GoingElectric does not support natively
+            if (it is ChargeLocation) {
+                it.chargepoints
+                    .filter { it.power >= minPower }
+                    .filter { if (!connectorsVal.all) it.type in connectorsVal.values else true }
+                    .sumBy { it.count } >= minConnectors
+            } else {
+                true
+            }
        }
+        if (!geClusteringAvailable && useClustering) {
+            // apply local clustering if server side clustering is not available
+            Dispatchers.IO.run {
+                result = cluster(result, zoom, clusterDistance!!)
+            }
+        }
+
+        return Resource.success(result)
    }

+    private fun formatMultipleChoice(connectorsVal: MultipleChoiceFilterValue) =
+        if (connectorsVal.all) null else connectorsVal.values.joinToString(",")
+
+    private fun getBooleanValue(
+        filters: List<FilterWithValue<out FilterValue>>,
+        key: String
+    ) = (filters.find { it.value.key == key }!!.value as BooleanFilterValue).value
+
+    private fun getSliderValue(
+        filters: List<FilterWithValue<out FilterValue>>,
+        key: String
+    ) = (filters.find { it.value.key == key }!!.value as SliderFilterValue).value
+
+    private fun getMultipleChoiceValue(
+        filters: List<FilterWithValue<out FilterValue>>,
+        key: String
+    ) = filters.find { it.value.key == key }!!.value as MultipleChoiceFilterValue
+
    private suspend fun loadAvailability(charger: ChargeLocation) {
        availability.value = Resource.loading(null)
        availability.value = getAvailability(charger)
--- a/app/src/main/res/drawable/expand_toggle.xml
+++ b/app/src/main/res/drawable/expand_toggle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?selectableItemBackgroundBorderless"/>
+    <item android:drawable="@drawable/expand_toggle_icon"
+        android:top="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:bottom="4dp"/>
+</layer-list>
--- a/app/src/main/res/drawable/expand_toggle_icon.xml
+++ b/app/src/main/res/drawable/expand_toggle_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="false" android:drawable="@drawable/ic_expand" />
+    <item android:state_checked="true" android:drawable="@drawable/ic_collapse" />
+</selector>
--- a/app/src/main/res/drawable/ic_chargeprice.xml
+++ b/app/src/main/res/drawable/ic_chargeprice.xml
@@ -0,0 +1,4 @@
+<vector android:height="15.811624dp" android:viewportHeight="131.5"
+    android:viewportWidth="199.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M197.544,65.685l-9.2,-4.8l8,-4.2c2.7,-1.4 2.7,-3.8 0,-5.2l-8.6,-4.5l8.6,-4.5c2.7,-1.4 2.7,-3.8 0,-5.2l-68.9,-36.1c-2.7,-1.4 -7.2,-1.4 -9.9,0l-115.5,59.7c-2.7,1.4 -2.7,3.7 0,5.1l8.8,4.5l-8.8,4.6c-2.7,1.4 -2.7,3.7 0,5.1l9.4,4.8l-8.2,4.3c-2.7,1.4 -2.7,3.7 0,5.1l70.4,36.2c2.7,1.4 7.2,1.4 9.9,0l114,-59.6C200.344,69.385 200.344,67.085 197.544,65.685L197.544,65.685zM123.144,18.785L105.844,38.685c-0.9,1 -0.6,2.3 0.6,2.9l13.7,7.1c1.2,0.6 1.2,1.6 0,2.2l-43.1,22.3c-1.2,0.6 -1.4,0.3 -0.6,-0.7l17.3,-19.9c0.9,-1 0.6,-2.3 -0.6,-2.9l-13.7,-7.1c-1.2,-0.6 -1.2,-1.6 0,-2.2l43.1,-22.3C123.744,17.485 123.944,17.785 123.144,18.785L123.144,18.785z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_collapse.xml
+++ b/app/src/main/res/drawable/ic_collapse.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="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
+</vector>
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
--- a/app/src/main/res/drawable/ic_expand.xml
+++ b/app/src/main/res/drawable/ic_expand.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="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
+</vector>
--- a/app/src/main/res/drawable/ic_fault_report.xml
+++ b/app/src/main/res/drawable/ic_fault_report.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="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_layers.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+</vector>
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -184,7 +184,7 @@
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintHorizontal_bias="1.0"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView13"
+                app:layout_constraintTop_toBottomOf="@+id/btnChargeprice"
                tools:itemCount="3"
                tools:listitem="@layout/item_detail" />

@@ -230,6 +230,18 @@
                app:layout_constraintStart_toStartOf="@+id/guideline"
                app:layout_constraintTop_toTopOf="@+id/textView" />

+            <Button
+                android:id="@+id/btnChargeprice"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/go_to_chargeprice"
+                app:icon="@drawable/ic_chargeprice"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/textView13" />
+
        </androidx.constraintlayout.widget.ConstraintLayout>

    </androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/dialog_multi_select.xml
+++ b/app/src/main/res/layout/dialog_multi_select.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/dialogTitle"
+        style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toStartOf="@+id/btnAll"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Select Something" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/btnOK"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tilSearch" />
+
+
+    <Button
+        android:id="@+id/btnAll"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/all"
+        app:layout_constraintBaseline_toBaselineOf="@+id/dialogTitle"
+        app:layout_constraintEnd_toStartOf="@+id/btnNone" />
+
+    <Button
+        android:id="@+id/btnOK"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/ok"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <Button
+        android:id="@+id/btnCancel"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:text="@string/cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnOK" />
+
+    <Button
+        android:id="@+id/btnNone"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:text="@string/none"
+        app:layout_constraintBaseline_toBaselineOf="@+id/btnAll"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilSearch"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:hint="@string/search"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnAll"
+        app:startIconDrawable="@drawable/ic_search">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/etSearch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/dialog_multi_select_item.xml
+++ b/app/src/main/res/layout/dialog_multi_select_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="net.vonforst.evmap.fragment.MultiSelectItem" />
+
+        <variable
+            name="item"
+            type="MultiSelectItem" />
+    </data>
+
+    <CheckBox
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeightSmall"
+        android:layout_marginStart="?attr/dialogPreferredPadding"
+        android:layout_marginEnd="?attr/dialogPreferredPadding"
+        android:paddingStart="20dp"
+        android:ellipsize="marquee"
+        android:text="@{item.name}"
+        android:checked="@={item.selected}"
+        tools:text="Item"
+        tools:ignore="RtlSymmetry" />
+</layout>
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -21,7 +21,7 @@

        <fragment
            android:id="@+id/map"
-            android:name="com.google.android.gms.maps.SupportMapFragment"
+            android:name="com.google.android.libraries.maps.SupportMapFragment"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            tools:context=".MapsActivity" />
@@ -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,39 @@
            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"
+            android:tint="?colorControlNormal"
+            android:elevation="-1dp"
+            app:backgroundTint="?android:colorBackground"
+            app:borderWidth="0dp"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/ic_layers"
+            app:layout_behavior="net.vonforst.evmap.ui.HideOnExpandFabBehavior"/>
+
+        <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:elevation="-1dp"
+            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>
--- a/app/src/main/res/layout/item_detail.xml
+++ b/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"
--- a/app/src/main/res/layout/item_detail_openinghours.xml
+++ b/app/src/main/res/layout/item_detail_openinghours.xml
@@ -0,0 +1,204 @@
+<?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>
+
+        <import type="android.text.util.Linkify" />
+
+        <import type="java.time.DayOfWeek" />
+
+        <import type="android.transition.TransitionManager" />
+
+        <variable
+            name="item"
+            type="net.vonforst.evmap.adapter.DetailAdapter.Detail" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="@{item.clickable}"
+        app:selectableItemBackground="@{item.clickable}">
+
+        <TextView
+            android:id="@+id/textView9"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="14dp"
+            android:maxLines="1"
+            android:text="@{item.text}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/expandToggle"
+            app:layout_constraintStart_toEndOf="@+id/imageView3"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
+            tools:text="Lorem ipsum" />
+
+        <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:contentDescription="@{item.contentDescription}"
+            android:tint="?colorPrimary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@{item.icon}"
+            tools:srcCompat="@drawable/ic_address" />
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="16dp"
+            android:autoLink="@{item.links ? Linkify.WEB_URLS | Linkify.PHONE_NUMBERS : 0}"
+            android:linksClickable="@{item.links}"
+            android:text="@{item.detailText}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:goneUnless="@{item.detailText != null}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/expandToggle"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
+            app:layout_constraintTop_toBottomOf="@+id/textView9"
+            app:layout_constraintVertical_bias="0.0"
+            tools:text="Lorem ipsum" />
+
+        <include
+            android:id="@+id/hours_mon"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:hours="@{item.hoursDays}"
+            app:dayOfWeek="@{DayOfWeek.MONDAY}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+        <include
+            android:id="@+id/hours_tue"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.TUESDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_mon" />
+
+        <include
+            android:id="@+id/hours_wed"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.WEDNESDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_tue" />
+
+        <include
+            android:id="@+id/hours_thu"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.THURSDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_wed" />
+
+        <include
+            android:id="@+id/hours_fri"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.FRIDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_thu" />
+
+        <include
+            android:id="@+id/hours_sat"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.SATURDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_fri" />
+
+        <include
+            android:id="@+id/hours_sun"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{DayOfWeek.SUNDAY}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_sat" />
+
+        <include
+            android:id="@+id/hours_holiday"
+            layout="@layout/item_detail_openinghours_item"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            app:goneUnless="@{expandToggle.checked}"
+            app:dayOfWeek="@{null}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintTop_toBottomOf="@id/hours_sun" />
+
+        <ToggleButton
+            android:id="@+id/expandToggle"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/expand_toggle"
+            android:textOff=""
+            android:textOn=""
+            android:onClick="@{() -> TransitionManager.beginDelayedTransition(container)}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
--- a/app/src/main/res/layout/item_detail_openinghours_item.xml
+++ b/app/src/main/res/layout/item_detail_openinghours_item.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="java.time.format.TextStyle" />
+
+        <import type="java.util.Locale" />
+
+        <variable
+            name="hours"
+            type="net.vonforst.evmap.api.goingelectric.OpeningHoursDays" />
+
+        <variable
+            name="dayOfWeek"
+            type="java.time.DayOfWeek" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/textView24"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{dayOfWeek != null ? dayOfWeek.getDisplayName(TextStyle.FULL, context.resources.configuration.locale) : @string/holiday}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Montag" />
+
+        <TextView
+            android:id="@+id/textView25"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="100dp"
+            android:text="@{hours.getHoursForDayOfWeek(dayOfWeek).toString().equals(&quot;closed&quot;) ? @string/closed_unfmt : hours.getHoursForDayOfWeek(dayOfWeek).toString()}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="07:00-21:00" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
--- a/app/src/main/res/layout/item_favorite.xml
+++ b/app/src/main/res/layout/item_favorite.xml
@@ -34,10 +34,12 @@
            android:id="@+id/textView2"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
            android:ellipsize="end"
            android:maxLines="1"
            android:text="@{item.charger.address.toString()}"
            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintEnd_toStartOf="@+id/textView7"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/textView15"
            tools:text="Beispielstraße 10, 12345 Berlin" />
@@ -46,10 +48,12 @@
            android:id="@+id/textView3"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
            android:ellipsize="end"
            android:maxLines="1"
            android:text="@{item.charger.formatChargepoints()}"
            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+            app:layout_constraintEnd_toStartOf="@+id/textView7"
            app:layout_constraintStart_toStartOf="@+id/textView2"
            app:layout_constraintTop_toBottomOf="@+id/textView2"
            tools:text="2x Typ 2 22 kW" />
--- a/app/src/main/res/layout/item_filter_multiple_choice_large.xml
+++ b/app/src/main/res/layout/item_filter_multiple_choice_large.xml
@@ -0,0 +1,70 @@
+<?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>
+
+        <import type="net.vonforst.evmap.viewmodel.MultipleChoiceFilter" />
+
+        <import type="net.vonforst.evmap.viewmodel.MultipleChoiceFilterValue" />
+
+        <import type="net.vonforst.evmap.viewmodel.FilterWithValue" />
+
+        <variable
+            name="item"
+            type="FilterWithValue&lt;MultipleChoiceFilterValue&gt;" />
+
+        <variable
+            name="showingAll"
+            type="boolean" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/textView17"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{item.filter.name}"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            app:layout_constraintEnd_toStartOf="@+id/btnEdit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Networks" />
+
+        <ImageButton
+            android:id="@+id/btnEdit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_edit"
+            android:contentDescription="@string/edit" />
+
+        <TextView
+            android:id="@+id/textView26"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="8dp"
+            android:text="@{item.value.all ? @string/all_selected : @string/number_selected(item.value.values.size())}"
+            app:layout_constraintEnd_toStartOf="@+id/btnEdit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView17"
+            tools:text="4 selected" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
--- a/app/src/main/res/layout/map_layers.xml
+++ b/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.libraries.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>
--- a/app/src/main/res/menu/popup_filter.xml
+++ b/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>
--- a/app/src/main/res/values-de/arrays.xml
+++ b/app/src/main/res/values-de/arrays.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_language_names">
+        <item>Gerätesprache verwenden</item>
+        <item>Englisch</item>
+        <item>Deutsch</item>
+    </string-array>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,6 +10,8 @@
    <string name="hours">Öffnungszeiten</string>
    <string name="open_247"><![CDATA[<b>24 Stunden geöffnet</b>]]></string>
    <string name="closed"><![CDATA[<b>Geschlossen</b>]]></string>
+    <string name="closed_unfmt">Geschlossen</string>
+    <string name="holiday">Feiertag</string>
    <string name="open_closesat"><![CDATA[<b>Geöffnet</b> · Schließt um %s]]></string>
    <string name="closed_opensat"><![CDATA[<b>Geschlossen</b> · Öffnet um %s]]></string>
    <string name="cost">Kosten</string>
@@ -64,7 +66,32 @@
    <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">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="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="filters_activated">Filter aktiviert</string>
+    <string name="filters_deactivated">Filter deaktiviert</string>
+    <string name="menu_edit_filters">Filter bearbeiten…</string>
+    <string name="go_to_chargeprice">Preisvergleich</string>
+    <string name="fault_report">Störungsmeldung</string>
+    <string name="fault_report_date">Störungsmeldung (Letztes Update: %s)</string>
+    <string name="filter_networks">Verbünde</string>
+    <string name="filter_chargecards">Ladetarife</string>
+    <string name="all_selected">Alle ausgewählt</string>
+    <string name="number_selected">%d ausgewählt</string>
+    <string name="edit">bearbeiten</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">Sprache</string>
+    <string name="pref_language_summary">App-Sprache ändern</string>
+    <string name="connection_error">Ladesäulen konnten nicht geladen werden</string>
+    <string name="retry">Wiederholen</string>
 </resources>
--- a/app/src/main/res/values-notnight/styles.xml
+++ b/app/src/main/res/values-notnight/styles.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme" parent="AppTheme.Base">
-        <item name="android:navigationBarColor">@android:color/white</item>
-    </style>
-</resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_language_names">
+        <item>Device default</item>
+        <item>English</item>
+        <item>German</item>
+    </string-array>
+    <string-array name="pref_language_values" tranlatable="false">
+        <item>default</item>
+        <item>en</item>
+        <item>de</item>
+    </string-array>
+</resources>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/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>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,8 @@
    <string name="closed"><![CDATA[<b>Closed</b>]]></string>
    <string name="open_closesat"><![CDATA[<b>Open</b> · Closes at %s]]></string>
    <string name="closed_opensat"><![CDATA[<b>Closed</b> · Opens at %s]]></string>
+    <string name="closed_unfmt">Closed</string>
+    <string name="holiday">Holiday</string>
    <string name="cost">Cost</string>
    <string name="cost_detail"><![CDATA[<b>Charging:</b> %s · <b>Parking:</b> %s]]></string>
    <string name="free">Free</string>
@@ -63,7 +65,32 @@
    <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">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="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="filters_activated">Filters activated</string>
+    <string name="filters_deactivated">Filters deactivated</string>
+    <string name="menu_edit_filters">Edit filters…</string>
+    <string name="go_to_chargeprice">Compare prices</string>
+    <string name="fault_report">Fault report</string>
+    <string name="fault_report_date">Fault report (last update: %s)</string>
+    <string name="filter_networks">Networks</string>
+    <string name="filter_chargecards">Payment methods</string>
+    <string name="all_selected">All selected</string>
+    <string name="number_selected">%d selected</string>
+    <string name="edit">edit</string>
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">Language</string>
+    <string name="pref_language_summary">Change the app language</string>
+    <string name="connection_error">Could not load charging stations</string>
+    <string name="retry">Retry</string>
 </resources>
--- a/app/src/main/res/xml/about.xml
+++ b/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" />
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -10,6 +10,13 @@
            android:summaryOff="@string/pref_navigate_use_maps_off"
            android:defaultValue="true" />

+        <ListPreference
+            android:key="language"
+            android:title="@string/pref_language"
+            android:entries="@array/pref_language_names"
+            android:entryValues="@array/pref_language_values"
+            android:defaultValue="default"
+            android:summary="@string/pref_language_summary" />

    </PreferenceCategory>
 </PreferenceScreen>
--- a/app/src/test/java/net/vonforst/evmap/viewmodel/MapViewModelTest.kt
+++ b/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
+        }
+    }
+}
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    ext.kotlin_version = '1.3.71'
+    ext.kotlin_version = '1.3.72'
    ext.about_libs_version = '8.1.1'
    repositories {
        google()
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-rc01'
+        classpath 'com.android.tools.build:gradle:4.0.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"

@@ -25,6 +25,9 @@ allprojects {
        google()
        jcenter()
        maven { url 'https://jitpack.io' }
+        flatDir {
+            dirs 'libs'
+        }
    }
 }
Author	SHA1	Message	Date
Johan von Forstner	75b2240247	Release 0.1.7	2020-06-14 19:21:19 +02:00
Johan von Forstner	d8f011b64b	Add error message when internet is not available	2020-06-14 19:19:27 +02:00
Johan von Forstner	a1760a35ff	Fix startkey in GE API	2020-06-14 17:48:40 +02:00
Johan von Forstner	e5e5f8ef3c	Release 0.1.6	2020-06-14 12:34:36 +02:00
Johan von Forstner	b5a4fe2dc8	Improve filter by number of chargers - load more pages of GE results - If server-side clustering is not available, apply local Clustering	2020-06-14 12:33:05 +02:00
Johan von Forstner	676e703a52	upgrade to Google Maps SDK v3 Beta (seems to fix #25 )	2020-06-14 11:55:44 +02:00
Johan von Forstner	b9997cbb5a	fix exiting with back button	2020-06-13 23:06:45 +02:00
Johan von Forstner	2558052f4f	fix charge card filter	2020-06-13 22:58:53 +02:00
Johan von Forstner	980c8cc0af	enable Stetho only in debug builds	2020-06-13 22:58:41 +02:00
Johan von Forstner	ffb6740da8	Add language chooser (fixes #24 )	2020-06-13 19:52:39 +02:00
Johan von Forstner	2e9112f5c2	Release 0.1.5	2020-06-13 16:44:06 +02:00
Johan von Forstner	3c709fa3c5	add visual and haptic feedback when enabling/disabling filters	2020-06-13 16:19:50 +02:00
Johan von Forstner	11c868af66	remove TODO	2020-06-13 16:08:57 +02:00
Johan von Forstner	e3ea72bac6	implement new selection interface for network and chargecard filters	2020-06-13 16:03:52 +02:00
Johan von Forstner	d01371f6e9	add filters by network and charge card	2020-06-13 15:48:02 +02:00
Johan von Forstner	6130b190e1	disable/enable filters with long click on filter view	2020-06-13 08:04:06 +02:00
johan12345	128d156306	Release 0.1.4	2020-06-01 22:16:30 +02:00
johan12345	f855874d56	fix changed transition API	2020-06-01 22:08:56 +02:00
johan12345	92ebf6c1e5	update some libraries	2020-06-01 21:47:23 +02:00
Johan von Forstner	1e98be0f8f	implement full display for opening hours (fixes #23 )	2020-06-01 21:34:57 +02:00
Johan von Forstner	c0bec92d4c	update Gradle plugin and Kotlin version	2020-06-01 16:35:25 +02:00
Johan von Forstner	71ecd492e9	show error dialog when Google Play Services are not available	2020-05-30 16:25:13 +02:00
Johan von Forstner	fcac8f91ad	do not use white nav bar before Android API 27 (otherwise nav buttons are not visible)	2020-05-30 16:07:13 +02:00
johan12345	795c96d901	Release 0.1.3	2020-05-28 09:03:02 +02:00
johan12345	cc76310b2b	fix string	2020-05-28 09:02:13 +02:00
johan12345	2a6ac0ac1b	Release 0.1.2	2020-05-27 21:08:10 +02:00
johan12345	8673efd1cd	favorites view: limit length of text fields	2020-05-27 21:05:37 +02:00
johan12345	ae40b8c634	show fault reports (fixes #2 )	2020-05-27 21:03:46 +02:00
johan12345	0cdb12711d	do not show opening hours if they are not available	2020-05-27 20:14:49 +02:00
johan12345	69ccc55ad4	move Chargeprice.app button below connectors (#12 )	2020-05-27 20:10:37 +02:00
johan12345	304f46e189	fix hiding and showing of layers FAB and menu when detail view is openend	2020-05-26 23:33:01 +02:00
johan12345	01f06621f4	add link to chargeprice.app to compare prices (#12 )	2020-05-26 23:09:48 +02:00
Johan von Forstner	f986a68db8	update version code	2020-05-24 16:54:12 +02:00
Johan von Forstner	441e78d807	Release 0.1.1	2020-05-24 16:52:16 +02:00
Johan von Forstner	6481d651a0	add way to quickly enable and disable filters (first step towards #16 )	2020-05-24 16:51:18 +02:00
Johan von Forstner	9a7db8997a	Add link from coordinates to maps app (fixes #17 )	2020-05-24 16:10:33 +02:00
Johan von Forstner	d94053261c	remove debugging println call	2020-05-24 15:38:21 +02:00
Johan von Forstner	39dc50724e	add FAQ page with legend for marker colors (fixes #21 )	2020-05-24 11:54:50 +02:00
Johan von Forstner	34fe126fd0	add option to show Google Maps traffic layer (fixes #19 )	2020-05-24 11:26:13 +02:00
Johan von Forstner	1f81a11ad1	add map type chooser	2020-05-24 09:53:56 +02:00
Johan von Forstner	74b74dcd07	add marker for selected search result (fixes #18 )	2020-05-24 08:16:04 +02:00
Johan von Forstner	ec623c9396	make clustering more dynamic (fixes #14 )	2020-05-23 19:51:44 +02:00
Johan von Forstner	c10c59e3b1	fix lint error	2020-05-22 09:04:23 +02:00
Johan von Forstner	2bd5f746ed	Release 0.1.0	2020-05-21 16:46:36 +02:00
Johan von Forstner	fbc15f2925	sort donations by price	2020-05-21 16:45:54 +02:00