Release 0.2.1

(refs #32)

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 8
-        versionName "0.1.1"
+        versionCode 19
+        versionName "0.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -76,22 +76,18 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
     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.2.0-alpha06'
+    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 'androidx.browser:browser:1.2.0'
-    implementation 'com.google.maps.android:android-maps-utils:0.5'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    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'
@@ -102,8 +98,23 @@ dependencies {
     implementation 'com.airbnb.android:lottie:3.4.0'
     implementation 'io.michaelrocks:bimap:1.0.2'
 
+    // Google Maps v3 Beta
+    implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
+    implementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
+    implementation 'com.google.maps.android:android-maps-utils-v3:1.3.3'
+    implementation 'com.android.volley:volley:1.1.1'
+    implementation 'com.google.android.gms:play-services-base:17.3.0'
+    implementation 'com.google.android.gms:play-services-basement: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'
+    implementation 'com.google.android.gms:play-services-tasks:17.1.0'
+    implementation 'com.google.auto.value:auto-value-annotations:1.6.3'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.android.datatransport:transport-runtime:2.2.3'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
     // navigation library
-    def nav_version = "2.3.0-alpha06"
+    def nav_version = "2.3.0"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -119,7 +130,7 @@ dependencies {
     implementation "androidx.room:room-ktx:$room_version"
 
     // billing library
-    def billing_version = "2.2.0"
+    def billing_version = "3.0.0"
     implementation "com.android.billingclient:billing:$billing_version"
     implementation "com.android.billingclient:billing-ktx:$billing_version"
 
@@ -135,5 +146,5 @@ dependencies {
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
 }

app/src/main/AndroidManifest.xml

@@ -27,7 +27,8 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/title_activity_maps">
+            android:label="@string/title_activity_maps"
+            android:theme="@style/AppTheme.LaunchScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -3,11 +3,14 @@ package net.vonforst.evmap
 import android.app.Application
 import com.facebook.stetho.Stetho
 import com.google.android.libraries.places.api.Places
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.updateNightMode
 
 class EvMapApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        updateNightMode(PreferenceDataSource(this))
         Stetho.initializeWithDefaults(this);
-        Places.initialize(getApplicationContext(), getString(R.string.google_maps_key));
+        Places.initialize(applicationContext, getString(R.string.google_maps_key));
     }
 }

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

@@ -1,8 +1,10 @@
 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
@@ -12,10 +14,14 @@ 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
 
@@ -30,7 +36,17 @@ 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?) {
+        // set theme to AppTheme to end launch screen
+        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_maps)
@@ -47,6 +63,8 @@ class MapsActivity : AppCompatActivity() {
         findViewById<NavigationView>(R.id.nav_view).setupWithNavController(navController)
 
         prefs = PreferenceDataSource(this)
+
+        checkPlayServices()
     }
 
     fun navigateTo(charger: ChargeLocation) {
@@ -92,4 +110,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
+    }
 }

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

@@ -1,6 +1,9 @@
 package net.vonforst.evmap
 
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.*
+import android.text.style.StyleSpan
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -14,4 +17,38 @@ fun Bundle.optLong(name: String): Long? {
 
     val lng = this.getLong(name, Long.MIN_VALUE)
     return if (lng == Long.MIN_VALUE) null else lng
+}
+
+fun <T> Iterable<T>.joinToSpannedString(
+    separator: CharSequence = ", ",
+    prefix: CharSequence = "",
+    postfix: CharSequence = "",
+    limit: Int = -1,
+    truncated: CharSequence = "...",
+    transform: ((T) -> CharSequence)? = null
+): CharSequence {
+    return SpannedString(
+        joinTo(
+            SpannableStringBuilder(),
+            separator,
+            prefix,
+            postfix,
+            limit,
+            truncated,
+            transform
+        )
+    )
+}
+
+operator fun CharSequence.plus(other: CharSequence): CharSequence {
+    return TextUtils.concat(this, other)
+}
+
+fun String.bold(): CharSequence {
+    return SpannableString(this).apply {
+        setSpan(
+            StyleSpan(Typeface.BOLD), 0, this.length,
+            Spannable.SPAN_INCLUSIVE_EXCLUSIVE
+        )
+    }
 }

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

@@ -4,6 +4,8 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.text.HtmlCompat
 import androidx.core.view.children
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.Observable
@@ -12,21 +14,25 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.chip.Chip
-import net.vonforst.evmap.BR
-import net.vonforst.evmap.R
+import net.vonforst.evmap.*
 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.*
 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
+import kotlin.math.max
 
 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 +53,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
     }
@@ -87,13 +99,26 @@ class DetailAdapter : DataBindingAdapter<DetailAdapter.Detail>() {
         val text: CharSequence,
         val detailText: CharSequence? = null,
         val links: Boolean = true,
-        val clickable: Boolean = false
+        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> {
+fun buildDetails(
+    loc: ChargeLocation?,
+    chargeCards: Map<Long, ChargeCard>?,
+    filteredChargeCards: Set<Long>?,
+    ctx: Context
+): List<DetailAdapter.Detail> {
     if (loc == null) return emptyList()
 
     return listOfNotNull(
@@ -113,12 +138,28 @@ 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?.let {
+                HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY)
+            } ?: "",
+            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,
@@ -127,6 +168,16 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
             loc.cost.descriptionLong ?: loc.cost.descriptionShort
         )
         else null,
+        if (loc.chargecards != null && loc.chargecards.isNotEmpty()) DetailAdapter.Detail(
+            R.drawable.ic_payment,
+            R.string.charge_cards,
+            ctx.resources.getQuantityString(
+                R.plurals.charge_cards_compatible_num,
+                loc.chargecards.size, loc.chargecards.size
+            ),
+            formatChargeCards(loc.chargecards, chargeCards, filteredChargeCards, ctx),
+            clickable = true
+        ) else null,
         DetailAdapter.Detail(
             R.drawable.ic_location,
             R.string.coordinates,
@@ -138,6 +189,33 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List<DetailAdapter.Detail>
     )
 }
 
+fun formatChargeCards(
+    chargecards: List<ChargeCardId>,
+    chargecardData: Map<Long, ChargeCard>?,
+    filteredChargeCards: Set<Long>?,
+    ctx: Context
+): CharSequence {
+    if (chargecardData == null) return ""
+
+    val maxItems = 5
+    var result = chargecards
+        .sortedByDescending { filteredChargeCards?.contains(it.id) }
+        .take(maxItems)
+        .mapNotNull {
+            val name = chargecardData[it.id]?.name ?: return@mapNotNull null
+            if (filteredChargeCards?.contains(it.id) == true) {
+                name.bold()
+            } else {
+                name
+            }
+        }.joinToSpannedString()
+    if (chargecards.size > maxItems) {
+        result += " " + ctx.getString(R.string.and_n_others, chargecards.size - maxItems)
+    }
+
+    return result
+}
+
 
 class FavoritesAdapter(val vm: FavoritesViewModel) :
     DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
@@ -158,11 +236,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>>,
@@ -177,10 +262,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
+                    )
+                }
             }
         }
     }
