From f8bdae78cd3409be47542dc55ac9ac4d5da65302 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sat, 8 Oct 2022 12:49:33 +0200 Subject: [PATCH] add option to disable predictions --- .../java/net/vonforst/evmap/storage/PreferenceDataSource.kt | 3 +++ .../main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt | 2 ++ app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/settings_data.xml | 6 ++++++ 5 files changed, 15 insertions(+) diff --git a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt index d6198874..e033dcc8 100644 --- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt +++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt @@ -246,4 +246,7 @@ class PreferenceDataSource(val context: Context) { set(value) { sp.edit().putString("place_search_result_android_auto_name", value).apply() } + + val predictionEnabled: Boolean + get() = sp.getBoolean("prediction_enabled", true) } \ No newline at end of file diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt index e7f2ae79..ea4c0082 100644 --- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt @@ -215,6 +215,8 @@ class MapViewModel(application: Application, private val state: SavedStateHandle val prediction: LiveData>> by lazy { availability.switchMap { av -> + if (!prefs.predictionEnabled) return@switchMap null + av.data?.evseIds?.let { evseIds -> liveData { emit(Resource.loading(null)) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e0f209a9..6aa071fb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -277,4 +277,6 @@ %1$d/%2$d verfügbar %1$d/%2$d verfügbar + Auslastungsprognosen anzeigen + für unterstützte Ladestationen\n(momentan nur Schnellader in Deutschland) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 63e79829..6e2275f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -276,4 +276,6 @@ %1$d/%2$d available %1$d/%2$d available + Show utilization predictions + for supported chargers\n(currently only DC in Germany) diff --git a/app/src/main/res/xml/settings_data.xml b/app/src/main/res/xml/settings_data.xml index 44f2baf6..108bc4d1 100644 --- a/app/src/main/res/xml/settings_data.xml +++ b/app/src/main/res/xml/settings_data.xml @@ -9,6 +9,12 @@ android:entryValues="@array/pref_data_source_values" android:defaultValue="goingelectric" app:useSimpleSummaryProvider="true" /> + +