mirror of
https://github.com/ev-map/EVMap.git
synced 2025-12-27 09:07:46 -05:00
Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d63e37467 | ||
|
|
b5b0254bdd | ||
|
|
6514197920 | ||
|
|
4c5388350f | ||
|
|
20e9e43f0d | ||
|
|
541646dda9 | ||
|
|
b9354e77a9 | ||
|
|
65fa54ef36 | ||
|
|
6e419849b1 | ||
|
|
c4c6f09a05 | ||
|
|
3b602c03c4 | ||
|
|
012e5d7362 | ||
|
|
4f5007ca0d | ||
|
|
b40a74aa37 | ||
|
|
ce172bd4b0 | ||
|
|
b3bbca576f | ||
|
|
72ccd99c1f | ||
|
|
dd5c8659df | ||
|
|
8f7f9e5a09 | ||
|
|
8256981b8d | ||
|
|
5649ef202f | ||
|
|
ed9c729684 | ||
|
|
add66811ae |
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -34,3 +34,5 @@ jobs:
|
||||
run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
|
||||
- name: Run Android Lint
|
||||
run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
|
||||
- name: Check licenses
|
||||
run: ./gradlew exportLibraryDefinitions --no-daemon
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -12,4 +12,5 @@ apikeys.xml
|
||||
/app/**/*.apk
|
||||
/_img/connectors/*.ai
|
||||
api-7125266970515251116-798419-8e2dda660c80.json
|
||||
output-metadata.json
|
||||
output-metadata.json
|
||||
licenses_*.csv
|
||||
15
README.md
15
README.md
@@ -84,6 +84,17 @@ into new languages.
|
||||
Sponsors
|
||||
--------
|
||||
|
||||
Many users currently support the development EVMap with their donations. You can find more
|
||||
information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
|
||||
|
||||
<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="58"/></a><br>
|
||||
Since mid 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
|
||||
free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
|
||||
Since May 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
|
||||
free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
|
||||
|
||||
<a href="https://chargeprice.app"><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/powered_by_chargeprice.svg" alt="Powered by Chargeprice" height="58"/></a><br>
|
||||
Since April 2021, **Chargeprice.app** provide their price comparison API at a greatly reduced
|
||||
price for EVMap. This data is used in EVMap's price comparison feature.
|
||||
|
||||
<a href="https://fronyx.io/"><img src="https://github.com/ev-map/EVMap/blob/master/_img/powered_by_fronyx.svg" alt="Powered by Fronyx" height="68"/></a><br>
|
||||
Since September 2022, for certain charging stations, **Fronyx** provide us free access to their API
|
||||
for availability predictions.
|
||||
23
_tools/export_licenses_faurecia.py
Normal file
23
_tools/export_licenses_faurecia.py
Normal file
@@ -0,0 +1,23 @@
|
||||
import subprocess
|
||||
import json
|
||||
|
||||
build_types = ["fossNormalRelease", "fossAutomotiveRelease"]
|
||||
|
||||
for build_type in build_types:
|
||||
result = subprocess.run(["gradlew.bat", f"generateLibraryDefinitions{build_type.capitalize()}"],
|
||||
capture_output=True)
|
||||
|
||||
data = json.load(
|
||||
open(f"app/build/generated/aboutLibraries/{build_type}/res/raw/aboutlibraries.json"))
|
||||
|
||||
with open(f"licenses_{build_type}.csv", "w") as f:
|
||||
f.write("component_name;license_title;license_url;public_repository;copyrights\n")
|
||||
for lib in data["libraries"]:
|
||||
license = data["licenses"][lib["licenses"][0]] if len(lib["licenses"]) > 0 else None
|
||||
license_name = license["name"] if license is not None else " "
|
||||
license_url = license["url"] if license is not None else " "
|
||||
copyrights = ", ".join([dev["name"] for dev in lib["developers"] if "name" in dev])
|
||||
if copyrights == "":
|
||||
copyrights = " "
|
||||
repo_url = lib['scm']['url'] if 'scm' in lib else ''
|
||||
f.write(f"{lib['name']};{license_name};{license_url};\"{copyrights}\";{repo_url}\n")
|
||||
@@ -12,14 +12,16 @@ plugins {
|
||||
|
||||
|
||||
android {
|
||||
useLibrary("android.car")
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "net.vonforst.evmap"
|
||||
compileSdk = 34
|
||||
minSdk = 21
|
||||
targetSdk = 34
|
||||
// NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
|
||||
versionCode = 214
|
||||
versionName = "1.9.0"
|
||||
versionCode = 222
|
||||
versionName = "1.9.2"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -250,10 +252,14 @@ configurations {
|
||||
|
||||
aboutLibraries {
|
||||
allowedLicenses = arrayOf(
|
||||
"Apache-2.0", "mit", "BSD-2-Clause",
|
||||
"Apache-2.0", "mit", "BSD-2-Clause", "BSD-3-Clause", "EPL-1.0",
|
||||
"asdkl", // Android SDK
|
||||
"Dual OpenSSL and SSLeay License", // Android NDK OpenSSL
|
||||
"Google Maps Platform Terms of Service" // Google Maps SDK
|
||||
"Google Maps Platform Terms of Service", // Google Maps SDK
|
||||
"provided without support or warranty", // org.json
|
||||
"Unicode/ICU License", // icu4j
|
||||
"Bouncy Castle Licence", // bcprov
|
||||
"CDDL + GPLv2 with classpath exception", // javax.annotation-api
|
||||
)
|
||||
strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
|
||||
}
|
||||
@@ -269,29 +275,29 @@ dependencies {
|
||||
val testGoogleImplementation by configurations
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
|
||||
implementation("androidx.appcompat:appcompat:1.6.1")
|
||||
implementation("androidx.core:core-ktx:1.12.0")
|
||||
implementation("androidx.appcompat:appcompat:1.7.0")
|
||||
implementation("androidx.core:core-ktx:1.13.1")
|
||||
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||
implementation("androidx.activity:activity-ktx:1.8.2")
|
||||
implementation("androidx.fragment:fragment-ktx:1.6.2")
|
||||
implementation("androidx.activity:activity-ktx:1.9.0")
|
||||
implementation("androidx.fragment:fragment-ktx:1.7.1")
|
||||
implementation("androidx.cardview:cardview:1.0.0")
|
||||
implementation("androidx.preference:preference-ktx:1.2.1")
|
||||
implementation("com.google.android.material:material:1.11.0")
|
||||
implementation("com.google.android.material:material:1.12.0")
|
||||
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
||||
implementation("androidx.recyclerview:recyclerview:1.3.2")
|
||||
implementation("androidx.browser:browser:1.7.0")
|
||||
implementation("androidx.browser:browser:1.8.0")
|
||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
||||
implementation("androidx.security:security-crypto:1.1.0-alpha06")
|
||||
implementation("androidx.work:work-runtime-ktx:2.9.0")
|
||||
implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
|
||||
implementation("com.squareup.retrofit2:retrofit:2.9.0")
|
||||
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.11.0")
|
||||
implementation("com.squareup.okhttp3:okhttp-urlconnection:4.11.0")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||
implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
|
||||
implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
|
||||
implementation("com.squareup.moshi:moshi-adapters:1.15.0")
|
||||
implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
|
||||
implementation("io.coil-kt:coil:2.4.0")
|
||||
implementation("io.coil-kt:coil:2.6.0")
|
||||
implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
|
||||
implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
|
||||
implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
|
||||
@@ -302,20 +308,23 @@ dependencies {
|
||||
implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
|
||||
|
||||
// Android Auto
|
||||
val carAppVersion = "1.7.0-alpha02"
|
||||
val carAppVersion = "1.4.0"
|
||||
implementation("androidx.car.app:app:$carAppVersion")
|
||||
normalImplementation("androidx.car.app:app-projected:$carAppVersion")
|
||||
automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
|
||||
|
||||
// AnyMaps
|
||||
val anyMapsVersion = "c087b3e7c2"
|
||||
val anyMapsVersion = "a5b9abca40"
|
||||
implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
|
||||
googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
|
||||
googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
|
||||
implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion")
|
||||
implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
|
||||
// duplicates classes from mapbox-sdk-services
|
||||
exclude("org.maplibre.gl", "android-sdk-geojson")
|
||||
}
|
||||
|
||||
// Google Places
|
||||
googleImplementation("com.google.android.libraries.places:places:3.3.0")
|
||||
googleImplementation("com.google.android.libraries.places:places:3.5.0")
|
||||
googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
|
||||
|
||||
// Mapbox Geocoding
|
||||
@@ -326,7 +335,7 @@ dependencies {
|
||||
implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
|
||||
|
||||
// viewmodel library
|
||||
val lifecycle_version = "2.6.2"
|
||||
val lifecycle_version = "2.8.1"
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
|
||||
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
|
||||
|
||||
@@ -341,7 +350,7 @@ dependencies {
|
||||
implementation("com.github.EV-map:android-spatialite:e5495c83ad") // version with minSdk increased to 21 & FORTIFY_SOURCE enabled
|
||||
|
||||
// billing library
|
||||
val billing_version = "6.1.0"
|
||||
val billing_version = "7.0.0"
|
||||
googleImplementation("com.android.billingclient:billing:$billing_version")
|
||||
googleImplementation("com.android.billingclient:billing-ktx:$billing_version")
|
||||
|
||||
@@ -358,7 +367,7 @@ dependencies {
|
||||
|
||||
// testing
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
|
||||
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
|
||||
//noinspection GradleDependency
|
||||
testImplementation("org.json:json:20080701")
|
||||
testImplementation("org.robolectric:robolectric:4.11.1")
|
||||
|
||||
171
app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
Normal file
171
app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
Normal file
@@ -0,0 +1,171 @@
|
||||
import android.car.Car
|
||||
import android.car.VehiclePropertyIds
|
||||
import android.car.VehicleUnit
|
||||
import android.car.hardware.CarPropertyValue
|
||||
import android.car.hardware.property.CarPropertyManager
|
||||
import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback
|
||||
import androidx.annotation.OptIn
|
||||
import androidx.car.app.CarContext
|
||||
import androidx.car.app.annotations.ExperimentalCarApi
|
||||
import androidx.car.app.hardware.CarHardwareManager
|
||||
import androidx.car.app.hardware.common.CarUnit
|
||||
import androidx.car.app.hardware.common.CarValue
|
||||
import androidx.car.app.hardware.common.OnCarDataAvailableListener
|
||||
import androidx.car.app.hardware.info.CarInfo
|
||||
import androidx.car.app.hardware.info.EnergyLevel
|
||||
import androidx.car.app.hardware.info.EnergyProfile
|
||||
import androidx.car.app.hardware.info.EvStatus
|
||||
import androidx.car.app.hardware.info.Mileage
|
||||
import androidx.car.app.hardware.info.Model
|
||||
import androidx.car.app.hardware.info.Speed
|
||||
import androidx.car.app.hardware.info.TollCard
|
||||
import java.util.concurrent.Executor
|
||||
|
||||
|
||||
val CarContext.patchedCarInfo: CarInfo
|
||||
get() = CarInfoWrapper(this)
|
||||
|
||||
class CarInfoWrapper(ctx: CarContext) : CarInfo {
|
||||
private val wrapped =
|
||||
(ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
|
||||
private val carPropertyManager = try {
|
||||
val car = Car.createCar(ctx)
|
||||
car.getCarManager(Car.PROPERTY_SERVICE) as CarPropertyManager
|
||||
} catch (e: NoClassDefFoundError) {
|
||||
null
|
||||
}
|
||||
private val callbacks = mutableMapOf<OnCarDataAvailableListener<*>, CarPropertyEventCallback>()
|
||||
|
||||
override fun fetchModel(executor: Executor, listener: OnCarDataAvailableListener<Model>) =
|
||||
wrapped.fetchModel(executor, listener)
|
||||
|
||||
override fun fetchEnergyProfile(
|
||||
executor: Executor,
|
||||
listener: OnCarDataAvailableListener<EnergyProfile>
|
||||
) = wrapped.fetchEnergyProfile(executor, listener)
|
||||
|
||||
override fun addTollListener(
|
||||
executor: Executor,
|
||||
listener: OnCarDataAvailableListener<TollCard>
|
||||
) = wrapped.addTollListener(executor, listener)
|
||||
|
||||
override fun removeTollListener(listener: OnCarDataAvailableListener<TollCard>) =
|
||||
wrapped.removeTollListener(listener)
|
||||
|
||||
override fun addEnergyLevelListener(
|
||||
executor: Executor,
|
||||
listener: OnCarDataAvailableListener<EnergyLevel>
|
||||
) = wrapped.addEnergyLevelListener(executor, listener)
|
||||
|
||||
override fun removeEnergyLevelListener(listener: OnCarDataAvailableListener<EnergyLevel>) =
|
||||
wrapped.removeEnergyLevelListener(listener)
|
||||
|
||||
override fun addSpeedListener(executor: Executor, listener: OnCarDataAvailableListener<Speed>) {
|
||||
// TODO: This is a emporary workaround until Car App Library 1.7.0 is released - previous versions would crash if the car reported an invalid speed display unit
|
||||
carPropertyManager ?: return
|
||||
val callback = object : CarPropertyEventCallback {
|
||||
private var speedRaw: CarPropertyValue<Float>? = null
|
||||
private var speedDisplay: CarPropertyValue<Float>? = null
|
||||
private var speedUnit: CarPropertyValue<Int>? = null
|
||||
|
||||
override fun onChangeEvent(value: CarPropertyValue<*>?) {
|
||||
when (value?.propertyId) {
|
||||
VehiclePropertyIds.PERF_VEHICLE_SPEED -> speedRaw =
|
||||
value as CarPropertyValue<Float>?
|
||||
|
||||
VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY -> speedDisplay =
|
||||
value as CarPropertyValue<Float>?
|
||||
|
||||
VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS -> speedUnit =
|
||||
value as CarPropertyValue<Int>?
|
||||
}
|
||||
|
||||
executor.execute {
|
||||
listener.onCarDataAvailable(Speed.Builder().apply {
|
||||
speedRaw?.let {
|
||||
setRawSpeedMetersPerSecond(
|
||||
CarValue(
|
||||
it.value,
|
||||
it.timestamp,
|
||||
if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
|
||||
)
|
||||
)
|
||||
}
|
||||
speedDisplay?.let {
|
||||
setDisplaySpeedMetersPerSecond(
|
||||
CarValue(
|
||||
it.value,
|
||||
it.timestamp,
|
||||
if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
|
||||
)
|
||||
)
|
||||
}
|
||||
speedUnit?.let {
|
||||
val unit = when (it.value) {
|
||||
VehicleUnit.METER_PER_SEC -> CarUnit.METERS_PER_SEC
|
||||
VehicleUnit.MILES_PER_HOUR -> CarUnit.MILES_PER_HOUR
|
||||
VehicleUnit.KILOMETERS_PER_HOUR -> CarUnit.KILOMETERS_PER_HOUR
|
||||
else -> null
|
||||
}
|
||||
setSpeedDisplayUnit(
|
||||
CarValue(
|
||||
unit,
|
||||
it.timestamp,
|
||||
if (unit != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
|
||||
)
|
||||
)
|
||||
}
|
||||
}.build())
|
||||
}
|
||||
}
|
||||
|
||||
override fun onErrorEvent(propertyId: Int, areaId: Int) {
|
||||
listener.onCarDataAvailable(
|
||||
Speed.Builder()
|
||||
.setRawSpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
|
||||
.setDisplaySpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
|
||||
.setSpeedDisplayUnit(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
|
||||
.build()
|
||||
)
|
||||
}
|
||||
}
|
||||
carPropertyManager.registerCallback(
|
||||
callback,
|
||||
VehiclePropertyIds.PERF_VEHICLE_SPEED,
|
||||
CarPropertyManager.SENSOR_RATE_NORMAL
|
||||
)
|
||||
carPropertyManager.registerCallback(
|
||||
callback,
|
||||
VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY,
|
||||
CarPropertyManager.SENSOR_RATE_NORMAL
|
||||
)
|
||||
carPropertyManager.registerCallback(
|
||||
callback,
|
||||
VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
|
||||
CarPropertyManager.SENSOR_RATE_NORMAL
|
||||
)
|
||||
}
|
||||
|
||||
override fun removeSpeedListener(listener: OnCarDataAvailableListener<Speed>) {
|
||||
val callback = callbacks[listener] ?: return
|
||||
carPropertyManager?.unregisterCallback(callback)
|
||||
}
|
||||
|
||||
override fun addMileageListener(
|
||||
executor: Executor,
|
||||
listener: OnCarDataAvailableListener<Mileage>
|
||||
) = wrapped.addMileageListener(executor, listener)
|
||||
|
||||
override fun removeMileageListener(listener: OnCarDataAvailableListener<Mileage>) =
|
||||
wrapped.removeMileageListener(listener)
|
||||
|
||||
@OptIn(ExperimentalCarApi::class)
|
||||
override fun addEvStatusListener(
|
||||
executor: Executor,
|
||||
listener: OnCarDataAvailableListener<EvStatus>
|
||||
) = wrapped.addEvStatusListener(executor, listener)
|
||||
|
||||
@OptIn(ExperimentalCarApi::class)
|
||||
override fun removeEvStatusListener(listener: OnCarDataAvailableListener<EvStatus>) =
|
||||
wrapped.removeEvStatusListener(listener)
|
||||
}
|
||||
@@ -347,9 +347,8 @@
|
||||
android:exported="true"
|
||||
android:foregroundServiceType="location">
|
||||
<intent-filter>
|
||||
<action
|
||||
android:name="androidx.car.app.CarAppService"
|
||||
android:category="androidx.car.app.category.POI" />
|
||||
<action android:name="androidx.car.app.CarAppService" />
|
||||
<category android:name="androidx.car.app.category.POI" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
|
||||
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.ListAdapter
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import coil.load
|
||||
import coil.memory.MemoryCache
|
||||
import net.vonforst.evmap.BuildConfig
|
||||
import net.vonforst.evmap.R
|
||||
import net.vonforst.evmap.model.ChargerPhoto
|
||||
|
||||
@@ -71,7 +70,7 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
|
||||
memoryKeys[item.id] = metadata.memoryCacheKey
|
||||
}
|
||||
)
|
||||
allowHardware(!BuildConfig.DEBUG)
|
||||
allowHardware(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,6 +244,8 @@ class OpenChargeMapApiWrapper(
|
||||
return Resource.success(ChargepointList(result, data.size < 499))
|
||||
} catch (e: IOException) {
|
||||
return Resource.error(e.message, null)
|
||||
} catch (e: HttpException) {
|
||||
return Resource.error(e.message, null)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -549,7 +549,11 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
|
||||
CarContext.ACTION_NAVIGATE,
|
||||
Uri.parse("geo:${coord.lat},${coord.lng}")
|
||||
)
|
||||
carContext.startCarApp(intent)
|
||||
try {
|
||||
carContext.startCarApp(intent)
|
||||
} catch (e: UnsupportedOperationException) {
|
||||
CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
private fun loadCharger() {
|
||||
|
||||
@@ -14,7 +14,11 @@ import androidx.car.app.CarToast
|
||||
import androidx.car.app.Screen
|
||||
import androidx.car.app.constraints.ConstraintManager
|
||||
import androidx.car.app.hardware.common.CarUnit
|
||||
import androidx.car.app.model.*
|
||||
import androidx.car.app.model.CarColor
|
||||
import androidx.car.app.model.CarIcon
|
||||
import androidx.car.app.model.Distance
|
||||
import androidx.car.app.model.MessageTemplate
|
||||
import androidx.car.app.model.Template
|
||||
import androidx.car.app.versioning.CarAppApiLevels
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.drawable.IconCompat
|
||||
@@ -26,7 +30,7 @@ import net.vonforst.evmap.getPackageInfoCompat
|
||||
import net.vonforst.evmap.kmPerMile
|
||||
import net.vonforst.evmap.shouldUseImperialUnits
|
||||
import net.vonforst.evmap.ydPerMile
|
||||
import java.util.*
|
||||
import java.util.Locale
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
|
||||
@@ -207,7 +211,9 @@ fun supportsCarApiLevel3(ctx: CarContext): Boolean {
|
||||
val version = getAndroidAutoVersion(ctx)
|
||||
// Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
|
||||
// but crashes when using it. See: https://issuetracker.google.com/issues/199509584
|
||||
if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
|
||||
val major = version[0].toIntOrNull() ?: return false
|
||||
val minor = version[1].toIntOrNull() ?: return false
|
||||
if (major < 6 || major < 6 && minor < 7) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,9 +6,18 @@ import android.os.Handler
|
||||
import android.os.Looper
|
||||
import androidx.car.app.CarContext
|
||||
import androidx.car.app.Screen
|
||||
import androidx.car.app.hardware.CarHardwareManager
|
||||
import androidx.car.app.hardware.info.*
|
||||
import androidx.car.app.model.*
|
||||
import androidx.car.app.hardware.info.CarSensors
|
||||
import androidx.car.app.hardware.info.Compass
|
||||
import androidx.car.app.hardware.info.EnergyLevel
|
||||
import androidx.car.app.hardware.info.Model
|
||||
import androidx.car.app.hardware.info.Speed
|
||||
import androidx.car.app.model.Action
|
||||
import androidx.car.app.model.CarColor
|
||||
import androidx.car.app.model.CarIcon
|
||||
import androidx.car.app.model.GridItem
|
||||
import androidx.car.app.model.GridTemplate
|
||||
import androidx.car.app.model.ItemList
|
||||
import androidx.car.app.model.Template
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.drawable.IconCompat
|
||||
import androidx.lifecycle.DefaultLifecycleObserver
|
||||
@@ -18,14 +27,14 @@ import net.vonforst.evmap.R
|
||||
import net.vonforst.evmap.ui.CompassNeedle
|
||||
import net.vonforst.evmap.ui.Gauge
|
||||
import net.vonforst.evmap.utils.formatDecimal
|
||||
import patchedCarInfo
|
||||
import kotlin.math.min
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
@androidx.car.app.annotations.ExperimentalCarApi
|
||||
class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
|
||||
LocationAwareScreen, DefaultLifecycleObserver {
|
||||
private val carInfo =
|
||||
(ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
|
||||
private val carInfo = carContext.patchedCarInfo
|
||||
private val carSensors = carContext.patchedCarSensors
|
||||
private var model: Model? = null
|
||||
private var energyLevel: EnergyLevel? = null
|
||||
|
||||
@@ -864,6 +864,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
|
||||
if (photo == photos[position] && imageCacheKey != null) {
|
||||
placeholderMemoryCacheKey(imageCacheKey)
|
||||
}
|
||||
allowHardware(false)
|
||||
}
|
||||
}
|
||||
.withTransitionFrom(view as ImageView)
|
||||
|
||||
@@ -383,4 +383,5 @@
|
||||
<string name="pref_chargeprice_native_integration">Porovnání cen v EVMap</string>
|
||||
<string name="pref_chargeprice_native_integration_on">Data o cenách budou zobrazena přímo v EVMap</string>
|
||||
<string name="pref_chargeprice_native_integration_off">Tlačítko porovnání cen bude odkazovat na aplikaci nebo web Chargeprice</string>
|
||||
<string name="pref_provider_osm">OpenStreetMap</string>
|
||||
</resources>
|
||||
@@ -383,4 +383,5 @@
|
||||
<string name="pref_chargeprice_native_integration">Comparação de preços no EVMap</string>
|
||||
<string name="pref_chargeprice_native_integration_on">Os preços serão exibidos diretamente no EVMap</string>
|
||||
<string name="pref_chargeprice_native_integration_off">O botão de comparação de preços abrirá a app ou site do Chargeprice</string>
|
||||
<string name="pref_provider_osm">OpenStreetMap</string>
|
||||
</resources>
|
||||
6
app/src/normal/java/auto/CarInfo.kt
Normal file
6
app/src/normal/java/auto/CarInfo.kt
Normal file
@@ -0,0 +1,6 @@
|
||||
import androidx.car.app.CarContext
|
||||
import androidx.car.app.hardware.CarHardwareManager
|
||||
import androidx.car.app.hardware.info.CarInfo
|
||||
|
||||
val CarContext.patchedCarInfo: CarInfo
|
||||
get() = (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
|
||||
@@ -1,9 +1,9 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
val kotlinVersion by extra("1.9.10")
|
||||
val kotlinVersion by extra("1.9.24")
|
||||
val aboutLibsVersion by extra("10.9.1")
|
||||
val navVersion by extra("2.7.5")
|
||||
val navVersion by extra("2.7.7")
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
|
||||
2
fastlane/metadata/android/de-DE/changelogs/220.txt
Normal file
2
fastlane/metadata/android/de-DE/changelogs/220.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
Fehler behoben:
|
||||
- Unterstützung für Geräte mit OpenGL ES 2.0 wiederhergestellt
|
||||
2
fastlane/metadata/android/de-DE/changelogs/222.txt
Normal file
2
fastlane/metadata/android/de-DE/changelogs/222.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
Fehler behoben:
|
||||
- Abstürze behoben
|
||||
2
fastlane/metadata/android/en-US/changelogs/220.txt
Normal file
2
fastlane/metadata/android/en-US/changelogs/220.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
Bugfixes:
|
||||
- Restored support for devices with OpenGL ES 2.0
|
||||
2
fastlane/metadata/android/en-US/changelogs/222.txt
Normal file
2
fastlane/metadata/android/en-US/changelogs/222.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
Bugfixes:
|
||||
- Fixed crashes
|
||||
Reference in New Issue
Block a user