@@ -268,20 +361,41 @@ 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,
         value: SliderFilterValue
     ) {
-        binding.progress = filter.inverseMapping(value.value)
-        binding.mappedValue = value.value
+        binding.progress = max(filter.inverseMapping(value.value) - filter.min, 0)
+        binding.mappedValue = filter.mapping(binding.progress + filter.min)
 
         binding.addOnPropertyChangedCallback(object :
             Observable.OnPropertyChangedCallback() {
             override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
                 when (propertyId) {
                     BR.progress -> {
-                        val mapped = filter.mapping(binding.progress)
+                        val mapped = filter.mapping(binding.progress + filter.min)
                         value.value = mapped
                         binding.mappedValue = mapped
                     }

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 {
@@ -73,34 +75,40 @@ internal class JsonObjectOrFalseAdapter<T> private constructor(
             type: Type,
             annotations: Set<Annotation>?,
             moshi: Moshi
-        ): JsonAdapter<*>? {
+        ): JsonAdapter<Any>? {
             val clazz = Types.getRawType(type)
             return when (hasJsonObjectOrFalseAnnotation(
                 annotations
             )) {
                 false -> null
                 true -> JsonObjectOrFalseAdapter(
-                    moshi.adapter(clazz)
+                    moshi.adapter(type), 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.BEGIN_ARRAY -> 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 +147,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
 }

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
@@ -17,13 +18,19 @@ interface GoingElectricApi {
     suspend fun getChargepoints(
         @Query("sw_lat") swlat: Double, @Query("sw_lng") sw_lng: Double,
         @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("freecharging") freecharging: Boolean,
-        @Query("freeparking") freeparking: Boolean,
-        @Query("min_power") minPower: Int,
-        @Query("plugs") plugs: String?
+        @Query("clustering") clustering: Boolean = false,
+        @Query("cluster_distance") clusterDistance: Int? = null,
+        @Query("freecharging") freecharging: Boolean = false,
+        @Query("freeparking") freeparking: Boolean = false,
+        @Query("min_power") minPower: Int = 0,
+        @Query("plugs") plugs: String? = null,
+        @Query("chargecards") chargecards: String? = null,
+        @Query("networks") networks: String? = null,
+        @Query("startkey") startkey: Int? = null,
+        @Query("open_twentyfourseven") open247: Boolean = false,
+        @Query("barrierfree") barrierfree: Boolean = false,
+        @Query("exclude_faults") excludeFaults: Boolean = false
     ): Response<ChargepointList>
 
     @GET("chargepoints/")
@@ -36,7 +43,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 +61,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 +73,7 @@ interface GoingElectricApi {
                 .add(ChargepointListItemJsonAdapterFactory())
                 .add(JsonObjectOrFalseAdapter.Factory())
                 .add(HoursAdapter())
+                .add(InstantAdapter())
                 .build()
 
             val retrofit = Retrofit.Builder()

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?,
@@ -50,15 +60,26 @@ data class ChargeLocation(
     @JsonObjectOrFalse @Json(name = "ladeweile") val amenities: String?,
     @JsonObjectOrFalse @Json(name = "location_description") val locationDescription: String?,
     val photos: List<ChargerPhoto>?,
-    //val chargecards: Boolean?
+    @JsonObjectOrFalse val chargecards: List<ChargeCardId>?,
     @Embedded val openinghours: OpeningHours?,
     @Embedded val cost: Cost?
 ) : ChargepointListItem(), Equatable {
+    /**
+     * maximum power available from this charger.
+     */
     val maxPower: Double
         get() {
-            return chargepoints.map { it.power }.max() ?: 0.0
+            return maxPower()
         }
 
+    /**
+     * Gets the maximum power available from certain connectors of this charger.
+     */
+    fun maxPower(connectors: Set<String>? = null): Double {
+        return chargepoints.filter { connectors?.contains(it.type) ?: true }
+            .map { it.power }.max() ?: 0.0
+    }
+
     /**
      * Merges chargepoints if they have the same plug and power
      *
@@ -107,6 +128,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 +159,6 @@ data class OpeningHours(
                     ), 0
                 )
             }
-        } else if (description != null) {
-            return description
         } else {
             return ""
         }
@@ -155,9 +178,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 +191,7 @@ data class OpeningHoursDays(
             DayOfWeek.FRIDAY -> friday
             DayOfWeek.SATURDAY -> saturday
             DayOfWeek.SUNDAY -> sunday
+            null -> holiday
         }
     }
 }
@@ -172,7 +199,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 +278,20 @@ 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
+)
+
+@JsonClass(generateAdapter = true)
+data class ChargeCardId(
+    val id: Long
+)

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

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

@@ -10,11 +10,11 @@ import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
-import android.transition.TransitionManager
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.SharedElementCallback
 import androidx.core.content.ContextCompat
@@ -32,16 +32,18 @@ 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
@@ -88,6 +90,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private var markers: MutableBiMap<Marker, ChargeLocation> = HashBiMap()
     private var clusterMarkers: List<Marker> = emptyList()
     private var searchResultMarker: Marker? = null
+    private var connectionErrorSnackbar: Snackbar? = null
+    private var previousChargepointIds: Set<Long>? = null
 
     private lateinit var clusterIconGenerator: ClusterIconGenerator
     private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -203,6 +207,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 (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
         }
@@ -241,10 +250,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     private fun openLayersMenu() {
+        binding.fabLayers.tag = false
         val materialTransform = MaterialContainerTransform().apply {
             startView = binding.fabLayers
             endView = binding.layersSheet
-            pathMotion = MaterialArcMotion()
+            setPathMotion(MaterialArcMotion())
             duration = 250
             scrimColor = Color.TRANSPARENT
         }
@@ -253,10 +263,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     private fun closeLayersMenu() {
+        binding.fabLayers.tag = true
         val materialTransform = MaterialContainerTransform().apply {
             startView = binding.layersSheet
             endView = binding.fabLayers
-            pathMotion = MaterialArcMotion()
+            setPathMotion(MaterialArcMotion())
             duration = 200
             scrimColor = Color.TRANSPARENT
         }
@@ -284,6 +295,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             override fun onStateChanged(bottomSheet: View, newState: Int) {
                 vm.bottomSheetState.value = newState
                 updateBackPressedCallback()
+
+                if (vm.layersMenuOpen.value!! && newState !in listOf(BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING, BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN, BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED)) {
+                    closeLayersMenu()
+                }
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner, Observer {
@@ -300,9 +315,31 @@ 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()
@@ -335,11 +372,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         vm.mapTrafficEnabled.observe(viewLifecycleOwner, Observer {
             map?.isTrafficEnabled = it
         })
+
+        updateBackPressedCallback()
     }
 
     private fun updateBackPressedCallback() {
         backPressedCallback.isEnabled =
-            vm.bottomSheetState.value != STATE_HIDDEN || vm.searchResult.value != null
+            vm.bottomSheetState.value != null && vm.bottomSheetState.value != STATE_HIDDEN
+                    || vm.searchResult.value != null
                     || (vm.layersMenuOpen.value ?: false)
     }
 
@@ -347,7 +387,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         markers.forEach { (m, c) ->
             m.setIcon(
                 chargerIconGenerator.getBitmapDescriptor(
-                    getMarkerTint(c)
+                    getMarkerTint(c, vm.filteredConnectors.value), fault = c.faultReport != null
                 )
             )
         }
@@ -358,7 +398,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         // highlight this marker
         marker.setIcon(
             chargerIconGenerator.getBitmapDescriptor(
-                getMarkerTint(charger), highlight = true
+                getMarkerTint(charger, vm.filteredConnectors.value),
+                highlight = true,
+                fault = charger.faultReport != null
             )
         )
         animator.animateMarkerBounce(marker)
@@ -368,7 +410,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             if (m != marker) {
                 m.setIcon(
                     chargerIconGenerator.getBitmapDescriptor(
-                        getMarkerTint(c)
+                        getMarkerTint(c, vm.filteredConnectors.value), fault = c.faultReport != null
                     )
                 )
             }
@@ -434,12 +476,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.detailView.details.apply {
             adapter = DetailAdapter().apply {
                 onClickListener = {
-                    when (it.icon) {
-                        R.drawable.ic_location -> {
-                            val charger = vm.chargerSparse.value
-                            if (charger != null) {
+                    val charger = vm.chargerDetails.value?.data
+                    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}")
+                            }
+                            R.drawable.ic_payment -> {
+                                showPaymentMethodsDialog(charger)
+                            }
                         }
                     }
                 }
@@ -456,6 +504,30 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
+    private fun showPaymentMethodsDialog(charger: ChargeLocation) {
+        val activity = activity ?: return
+        val chargecardData = vm.chargeCardMap.value ?: return
+        val chargecards = charger.chargecards ?: return
+        val filteredChargeCards = vm.filteredChargeCards.value
+
+        val data = chargecards.mapNotNull { chargecardData[it.id] }
+            .sortedBy { it.name }
+            .sortedByDescending { filteredChargeCards?.contains(it.id) }
+        val names = data.map {
+            if (filteredChargeCards?.contains(it.id) == true) {
+                it.name.bold()
+            } else {
+                it.name
+            }
+        }
+        AlertDialog.Builder(activity)
+            .setTitle(R.string.charge_cards)
+            .setItems(names.toTypedArray()) { _, i ->
+                val card = data[i]
+                (activity as? MapsActivity)?.openUrl("https:${card.url}")
+            }.show()
+    }
+
     override fun onMapReady(map: GoogleMap) {
         this.map = map
         map.uiSettings.isTiltGesturesEnabled = false
@@ -575,6 +647,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         ) == PackageManager.PERMISSION_GRANTED
     }
 
+    @Synchronized
     private fun updateMap(chargepoints: List<ChargepointListItem>) {
         val map = this.map ?: return
         clusterMarkers.forEach { it.remove() }
@@ -583,34 +656,54 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val chargers = chargepoints.filterIsInstance<ChargeLocation>()
 
         val chargepointIds = chargers.map { it.id }.toSet()
-        // remove markers that disappeared
-        markers.entries.toList().forEach {
-            if (!chargepointIds.contains(it.value.id)) {
-                if (it.key.isVisible) {
-                    val tint = getMarkerTint(it.value)
-                    val highlight = it.value == vm.chargerSparse.value
-                    animator.animateMarkerDisappear(it.key, tint, highlight)
-                } else {
-                    it.key.remove()
-                }
-                markers.remove(it.key)
-            }
-        }
-        // add new markers
-        chargers.filter {
-            !markers.containsValue(it)
-        }.forEach { charger ->
-            val tint = getMarkerTint(charger)
-            val highlight = charger == vm.chargerSparse.value
-            val marker = map.addMarker(
-                MarkerOptions()
-                    .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
-                    .icon(
-                        chargerIconGenerator.getBitmapDescriptor(tint, highlight = highlight)
-                    )
+
+        // update icons of existing markers (connector filter may have changed)
+        for ((marker, charger) in markers) {
+            marker.setIcon(
+                chargerIconGenerator.getBitmapDescriptor(
+                    getMarkerTint(charger, vm.filteredConnectors.value),
+                    highlight = charger == vm.chargerSparse.value,
+                    fault = charger.faultReport != null
+                )
             )
-            animator.animateMarkerAppear(marker, tint, highlight)
-            markers[marker] = charger
+        }
+
+        if (chargers.toSet() != markers.values) {
+            // remove markers that disappeared
+            val bounds = map.projection.visibleRegion.latLngBounds
+            markers.entries.toList().forEach {
+                val marker = it.key
+                val charger = it.value
+                if (!chargepointIds.contains(charger.id)) {
+                    // animate marker if it is visible, otherwise remove immediately
+                    if (bounds.contains(marker.position)) {
+                        val tint = getMarkerTint(charger, vm.filteredConnectors.value)
+                        val highlight = charger == vm.chargerSparse.value
+                        val fault = charger.faultReport != null
+                        animator.animateMarkerDisappear(marker, tint, highlight, fault)
+                    } else {
+                        animator.deleteMarker(marker)
+                    }
+                    markers.remove(marker)
+                }
+            }
+            // add new markers
+            val map1 = markers.values.map { it.id }
+            for (charger in chargers) {
+                if (!map1.contains(charger.id)) {
+                    val tint = getMarkerTint(charger, vm.filteredConnectors.value)
+                    val highlight = charger == vm.chargerSparse.value
+                    val fault = charger.faultReport != null
+                    val marker = map.addMarker(
+                        MarkerOptions()
+                            .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
+                            .visible(false)
+                    )
+                    animator.animateMarkerAppear(marker, tint, highlight, fault)
+                    markers[marker] = charger
+                }
+            }
+            previousChargepointIds = chargepointIds
         }
         clusterMarkers = clusters.map { cluster ->
             map.addMarker(
@@ -677,9 +770,21 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
 
         filterView?.setOnLongClickListener {
-            requireView().findNavController().navigate(
-                R.id.action_map_to_filterFragment
+            // 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
         }
     }

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.value }.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

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
@@ -9,12 +10,18 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.updateNightMode
 
 
-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
+    private lateinit var prefs: PreferenceDataSource
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val toolbar = view.findViewById(R.id.toolbar) as Toolbar
+        prefs = PreferenceDataSource(requireContext())
 
         val navController = findNavController()
         toolbar.setupWithNavController(
@@ -33,4 +40,29 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "language" -> {
+                activity?.let {
+                    it.finish();
+                    it.startActivity(it.intent);
+                }
+            }
+            "darkmode" -> {
+                updateNightMode(prefs)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        preferenceManager.sharedPreferences
+            .unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
+    }
+
 }

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()
+    }
+}

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 = 8
 )
 @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, MIGRATION_8
+                )
                 .build()
         }
 
@@ -86,5 +94,31 @@ 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`))")
+            }
+        }
+
+        private val MIGRATION_8 = object : Migration(7, 8) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `chargecards` TEXT")
+            }
+        }
     }
 }

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()
+    }
+}

app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt

@@ -18,4 +18,28 @@ 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()
+        }
+
+    var filtersActive: Boolean
+        get() = sp.getBoolean("filters_active", true)
+        set(value) {
+            sp.edit().putBoolean("filters_active", value).apply()
+        }
+
+    val language: String
+        get() = sp.getString("language", "default")!!
+
+    val darkmode: String
+        get() = sp.getString("darkmode", "default")!!
 }

app/src/main/java/net/vonforst/evmap/storage/TypeConverters.kt

@@ -3,8 +3,10 @@ package net.vonforst.evmap.storage
 import androidx.room.TypeConverter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
+import net.vonforst.evmap.api.goingelectric.ChargeCardId
 import net.vonforst.evmap.api.goingelectric.Chargepoint
 import net.vonforst.evmap.api.goingelectric.ChargerPhoto
+import java.time.Instant
 import java.time.LocalTime
 
 class Converters {
@@ -17,6 +19,10 @@ class Converters {
         val type = Types.newParameterizedType(List::class.java, ChargerPhoto::class.java)
         moshi.adapter<List<ChargerPhoto>>(type)
     }
+    private val chargeCardIdListAdapter by lazy {
+        val type = Types.newParameterizedType(List::class.java, ChargeCardId::class.java)
+        moshi.adapter<List<ChargeCardId>>(type)
+    }
     private val stringSetAdapter by lazy {
         val type = Types.newParameterizedType(Set::class.java, String::class.java)
         moshi.adapter<Set<String>>(type)
@@ -42,6 +48,16 @@ class Converters {
         return chargerPhotoListAdapter.fromJson(value)
     }
 
+    @TypeConverter
+    fun fromChargeCardIdList(value: List<ChargeCardId>?): String {
+        return chargeCardIdListAdapter.toJson(value)
+    }
+
+    @TypeConverter
+    fun toChargeCardIdList(value: String?): List<ChargeCardId>? {
+        return value?.let { chargeCardIdListAdapter.fromJson(it) }
+    }
+
     @TypeConverter
     fun fromLocalTime(value: LocalTime?): String? {
         return value?.toString()
@@ -49,11 +65,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)

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

@@ -3,10 +3,12 @@ package net.vonforst.evmap.ui
 import android.content.Context
 import android.content.res.ColorStateList
 import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
 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
@@ -15,6 +17,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.goingelectric.Chargepoint
+import kotlin.math.roundToInt
 
 
 @BindingAdapter("goneUnless")
@@ -109,6 +112,25 @@ fun applySelectableItemBackground(view: View, apply: Boolean) {
     }
 }
 
+@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)
+    }
+}
+
+@BindingAdapter("android:layout_marginTop")
+fun setTopMargin(view: View, topMargin: Float) {
+    val layoutParams = view.layoutParams as MarginLayoutParams
+    layoutParams.setMargins(
+        layoutParams.leftMargin, topMargin.roundToInt(),
+        layoutParams.rightMargin, layoutParams.bottomMargin
+    )
+    view.layoutParams = layoutParams
+}
+
 private fun availabilityColor(
     status: List<ChargepointStatus>?,
     context: Context

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)
+
+}

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();
+        }
+    }
+}

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
@@ -42,23 +42,26 @@ class ClusterIconGenerator(context: Context) : IconGenerator(context) {
 
 
 class ChargerIconGenerator(val context: Context) {
-    data class BitmapData(val tint: Int, val scale: Int, val alpha: Int, val highlight: Boolean)
+    data class BitmapData(
+        val tint: Int,
+        val scale: Int,
+        val alpha: Int,
+        val highlight: Boolean,
+        val fault: Boolean
+    )
 
-    val cacheSize = 4 * 1024 * 1024; // 4MiB
-    val cache = object : LruCache<BitmapData, Bitmap>(cacheSize) {
-        override fun sizeOf(key: BitmapData, value: Bitmap): Int {
-            return value.byteCount
-        }
-    }
-    val oversize = 1f  // increase to add padding for overshoot scale animation
+    val cacheSize = 420; // 420 items: 21 sizes, 5 colors, highlight on/off, fault on/off
+    val cache = LruCache<BitmapData, BitmapDescriptor>(cacheSize)
+    val oversize = 1.4f  // increase to add padding for fault icon or scale > 1
     val icon = R.drawable.ic_map_marker_charging
     val highlightIcon = R.drawable.ic_map_marker_highlight
+    val faultIcon = R.drawable.ic_map_marker_fault
 
     init {
         preloadCache()
     }
 
-    fun preloadCache() {
+    private fun preloadCache() {
         // pre-generates images for scale from 0 to 255 for all possible tint colors
         val tints = listOf(
             R.color.charger_100kw,
@@ -67,11 +70,12 @@ class ChargerIconGenerator(val context: Context) {
             R.color.charger_11kw,
             R.color.charger_low
         )
-        for (highlight in listOf(false, true)) {
-            for (tint in tints) {
-                for (scale in 0..20) {
-                    val data = BitmapData(tint, scale, 255, highlight)
-                    cache.put(data, generateBitmap(data))
+        for (fault in listOf(false, true)) {
+            for (highlight in listOf(false, true)) {
+                for (tint in tints) {
+                    for (scale in 0..20) {
+                        getBitmapDescriptor(tint, scale, 255, highlight, fault)
+                    }
                 }
             }
         }
@@ -81,16 +85,18 @@ class ChargerIconGenerator(val context: Context) {
         @ColorRes tint: Int,
         scale: Int = 20,
         alpha: Int = 255,
-        highlight: Boolean = false
+        highlight: Boolean = false,
+        fault: Boolean = false
     ): BitmapDescriptor? {
-        val data = BitmapData(tint, scale, alpha, highlight)
+        val data = BitmapData(tint, scale, alpha, highlight, fault)
         val cachedImg = cache[data]
         return if (cachedImg != null) {
-            BitmapDescriptorFactory.fromBitmap(cachedImg)
+            cachedImg
         } else {
             val bitmap = generateBitmap(data)
-            cache.put(data, bitmap)
-            BitmapDescriptorFactory.fromBitmap(bitmap)
+            val bmd = BitmapDescriptorFactory.fromBitmap(bitmap)
+            cache.put(data, bmd)
+            bmd
         }
     }
 
@@ -136,6 +142,21 @@ class ChargerIconGenerator(val context: Context) {
             highlightDrawable.draw(canvas)
         }
 
+        if (data.fault) {
+            val faultDrawable = context.getDrawable(faultIcon)!!
+            val faultSize = 0.75
+            val faultShift = 0.25
+            val base = vd.intrinsicWidth
+            faultDrawable.setBounds(
+                (leftPadding.toInt() + base * (1 - faultSize + faultShift)).toInt(),
+                (topPadding.toInt() - base * faultShift).toInt(),
+                (leftPadding.toInt() + base * (1 + faultShift)).toInt(),
+                (topPadding.toInt() + base * (faultSize - faultShift)).toInt()
+            )
+            faultDrawable.alpha = data.alpha
+            faultDrawable.draw(canvas)
+        }
+
         return bm
     }
 }

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

@@ -5,101 +5,126 @@ 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
 
-fun getMarkerTint(charger: ChargeLocation): Int = when {
-    charger.maxPower >= 100 -> R.color.charger_100kw
-    charger.maxPower >= 43 -> R.color.charger_43kw
-    charger.maxPower >= 20 -> R.color.charger_20kw
-    charger.maxPower >= 11 -> R.color.charger_11kw
+fun getMarkerTint(
+    charger: ChargeLocation,
+    connectors: Set<String>?
+): Int = when {
+    charger.maxPower(connectors) >= 100 -> R.color.charger_100kw
+    charger.maxPower(connectors) >= 43 -> R.color.charger_43kw
+    charger.maxPower(connectors) >= 20 -> R.color.charger_20kw
+    charger.maxPower(connectors) >= 11 -> R.color.charger_11kw
     else -> R.color.charger_low
 }
 
 class MarkerAnimator(val gen: ChargerIconGenerator) {
-    val animatingMarkers = hashMapOf<Marker, ValueAnimator>()
+    private val animatingMarkers = hashMapOf<String, ValueAnimator>()
 
     fun animateMarkerAppear(
         marker: Marker,
         tint: Int,
-        highlight: Boolean
+        highlight: Boolean,
+        fault: Boolean
     ) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker.id]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker.id)
+        }
 
         val anim = ValueAnimator.ofInt(0, 20).apply {
             duration = 250
             interpolator = LinearOutSlowInInterpolator()
             addUpdateListener { animationState ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
                 val scale = animationState.animatedValue as Int
                 marker.setIcon(
-                    gen.getBitmapDescriptor(tint, scale = scale, highlight = highlight)
+                    gen.getBitmapDescriptor(
+                        tint,
+                        scale = scale,
+                        highlight = highlight,
+                        fault = fault
+                    )
                 )
+                marker.isVisible = true
             }
             addListener(onEnd = {
-                animatingMarkers.remove(marker)
+                animatingMarkers.remove(marker.id)
+            }, onCancel = {
+                animatingMarkers.remove(marker.id)
             })
         }
-        animatingMarkers[marker] = anim
+        animatingMarkers[marker.id] = anim
         anim.start()
     }
 
     fun animateMarkerDisappear(
         marker: Marker,
         tint: Int,
-        highlight: Boolean
+        highlight: Boolean,
+        fault: Boolean
     ) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker.id]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker.id)
+        }
 
         val anim = ValueAnimator.ofInt(20, 0).apply {
             duration = 200
             interpolator = FastOutLinearInInterpolator()
             addUpdateListener { animationState ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
                 val scale = animationState.animatedValue as Int
                 marker.setIcon(
-                    gen.getBitmapDescriptor(tint, scale = scale, highlight = highlight)
+                    gen.getBitmapDescriptor(
+                        tint,
+                        scale = scale,
+                        highlight = highlight,
+                        fault = fault
+                    )
                 )
             }
             addListener(onEnd = {
-                animatingMarkers.remove(marker)
                 marker.remove()
+                animatingMarkers.remove(marker.id)
+            }, onCancel = {
+                marker.remove()
+                animatingMarkers.remove(marker.id)
             })
         }
-        animatingMarkers[marker] = anim
+        animatingMarkers[marker.id] = anim
         anim.start()
     }
 
+    fun deleteMarker(marker: Marker) {
+        animatingMarkers[marker.id]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker.id)
+        }
+        marker.remove()
+    }
+
     fun animateMarkerBounce(marker: Marker) {
-        animatingMarkers[marker]?.cancel()
-        animatingMarkers.remove(marker)
+        animatingMarkers[marker.id]?.let {
+            it.cancel()
+            animatingMarkers.remove(marker.id)
+        }
 
         val anim = ValueAnimator.ofFloat(0f, 1f).apply {
             duration = 700
             interpolator = BounceInterpolator()
             addUpdateListener { state ->
-                if (!marker.isVisible) {
-                    cancel()
-                    animatingMarkers.remove(marker)
-                    return@addUpdateListener
-                }
                 val t = max(1f - state.animatedValue as Float, 0f) / 2
                 marker.setAnchor(0.5f, 1.0f + t)
             }
+            addListener(onEnd = {
+                animatingMarkers.remove(marker.id)
+            }, onCancel = {
+                animatingMarkers.remove(marker.id)
+            })
         }
-        animatingMarkers[marker] = anim
+        animatingMarkers[marker.id] = anim
         anim.start()
     }
 }

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

@@ -0,0 +1,14 @@
+package net.vonforst.evmap.ui
+
+import androidx.appcompat.app.AppCompatDelegate
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+fun updateNightMode(prefs: PreferenceDataSource) {
+    AppCompatDelegate.setDefaultNightMode(
+        when (prefs.darkmode) {
+            "on" -> AppCompatDelegate.MODE_NIGHT_YES
+            "off" -> AppCompatDelegate.MODE_NIGHT_NO
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+    )
+}

app/src/main/java/net/vonforst/evmap/utils/LocaleContextWrapper.kt

@@ -0,0 +1,36 @@
+package net.vonforst.evmap.utils
+
+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)
+        }
+    }
+}

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

@@ -20,12 +20,12 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
             override fun onBillingServiceDisconnected() {
             }
 
-            override fun onBillingSetupFinished(p0: BillingResult?) {
+            override fun onBillingSetupFinished(p0: BillingResult) {
                 loadProducts()
 
                 // consume pending purchases
                 val purchases = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
-                purchases.purchasesList.forEach {
+                purchases.purchasesList?.forEach {
                     if (!it.isAcknowledged) {
                         consumePurchase(it.purchaseToken, false)
                     }
@@ -53,7 +53,7 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
             )
             .build()
         billingClient.querySkuDetailsAsync(params) { result, details ->
-            if (result.responseCode == BillingClient.BillingResponseCode.OK) {
+            if (result.responseCode == BillingClient.BillingResponseCode.OK && details != null) {
                 products.value = Resource.success(details
                     .sortedBy { it.priceAmountMicros }
                     .map { DonationItem(it) }

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

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

@@ -10,17 +10,15 @@ 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
 
-val powerSteps = listOf(0, 2, 3, 7, 11, 22, 43, 50, 100, 150, 200, 250, 300, 350)
+val powerSteps = listOf(0, 2, 3, 7, 11, 22, 43, 50, 75, 100, 150, 200, 250, 300, 350)
 internal fun mapPower(i: Int) = powerSteps[i]
 internal fun mapPowerInverse(power: Int) = powerSteps
     .mapIndexed { index, v -> abs(v - power) to index }
@@ -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,35 +42,61 @@ 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"),
+        BooleanFilter(application.getString(R.string.filter_open_247), "open_247"),
+        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,
+            min = 1
+        ),
+        MultipleChoiceFilter(
+            application.getString(R.string.filter_networks), "networks",
+            networkMap, manyChoices = true
+        ),
+        BooleanFilter(application.getString(R.string.filter_barrierfree), "barrierfree"),
+        MultipleChoiceFilter(
+            application.getString(R.string.filter_chargecards), "chargecards",
+            chargecardMap, manyChoices = true
+        ),
+        BooleanFilter(application.getString(R.string.filter_exclude_faults), "exclude_faults")
+    )
+}
+
 
 internal fun filtersWithValue(
     filters: LiveData<List<Filter<FilterValue>>>,
@@ -107,9 +133,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 {
@@ -144,7 +175,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)
@@ -154,6 +186,7 @@ data class SliderFilter(
     override val name: String,
     override val key: String,
     val max: Int,
+    val min: Int = 0,
     val mapping: ((Int) -> Int) = { it },
     val inverseMapping: ((Int) -> Int) = { it },
     val unit: String? = ""

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

@@ -2,24 +2,21 @@ package net.vonforst.evmap.viewmodel
 
 import android.app.Application
 import androidx.lifecycle.*
-import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.libraries.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)
 
@@ -52,12 +49,29 @@ 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, filtersActive)
     }
 
+    val chargeCardMap: LiveData<Map<Long, ChargeCard>> by lazy {
+        MediatorLiveData<Map<Long, ChargeCard>>().apply {
+            value = null
+            addSource(chargeCards) {
+                value = chargeCards.value?.map {
+                    it.id to it
+                }?.toMap()
+            }
+        }
+    }
+
     val filtersCount: LiveData<Int> by lazy {
         MediatorLiveData<Int>().apply {
             value = 0
@@ -74,13 +88,17 @@ 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()
                     }
                 }
             }
     }
+    val filteredConnectors: MutableLiveData<Set<String>> by lazy {
+        MutableLiveData<Set<String>>()
+    }
+    val filteredChargeCards: MutableLiveData<Set<Long>> by lazy {
+        MutableLiveData<Set<Long>>()
+    }
 
     val chargerSparse: MutableLiveData<ChargeLocation> by lazy {
         MutableLiveData<ChargeLocation>()
@@ -152,7 +170,10 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
 
     val filtersActive: MutableLiveData<Boolean> by lazy {
         MutableLiveData<Boolean>().apply {
-            value = true
+            value = prefs.filtersActive
+            observeForever {
+                prefs.filtersActive = it
+            }
         }
     }
 
@@ -172,6 +193,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>>
@@ -179,10 +206,15 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
         chargepointLoader?.cancel()
 
         chargepoints.value = Resource.loading(chargepoints.value?.data)
+        filteredConnectors.value = null
+        filteredChargeCards.value = null
         val bounds = mapPosition.bounds
         val zoom = mapPosition.zoom
         chargepointLoader = viewModelScope.launch {
-            chargepoints.value = getChargepointsWithFilters(bounds, zoom, filters)
+            val result = getChargepointsWithFilters(bounds, zoom, filters)
+            filteredConnectors.value = result.second
+            filteredChargeCards.value = result.third
+            chargepoints.value = result.first
         }
     }
 
@@ -190,55 +222,133 @@ class MapViewModel(application: Application, geApiKey: String) : AndroidViewMode
         bounds: LatLngBounds,
         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
+    ): Triple<Resource<List<ChargepointListItem>>, Set<String>?, Set<Long>?> {
+        val freecharging = getBooleanValue(filters, "freecharging")
+        val freeparking = getBooleanValue(filters, "freeparking")
+        val open247 = getBooleanValue(filters, "open_247")
+        val barrierfree = getBooleanValue(filters, "barrierfree")
+        val excludeFaults = getBooleanValue(filters, "exclude_faults")
+        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())
+            return Triple(Resource.success(emptyList()), null, null)
         }
+        val connectors = formatMultipleChoice(connectorsVal)
+        val filteredConnectors = if (connectorsVal.all) null else connectorsVal.values
+
+        val chargeCardsVal = getMultipleChoiceValue(filters, "chargecards")
+        if (chargeCardsVal.values.isEmpty() && !chargeCardsVal.all) {
+            // no chargeCards chosen
+            return Triple(Resource.success(emptyList()), filteredConnectors, null)
+        }
+        val chargeCards = formatMultipleChoice(chargeCardsVal)
+        val filteredChargeCards =
+            if (chargeCardsVal.all) null else chargeCardsVal.values.map { it.toLong() }.toSet()
+
+        val networksVal = getMultipleChoiceValue(filters, "networks")
+        if (networksVal.values.isEmpty() && !networksVal.all) {
+            // no networks chosen
+            return Triple(Resource.success(emptyList()), filteredConnectors, filteredChargeCards)
+        }
+        val networks = formatMultipleChoice(networksVal)
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = minConnectors <= 1 && zoom < 13
+        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 = useClustering, zoom = zoom,
-            clusterDistance = clusterDistance, 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,
+                    open247 = open247,
+                    barrierfree = barrierfree,
+                    excludeFaults = excludeFaults,
+                    plugs = connectors,
+                    chargecards = chargeCards,
+                    networks = networks,
+                    startkey = startkey
+                )
+                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                    return Triple(
+                        Resource.error(response.message(), chargepoints.value?.data),
+                        null,
+                        null
+                    )
                 } else {
-                    true
+                    val body = response.body()!!
+                    data.addAll(body.chargelocations)
+                    startkey = body.startkey
                 }
+            } catch (e: IOException) {
+                return Triple(
+                    Resource.error(e.message, chargepoints.value?.data),
+                    filteredConnectors,
+                    filteredChargeCards
+                )
             }
+        } 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 Triple(Resource.success(result), filteredConnectors, filteredChargeCards)
     }
 
+    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 getMultipleChoiceFilter(
+        filters: List<FilterWithValue<out FilterValue>>,
+        key: String
+    ) = filters.find { it.value.key == key }!!.filter as MultipleChoiceFilter
+
+    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)

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>

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>

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

@@ -0,0 +1,49 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="144.3dp"
+    android:height="270.5dp"
+    android:viewportWidth="144.3"
+    android:viewportHeight="270.5">
+  <path
+      android:pathData="M33.9,100l-2.5,-21.7l-3.8,0.4l2.5,21.7L33.9,100zM47.4,98.5l-2.5,-21.7l-3.8,0.4l2.5,21.7L47.4,98.5z"
+      android:fillColor="#FFB300" />
+  <path
+      android:pathData="M54.5,128c-1.2,1.4 -2.1,2.4 -2.2,2.5c-3.4,2.7 -6.1,3.5 -8.4,2.5c-3.9,-2 -3.7,-9.3 -3.5,-10.1l2.7,0.1c-0.1,2.1 0.3,6.5 2.1,7.5c1,0.5 2.9,-0.1 5.2,-2.1l0,0c0,0 7.6,-7.6 6,-13.6c-1.8,-7.2 6.5,-17.5 9.3,-21.1l0.4,-0.4l2.2,1.7l-0.4,0.5c-8.5,10.5 -9.4,15.8 -8.8,18.6C60.5,119.4 57,125 54.5,128z"
+      android:fillColor="#90A4AE" />
+  <path
+      android:pathData="M25.6,99.8l1,8.9l8.2,5.5L46,113l6.8,-7.2l-1,-8.9L25.6,99.8z"
+      android:fillColor="#90A4AE" />
+  <path
+      android:pathData="M45.8,113l-11.1,1.2l2.4,9.8l8.8,-1V113L45.8,113zM53.8,89.4l0.9,8.1l-31.9,3.7l-0.9,-8.1L53.8,89.4z"
+      android:fillColor="#546E7A" />
+  <path
+      android:pathData="M78.8,0C55.9,0 37.3,18.6 37.3,41.5c0,31.3 34.9,47.6 39.1,92.2c0.1,1.3 1.2,2.2 2.5,2.2s2.4,-0.9 2.5,-2.2c4.2,-44.6 39.1,-60.9 39.1,-92.2C120.3,18.4 101.7,0 78.8,0z"
+      android:fillColor="#00E676" />
+  <path
+      android:pathData="M78.8,0.9c22.8,0 41.2,18.3 41.5,40.9c0,-0.1 0,-0.3 0,-0.4C120.3,18.6 101.7,0 78.8,0S37.3,18.4 37.3,41.5c0,0.1 0,0.3 0,0.4C37.6,19.2 56,0.9 78.8,0.9L78.8,0.9z"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.2" />
+  <path
+      android:pathData="M81.3,132.6c-0.1,1.3 -1.2,2.2 -2.5,2.2c-1.3,0 -2.4,-0.9 -2.5,-2.2c-4.1,-44.5 -38.7,-60.8 -39,-91.7c0,0.3 0,0.4 0,0.7c0,31.3 34.9,47.6 39.1,92.2c0.1,1.3 1.2,2.2 2.5,2.2c1.3,0 2.4,-0.9 2.5,-2.2c4.2,-44.6 39.1,-60.9 39.1,-92.2c0,-0.3 0,-0.4 0,-0.7C120,71.8 85.3,88.1 81.3,132.6L81.3,132.6z"
+      android:fillColor="#3E2723"
+      android:fillAlpha="0.2" />
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M69.3,21.2v25.1h6.8v20.5l16,-27.5h-9.2L92,21.1C92.1,21.2 69.3,21.2 69.3,21.2z"
+      android:strokeAlpha="0.45"
+      android:fillAlpha="0.45" />
+  <path
+      android:fillColor="?android:textColorSecondary"
+      android:pathData="M19.2,244.2H2.8v14.1h18.8v2.4H0v-34.1h21.5v2.4H2.8v12.8h16.4V244.2z" />
+  <path
+      android:fillColor="?android:textColorSecondary"
+      android:pathData="M37.2,254.9l0.7,2.3h0.1l0.7,-2.3L49,226.6h3l-12.7,34.1h-2.6l-12.7,-34.1h3L37.2,254.9z" />
+  <path
+      android:fillColor="?android:textColorSecondary"
+      android:pathData="M60.9,226.6l12.5,30h0.1l12.6,-30h3.7v34.1h-2.8v-15.1l0.2,-14.9l-0.1,0l-12.7,30h-1.9l-12.7,-29.9l-0.1,0l0.3,14.8v15.1h-2.8v-34.1H60.9z" />
+  <path
+      android:fillColor="?android:textColorSecondary"
+      android:pathData="M114.1,260.7c-0.2,-0.9 -0.3,-1.6 -0.4,-2.2s-0.1,-1.3 -0.1,-1.9c-0.9,1.3 -2.2,2.4 -3.8,3.3s-3.3,1.3 -5.3,1.3c-2.5,0 -4.4,-0.7 -5.8,-2s-2.1,-3.1 -2.1,-5.3c0,-2.3 1,-4.2 3,-5.6s4.8,-2.1 8.2,-2.1h5.6v-3.1c0,-1.8 -0.6,-3.2 -1.7,-4.3s-2.8,-1.5 -4.9,-1.5c-2,0 -3.6,0.5 -4.9,1.5s-1.9,2.2 -1.9,3.6l-2.6,0l0,-0.1c-0.1,-1.9 0.8,-3.6 2.6,-5.1s4.1,-2.2 6.9,-2.2c2.8,0 5,0.7 6.8,2.1s2.6,3.5 2.6,6.1v12.5c0,0.9 0.1,1.8 0.2,2.6s0.3,1.7 0.5,2.5H114.1zM104.9,258.7c2,0 3.8,-0.5 5.3,-1.4s2.7,-2.2 3.4,-3.6v-5.3H108c-2.5,0 -4.6,0.5 -6.1,1.6s-2.3,2.4 -2.3,4c0,1.4 0.5,2.5 1.4,3.4S103.3,258.7 104.9,258.7z" />
+  <path
+      android:fillColor="?android:textColorSecondary"
+      android:pathData="M144.3,248.7c0,3.8 -0.9,6.8 -2.6,9.1s-4.1,3.4 -7.1,3.4c-1.8,0 -3.3,-0.3 -4.7,-1s-2.4,-1.6 -3.3,-2.9v13.1h-2.8v-35.1h2.4l0.4,3.9c0.8,-1.4 1.9,-2.5 3.3,-3.3s2.9,-1.1 4.7,-1.1c3,0 5.4,1.2 7.1,3.6s2.6,5.7 2.6,9.7V248.7zM141.5,248.2c0,-3.2 -0.6,-5.8 -1.9,-7.9c-1.3,-2 -3.2,-3 -5.6,-3c-1.9,0 -3.4,0.4 -4.6,1.3c-1.2,0.9 -2.1,2.1 -2.7,3.5v12.2c0.6,1.4 1.6,2.5 2.8,3.3s2.7,1.2 4.5,1.2c2.5,0 4.3,-0.9 5.6,-2.8c1.3,-1.8 1.9,-4.3 1.9,-7.3V248.2z" />
+</vector>

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>

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>

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>

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>

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>

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

@@ -0,0 +1,12 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M 1 21 h 22 L 12 2 L 1 21 z" />
+    <path
+        android:fillColor="#FF9100"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
+</vector>

app/src/main/res/drawable/ic_payment.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="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z" />
+</vector>

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>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <item
+        android:drawable="@drawable/ic_appicon_splashscreen"
+        android:gravity="center" />
+</layer-list>

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

@@ -9,6 +9,8 @@
 
         <import type="net.vonforst.evmap.api.goingelectric.Chargepoint" />
 
+        <import type="net.vonforst.evmap.api.goingelectric.ChargeCard" />
+
         <import type="net.vonforst.evmap.api.availability.ChargeLocationStatus" />
 
         <import type="net.vonforst.evmap.adapter.DataBindingAdaptersKt" />
@@ -25,12 +27,22 @@
             name="availability"
             type="Resource&lt;ChargeLocationStatus&gt;" />
 
+        <variable
+            name="chargeCards"
+            type="java.util.Map&lt;Long, ChargeCard&gt;" />
+
+        <variable
+            name="filteredChargeCards"
+            type="java.util.Set&lt;Long&gt;" />
+
     </data>
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/detail_corner_radius"
+        android:layout_marginBottom="@dimen/detail_corner_radius_negative"
+        android:paddingBottom="@dimen/detail_corner_radius"
         app:cardElevation="6dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -180,11 +192,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:nestedScrollingEnabled="false"
-                app:data="@{DataBindingAdaptersKt.buildDetails(charger.data, context)}"
+                app:data="@{DataBindingAdaptersKt.buildDetails(charger.data, chargeCards, filteredChargeCards, context)}"
                 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 +242,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>

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

@@ -0,0 +1,94 @@
+<?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"
+            android:imeOptions="actionDone"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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>

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" />
@@ -126,7 +126,9 @@
                 android:id="@+id/detail_view"
                 layout="@layout/detail_view"
                 app:charger="@{vm.charger}"
-                app:availability="@{vm.availability}" />
+                app:availability="@{vm.availability}"
+                app:chargeCards="@{vm.chargeCardMap}"
+                app:filteredChargeCards="@{vm.filteredChargeCards}" />
 
         </androidx.core.widget.NestedScrollView>
 
@@ -158,10 +160,13 @@
             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:srcCompat="@drawable/ic_layers"
+            app:layout_behavior="net.vonforst.evmap.ui.HideOnExpandFabBehavior"/>
 
         <androidx.cardview.widget.CardView
             android:id="@+id/layers_sheet"
@@ -170,6 +175,7 @@
             android:layout_gravity="top|end"
             android:layout_marginEnd="8dp"
             android:layout_marginTop="96dp"
+            android:elevation="-1dp"
             android:visibility="gone"
             tools:visibility="visible">
 

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

@@ -25,7 +25,6 @@
             android:layout_marginTop="18dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="14dp"
-            android:maxLines="1"
             android:text="@{item.text}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -0,0 +1,203 @@
+<?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: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:dayOfWeek="@{DayOfWeek.MONDAY}"
+            app:goneUnless="@{expandToggle.checked}"
+            app:hours="@{item.hoursDays}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
+            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/textView9"
+            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/textView9"
+            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/textView9"
+            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/textView9"
+            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/textView9"
+            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/textView9"
+            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/textView9"
+            app:layout_constraintTop_toBottomOf="@id/hours_sun" />
+
+        <ToggleButton
+            android:id="@+id/expandToggle"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="@{item.detailText != null ? @dimen/expand_toggle_padding_large : @dimen/expand_toggle_padding_small}"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/expand_toggle"
+            android:onClick="@{() -> TransitionManager.beginDelayedTransition(container)}"
+            android:textOff=""
+            android:textOn=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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>

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" />

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>

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

@@ -49,7 +49,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="16dp"
-            android:max="@{((SliderFilter) item.filter).max}"
+            android:max="@{((SliderFilter) item.filter).max -  ((SliderFilter) item.filter).min}"
             android:progress="@={progress}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/textView18"

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

@@ -6,7 +6,7 @@
 
         <import type="net.vonforst.evmap.viewmodel.MapViewModel" />
 
-        <import type="com.google.android.gms.maps.GoogleMap" />
+        <import type="com.google.android.libraries.maps.GoogleMap" />
 
         <variable
             name="vm"

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

@@ -0,0 +1,13 @@
+<?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>
+    <string-array name="pref_darkmode_names">
+        <item>Geräteeinstellung verwenden</item>
+        <item>immer an</item>
+        <item>immer aus</item>
+    </string-array>
+</resources>

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>
@@ -75,5 +77,32 @@
     <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="pref_darkmode">Dunkles Design</string>
+    <string name="pref_darkmode_summary">Einstellen, wann der Nachtmodus genutzt wird</string>
+    <string name="connection_error">Ladesäulen konnten nicht geladen werden</string>
+    <string name="retry">Wiederholen</string>
+    <string name="filter_open_247">24 Stunden geöffnet</string>
+    <string name="filter_barrierfree">Ohne Vertrag / Registrierung nutzbar</string>
+    <string name="filter_exclude_faults">Ladesäulen mit Störung ausschließen</string>
+    <string name="charge_cards">Ladetarife</string>
+    <string name="and_n_others">und %d weitere</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d kompatibler Ladetarif</item>
+        <item quantity="other">%d kompatible Ladetarife</item>
+    </plurals>
 </resources>

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>

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

@@ -0,0 +1,23 @@
+<?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>
+    <string-array name="pref_darkmode_names">
+        <item>Device default</item>
+        <item>always on</item>
+        <item>always off</item>
+    </string-array>
+    <string-array name="pref_darkmode_values" tranlatable="false">
+        <item>default</item>
+        <item>on</item>
+        <item>off</item>
+    </string-array>
+</resources>

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

@@ -7,8 +7,8 @@
     <color name="charger_100kw">#ffeb3b</color>
     <color name="charger_43kw">#ff9800</color>
     <color name="charger_20kw">#03a9f4</color>
-    <color name="charger_11kw">#607d8b</color>
-    <color name="charger_low">#9e9e9e</color>
+    <color name="charger_11kw">#9e9e9e</color>
+    <color name="charger_low">#607d8b</color>
     <color name="available">#4caf50</color>
     <color name="unavailable">#f44336</color>
     <color name="unknown">#9e9e9e</color>

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

@@ -3,4 +3,8 @@
     <dimen name="peek_height">72dp</dimen>
     <dimen name="gallery_height">200dp</dimen>
     <dimen name="gallery_height_with_margin">208dp</dimen>
+    <dimen name="detail_corner_radius">8dp</dimen>
+    <dimen name="detail_corner_radius_negative">-8dp</dimen>
+    <dimen name="expand_toggle_padding_large">16dp</dimen>
+    <dimen name="expand_toggle_padding_small">8dp</dimen>
 </resources>

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>
@@ -74,5 +76,32 @@
     <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="pref_darkmode">Dark mode</string>
+    <string name="pref_darkmode_summary">Set when dark mode is activated</string>
+    <string name="connection_error">Could not load charging stations</string>
+    <string name="retry">Retry</string>
+    <string name="filter_open_247">Available 24/7</string>
+    <string name="filter_barrierfree">Usable without registration</string>
+    <string name="filter_exclude_faults">Exclude chargers with reported faults</string>
+    <string name="charge_cards">Payment methods</string>
+    <string name="and_n_others">and %d others</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d compatible payment method</item>
+        <item quantity="other">%d compatible payment methods</item>
+    </plurals>
 </resources>

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

@@ -17,6 +17,10 @@
 
     <style name="AppTheme" parent="AppTheme.Base" />
 
+    <style name="AppTheme.LaunchScreen">
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+    </style>
+
     <style name="FullScreenDialogStyle" parent="AppTheme">
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowIsFloating">false</item>

app/src/main/res/xml/settings.xml

@@ -10,6 +10,21 @@
             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" />
+
+        <ListPreference
+            android:key="darkmode"
+            android:title="@string/pref_darkmode"
+            android:entries="@array/pref_darkmode_names"
+            android:entryValues="@array/pref_darkmode_values"
+            android:defaultValue="default"
+            android:summary="@string/pref_darkmode_summary" />
 
     </PreferenceCategory>
 </PreferenceScreen>

app/src/test/java/net/vonforst/evmap/TestUtils.kt

@@ -0,0 +1,16 @@
+package net.vonforst.evmap
+
+import net.vonforst.evmap.api.goingelectric.GoingElectricApiTest
+import okhttp3.mockwebserver.MockResponse
+import java.net.HttpURLConnection
+
+val notFoundResponse: MockResponse =
+    MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
+
+fun okResponse(file: String): MockResponse {
+    val body = readResource(file) ?: return notFoundResponse
+    return MockResponse().setResponseCode(HttpURLConnection.HTTP_OK).setBody(body)
+}
+
+private fun readResource(s: String) =
+    GoingElectricApiTest::class.java.getResource(s)?.readText()

app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
+import net.vonforst.evmap.okResponse
 import okhttp3.OkHttpClient
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
@@ -37,9 +38,7 @@ class NewMotionAvailabilityDetectorTest {
                 when (urlHead) {
                     "ge/chargepoints" -> {
                         val id = request.requestUrl.queryParameter("ge_id")
-                        val body = readResource("/chargers/$id.json") ?: return notFoundResponse
-                        return MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-                            .setBody(body)
+                        return okResponse("/chargers/$id.json")
                     }
                     "nm/markers" -> {
                         val urlTail = segments.subList(2, segments.size).joinToString("/")
@@ -48,16 +47,11 @@ class NewMotionAvailabilityDetectorTest {
                             "9.444284/9.644283999999999/54.376699/54.576699000000005" -> 18284
                             else -> -1
                         }
-                        val body =
-                            readResource("/newmotion/$id/markers.json") ?: return notFoundResponse
-                        return MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-                            .setBody(body)
+                        return okResponse("/newmotion/$id/markers.json")
                     }
                     "nm/locations" -> {
                         val id = segments.last()
-                        val body = readResource("/newmotion/$id.json") ?: return notFoundResponse
-                        return MockResponse().setResponseCode(HttpURLConnection.HTTP_OK)
-                            .setBody(body)
+                        return okResponse("/newmotion/$id.json")
                     }
                     else -> return notFoundResponse
                 }

app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt

@@ -0,0 +1,105 @@
+package net.vonforst.evmap.api.goingelectric
+
+import kotlinx.coroutines.runBlocking
+import net.vonforst.evmap.notFoundResponse
+import net.vonforst.evmap.okResponse
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class GoingElectricApiTest {
+    val api: GoingElectricApi
+    val webServer = MockWebServer()
+
+    init {
+        webServer.start()
+
+        val apikey = ""
+        val baseurl = webServer.url("/ge/").toString()
+        api = GoingElectricApi.create(apikey, baseurl)
+
+        webServer.dispatcher = object : Dispatcher() {
+            override fun dispatch(request: RecordedRequest): MockResponse {
+                val segments = request.requestUrl.pathSegments()
+                val urlHead = segments.subList(0, 2).joinToString("/")
+                when (urlHead) {
+                    "ge/chargepoints" -> {
+                        val id = request.requestUrl.queryParameter("ge_id")
+                        if (id != null) {
+                            return okResponse("/chargers/$id.json")
+                        } else {
+                            val freeparking =
+                                request.requestUrl.queryParameter("freeparking")!!.toBoolean()
+                            val freecharging =
+                                request.requestUrl.queryParameter("freecharging")!!.toBoolean()
+                            return if (freeparking && freecharging) {
+                                okResponse("/chargers/list-empty.json")
+                            } else if (freecharging) {
+                                okResponse("/chargers/list.json")
+                            } else {
+                                okResponse("/chargers/list-startkey.json")
+                            }
+                        }
+                    }
+                    else -> return notFoundResponse
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testLoadChargepointDetail() {
+        val response = api.getChargepointDetail(2105).execute()
+        assertTrue(response.isSuccessful)
+        val body = response.body()!!
+        assertEquals("ok", body.status)
+        assertEquals(null, body.startkey)
+        assertEquals(1, body.chargelocations.size)
+        val charger = body.chargelocations[0] as ChargeLocation
+        assertEquals(2105, charger.id)
+    }
+
+    @Test
+    fun testLoadChargepointList() {
+        val response = runBlocking {
+            api.getChargepoints(1.0, 1.0, 2.0, 2.0, 11f, freecharging = true)
+        }
+        assertTrue(response.isSuccessful)
+        val body = response.body()!!
+        assertEquals("ok", body.status)
+        assertEquals(null, body.startkey)
+        assertEquals(2, body.chargelocations.size)
+        val charger = body.chargelocations[0] as ChargeLocation
+        assertEquals(41161, charger.id)
+    }
+
+    @Test
+    fun testLoadChargepointListEmpty() {
+        val response = runBlocking {
+            api.getChargepoints(1.0, 1.0, 2.0, 2.0, 11f, freeparking = true, freecharging = true)
+        }
+        assertTrue(response.isSuccessful)
+        val body = response.body()!!
+        assertEquals("ok", body.status)
+        assertEquals(null, body.startkey)
+        assertEquals(0, body.chargelocations.size)
+    }
+
+    @Test
+    fun testLoadChargepointListStartkey() {
+        val response = runBlocking {
+            api.getChargepoints(1.0, 1.0, 2.0, 2.0, 1f)
+        }
+        assertTrue(response.isSuccessful)
+        val body = response.body()!!
+        assertEquals("ok", body.status)
+        assertEquals(2, body.startkey)
+        assertEquals(2, body.chargelocations.size)
+        val charger = body.chargelocations[0] as ChargeLocation
+        assertEquals(41161, charger.id)
+    }
+}

app/src/test/resources/chargers/list-empty.json

@@ -0,0 +1,5 @@
+{
+  "status": "ok",
+  "startkey": false,
+  "chargelocations": []
+}

app/src/test/resources/chargers/list-startkey.json

@@ -0,0 +1,61 @@
+{
+  "status": "ok",
+  "chargelocations": [
+    {
+      "chargepoints": [
+        {
+          "type": "Typ2",
+          "power": 22,
+          "count": 2
+        }
+      ],
+      "ge_id": 41161,
+      "name": "BMW Autohaus B&K",
+      "address": {
+        "city": "Hamburg",
+        "country": "Deutschland",
+        "postcode": "21073",
+        "street": "Buxtehuder Straße 112"
+      },
+      "coordinates": {
+        "lat": 53.469542,
+        "lng": 9.964063
+      },
+      "network": "Digital Energy Solutions",
+      "url": "//www.goingelectric.de/stromtankstellen/Deutschland/Hamburg/BMW-Autohaus-B-K-Buxtehuder-Strasse-112/41161/",
+      "fault_report": false,
+      "verified": false
+    },
+    {
+      "chargepoints": [
+        {
+          "type": "Typ2",
+          "power": 22,
+          "count": 2
+        },
+        {
+          "type": "Schuko",
+          "power": 3.6,
+          "count": 2
+        }
+      ],
+      "ge_id": 41226,
+      "name": "Saseler Chaussee",
+      "address": {
+        "city": "Hamburg",
+        "country": "Deutschland",
+        "postcode": "22393",
+        "street": "Saseler Chaussee 94a"
+      },
+      "coordinates": {
+        "lat": 53.644021,
+        "lng": 10.099783
+      },
+      "network": "Stromnetz Hamburg",
+      "url": "//www.goingelectric.de/stromtankstellen/Deutschland/Hamburg/Saseler-Chaussee-Saseler-Chaussee-94a/41226/",
+      "fault_report": false,
+      "verified": false
+    }
+  ],
+  "startkey": 2
+}

app/src/test/resources/chargers/list.json

@@ -0,0 +1,60 @@
+{
+  "status": "ok",
+  "chargelocations": [
+    {
+      "chargepoints": [
+        {
+          "type": "Typ2",
+          "power": 22,
+          "count": 2
+        }
+      ],
+      "ge_id": 41161,
+      "name": "BMW Autohaus B&K",
+      "address": {
+        "city": "Hamburg",
+        "country": "Deutschland",
+        "postcode": "21073",
+        "street": "Buxtehuder Straße 112"
+      },
+      "coordinates": {
+        "lat": 53.469542,
+        "lng": 9.964063
+      },
+      "network": "Digital Energy Solutions",
+      "url": "//www.goingelectric.de/stromtankstellen/Deutschland/Hamburg/BMW-Autohaus-B-K-Buxtehuder-Strasse-112/41161/",
+      "fault_report": false,
+      "verified": false
+    },
+    {
+      "chargepoints": [
+        {
+          "type": "Typ2",
+          "power": 22,
+          "count": 2
+        },
+        {
+          "type": "Schuko",
+          "power": 3.6,
+          "count": 2
+        }
+      ],
+      "ge_id": 41226,
+      "name": "Saseler Chaussee",
+      "address": {
+        "city": "Hamburg",
+        "country": "Deutschland",
+        "postcode": "22393",
+        "street": "Saseler Chaussee 94a"
+      },
+      "coordinates": {
+        "lat": 53.644021,
+        "lng": 10.099783
+      },
+      "network": "Stromnetz Hamburg",
+      "url": "//www.goingelectric.de/stromtankstellen/Deutschland/Hamburg/Saseler-Chaussee-Saseler-Chaussee-94a/41226/",
+      "fault_report": false,
+      "verified": false
+    }
+  ]
+}

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'
+        }
     }
 }