Compare commits

...

3 Commits
0.3.1 ... 0.3.2

Author SHA1 Message Date
Johan von Forstner
19a8b5c9fe Release 0.3.2 2020-08-12 19:50:54 +02:00
Johan von Forstner
7f3c481dcb allow to configure API keys with Gradle properties
(necessary for F-Droid)
2020-08-12 19:50:31 +02:00
Johan von Forstner
8a54b5cb05 SliderFilter: fix default value for min > 0 2020-08-12 19:30:57 +02:00
2 changed files with 7 additions and 7 deletions

View File

@@ -13,8 +13,8 @@ android {
applicationId "net.vonforst.evmap"
minSdkVersion 21
targetSdkVersion 29
versionCode 22
versionName "0.3.1"
versionCode 23
versionName "0.3.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -73,15 +73,15 @@ android {
// add API keys from environment variable if not set in apikeys.xml
applicationVariants.all { variant ->
ext.env = System.getenv()
def goingelectricKey = env.GOINGELECTRIC_API_KEY
def goingelectricKey = env.GOINGELECTRIC_API_KEY ?: project.findProperty("GOINGELECTRIC_API_KEY")
if (goingelectricKey != null) {
variant.resValue "string", "goingelectric_key", goingelectricKey
}
def googleMapsKey = env.GOOGLE_MAPS_API_KEY
def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
if (googleMapsKey != null) {
variant.resValue "string", "google_maps_key", googleMapsKey
}
def mapboxKey = env.MAPBOX_API_KEY
def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
if (mapboxKey != null) {
variant.resValue "string", "mapbox_key", mapboxKey
}

View File

@@ -193,7 +193,7 @@ data class SliderFilter(
val unit: String? = ""
) : Filter<SliderFilterValue>() {
override val valueClass: KClass<SliderFilterValue> = SliderFilterValue::class
override fun defaultValue() = SliderFilterValue(key, 0)
override fun defaultValue() = SliderFilterValue(key, min)
}
sealed class FilterValue : BaseObservable(), Equatable {
@@ -230,4 +230,4 @@ data class SliderFilterValue(
var value: Int
) : FilterValue()
data class FilterWithValue<T : FilterValue>(val filter: Filter<T>, val value: T) : Equatable
data class FilterWithValue<T : FilterValue>(val filter: Filter<T>, val value: T) : Equatable