Release 0.3.2

(necessary for F-Droid)

.gitignore

@@ -8,5 +8,6 @@
 .externalNativeBuild
 .cxx
 apikeys.xml
-/app/release/app-release.aab
+/app/**/*.aab
+/app/**/*.apk
 /_img/connectors/*.ai

app/build.gradle

@@ -13,14 +13,23 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 21
-        versionName "0.3.0"
+        versionCode 23
+        versionName "0.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
-        release
+        release {
+            def isRunningOnTravis = System.getenv("CI") == "true"
+            if (isRunningOnTravis) {
+                // configure keystore
+                storeFile = file("../_ci/keystore.jks")
+                storePassword = System.getenv("keystore_password")
+                keyAlias = System.getenv("keystore_alias")
+                keyPassword = System.getenv("keystore_alias_password")
+            }
+        }
     }
 
     buildTypes {
@@ -47,15 +56,6 @@ android {
         }
     }
 
-    def isRunningOnTravis = System.getenv("CI") == "true"
-    if (isRunningOnTravis) {
-        // configure keystore
-        signingConfigs.release.storeFile = file("../_ci/keystore.jks")
-        signingConfigs.release.storePassword = System.getenv("keystore_password")
-        signingConfigs.release.keyAlias = System.getenv("keystore_alias")
-        signingConfigs.release.keyPassword = System.getenv("keystore_alias_password")
-    }
-
     compileOptions {
         coreLibraryDesugaringEnabled true
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -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
         }
@@ -116,7 +116,7 @@ dependencies {
     implementation 'com.mapzen.android:lost:3.0.2'
 
     // AnyMaps
-    def anyMapsVersion = 'cc2a044656'
+    def anyMapsVersion = 'e6e014dd11'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
     implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"

app/src/google/res/values/values.xml

@@ -8,6 +8,6 @@
         <item>google</item>
         <item>mapbox</item>
     </string-array>
-    <string name="pref_map_provider_default" translatable="false">mapbox</string>
+    <string name="pref_map_provider_default" translatable="false">google</string>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 30% off every donation.</string>
 </resources>

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

@@ -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

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

@@ -41,7 +41,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:contentDescription="@{item.contentDescription}"
-            android:tint="?colorPrimary"
+            app:tint="?colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@{item.icon}"

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

@@ -47,7 +47,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:contentDescription="@{item.contentDescription}"
-            android:tint="?colorPrimary"
+            app:tint="?colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@{item.icon}"

build.gradle

@@ -25,7 +25,7 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
-        maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         flatDir {
             dirs 'libs'
         }