diff --git a/app/build.gradle b/app/build.gradle index a1eca76..647154b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId 'org.y20k.trackbook' minSdkVersion 25 targetSdkVersion 27 - versionCode 37 - versionName '2.0.0' + versionCode 38 + versionName '2.0.1' resConfigs "en", "da", "de", "fr", "id", "it", "ja", "nb-rNO", "nl", "sv", "zh-rCN" } diff --git a/app/src/main/java/org/y20k/trackbook/helpers/ImportHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/ImportHelper.kt index 6b42d79..7c7f28b 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/ImportHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/ImportHelper.kt @@ -19,6 +19,7 @@ package org.y20k.trackbook.helpers import android.content.Context import android.location.Location +import androidx.annotation.Keep import com.google.gson.GsonBuilder import com.google.gson.annotations.SerializedName import kotlinx.coroutines.GlobalScope @@ -93,6 +94,7 @@ object ImportHelper { * Inner class: Legacy version of Track - used for one-time import only * Warning: Works only as long as targetSdkVersion < 28 */ + @Keep private data class LegacyTrack ( @SerializedName("b") var mTrackFormatVersion: Int = 0, @SerializedName("c") var mWayPoints: List, @@ -150,11 +152,12 @@ object ImportHelper { * Inner class: Legacy version of WayPoint - used for one-time import only * Warning: Works only as long as targetSdkVersion < 28 */ + @Keep private data class LegacyWayPoint ( - var mLocation: Location, - var mIsStopOver: Boolean = false, - var mDistanceToStartingPoint: Float = 0f, - var mNumberSatellites: Int = 0) { + @SerializedName("a") var mLocation: Location, + @SerializedName("b") var mIsStopOver: Boolean = false, + @SerializedName("c") var mDistanceToStartingPoint: Float = 0f, + @SerializedName("d") var mNumberSatellites: Int = 0) { } /* * End of inner class diff --git a/assets/featureGraphic.png b/assets/featureGraphic.png index e891841..66d4650 100644 Binary files a/assets/featureGraphic.png and b/assets/featureGraphic.png differ diff --git a/assets/featureGraphic.svg b/assets/featureGraphic.svg index 084548d..5d79fbb 100644 --- a/assets/featureGraphic.svg +++ b/assets/featureGraphic.svg @@ -15,9 +15,9 @@ viewBox="0 0 270.13959 132.29167" version="1.1" id="svg872" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="featureGraphic.svg" - inkscape:export-filename="/Users/solaris/Desktop/trackbook/assets/featureGraphic.png" + inkscape:export-filename="/home/solaris/Desktop/trackbook/assets/featureGraphic.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> @@ -391,484 +391,468 @@ diff --git a/assets/trackbook-app-icon-current.png b/assets/trackbook-app-icon-current.png index 3689a32..f3be99a 100644 Binary files a/assets/trackbook-app-icon-current.png and b/assets/trackbook-app-icon-current.png differ diff --git a/assets/trackbook-app-icon-current.svg b/assets/trackbook-app-icon-current.svg index d26aae7..f1f50c1 100644 --- a/assets/trackbook-app-icon-current.svg +++ b/assets/trackbook-app-icon-current.svg @@ -5,8 +5,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve" width="108pt" height="108pt" viewBox="0 0 144.00001 144.00001" sodipodi:docname="trackbook-app-icon-current.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" inkscape:export-filename="/Users/solaris/Desktop/trackbook2/assets/trackbook-app-icon-current-foreground.png" - inkscape:export-xdpi="600" inkscape:export-ydpi="600">image/svg+xml