From 369b7d94108a52d34f292ec0310b84e646801397 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Wed, 28 Apr 2021 22:41:08 +0200
Subject: [PATCH] Chargeprice: implement currency selection (#86)

---
 .../evmap/storage/PreferenceDataSource.kt     |  6 ++++
 .../net/vonforst/evmap/ui/BindingAdapters.kt  |  2 +-
 .../evmap/viewmodel/ChargepriceViewModel.kt   |  3 +-
 app/src/main/res/values-de/strings.xml        | 15 ++++++++++
 app/src/main/res/values/arrays.xml            | 28 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/settings.xml             |  6 ++++
 7 files changed, 59 insertions(+), 2 deletions(-)

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 0ed3d474..888abb33 100644
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -122,4 +122,10 @@ class PreferenceDataSource(val context: Context) {
         set(value) {
             sp.edit().putBoolean("chargeprice_show_provider_customer_tariffs", value).apply()
         }
+
+    var chargepriceCurrency: String
+        get() = sp.getString("chargeprice_currency", null) ?: "EUR"
+        set(value) {
+            sp.edit().putString("chargeprice_currency", value).apply()
+        }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
index 6befc9f0..c72ed171 100644
--- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
@@ -255,7 +255,7 @@ fun currency(currency: String): String {
         "USD" -> "$"
         "DKK", "SEK", "NOK" -> "kr."
         "PLN" -> "zł"
-        "CHF" -> "Fr."
+        "CHF" -> "Fr. "
         "CZK" -> "Kč"
         "GBP" -> "£"
         "HRK" -> "kn"
diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
index bba2567f..b3044181 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -173,7 +173,8 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                     options = ChargepriceOptions(
                         batteryRange = batteryRange.value!!.map { it.toDouble() },
                         providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
-                        maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null
+                        maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
+                        currency = prefs.chargepriceCurrency
                     )
                 }, getChargepriceLanguage())
                 val meta =
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8121c96c..5c8ac5d0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -188,4 +188,19 @@
     <string name="chargeprice_title">Preisvergleich</string>
     <string name="chargeprice_connection_error">Preise konnten nicht geladen werden</string>
     <string name="chargeprice_no_compatible_connectors">Keiner der Anschlüsse dieser Ladestation ist mit deinem Fahrzeug kompatibel.</string>
+    <string name="pref_chargeprice_currency">Währung</string>
+    <string-array name="pref_chargeprice_currency_names">
+        <item>Schweizer Franken (CHF)</item>
+        <item>Tschechische Krone (CZK)</item>
+        <item>Dänische Krone (DKK)</item>
+        <item>Euro (EUR)</item>
+        <item>Britisches Pfund (GBP)</item>
+        <item>Kroatische Kuna (HRK)</item>
+        <item>Ungarischer Forint (HUF)</item>
+        <item>Isländische Krone (ISK)</item>
+        <item>Norwegische Krone (NOK)</item>
+        <item>Polnischer Złoty (PLN)</item>
+        <item>Schwedische Krone (SEK)</item>
+        <item>US-Dollar (USD)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index b1a9c8d1..b00f097d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -20,4 +20,32 @@
         <item>on</item>
         <item>off</item>
     </string-array>
+    <string-array name="pref_chargeprice_currency_names">
+        <item>Swiss franc (CHF)</item>
+        <item>Czech koruna (CZK)</item>
+        <item>Danish krone (DKK)</item>
+        <item>Euro (EUR)</item>
+        <item>Pound sterling (GBP)</item>
+        <item>Croatian kuna (HRK)</item>
+        <item>Hungarian forint (HUF)</item>
+        <item>Icelandic króna (ISK)</item>
+        <item>Norwegian krone (NOK)</item>
+        <item>Polish złoty (PLN)</item>
+        <item>Swedish krona (SEK)</item>
+        <item>US dollar (USD)</item>
+    </string-array>
+    <string-array name="pref_chargeprice_currency_values" donottranslate="true">
+        <item>CHF</item>
+        <item>CZK</item>
+        <item>DKK</item>
+        <item>EUR</item>
+        <item>GBP</item>
+        <item>HRK</item>
+        <item>HUF</item>
+        <item>ISK</item>
+        <item>NOK</item>
+        <item>PLN</item>
+        <item>SEK</item>
+        <item>USD</item>
+    </string-array>
 </resources>
\ 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 21e70bb2..3ea3499d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,4 +187,5 @@
     <string name="chargeprice_title">Prices</string>
     <string name="chargeprice_connection_error">Could not load prices</string>
     <string name="chargeprice_no_compatible_connectors">None of the connectors on this charging station is compatible with your vehicle.</string>
+    <string name="pref_chargeprice_currency">Currency</string>
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 9268abdc..91ed310c 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -42,6 +42,12 @@
         <ListPreference
             android:key="chargeprice_my_vehicle"
             android:title="@string/pref_my_vehicle" />
+        <ListPreference
+            android:key="chargeprice_currency"
+            android:title="@string/pref_chargeprice_currency"
+            android:entries="@array/pref_chargeprice_currency_names"
+            android:entryValues="@array/pref_chargeprice_currency_values"
+            android:defaultValue="EUR" />
         <CheckBoxPreference
             android:key="chargeprice_no_base_fee"
             android:title="@string/pref_chargeprice_no_base_fee"