diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index f7c35dda..9a268546 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -228,12 +228,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
(requireActivity() as MapsActivity).appBarConfiguration
)
- if (!PreferenceDataSource(requireContext()).welcomeDialogShown) {
+ val prefs = PreferenceDataSource(requireContext())
+ if (!prefs.welcomeDialogShown) {
try {
navController.navigate(R.id.action_map_to_welcome)
} catch (ignored: IllegalArgumentException) {
// when there is already another navigation going on
}
+ } else if (!prefs.update060AndroidAutoDialogShown) {
+ try {
+ navController.navigate(R.id.action_map_to_update_060_androidauto)
+ } catch (ignored: IllegalArgumentException) {
+ // when there is already another navigation going on
+ }
}
}
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/WelcomeDialogFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/WelcomeDialogFragment.kt
index 2857636d..14cc3a40 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/WelcomeDialogFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/WelcomeDialogFragment.kt
@@ -25,7 +25,9 @@ class WelcomeDialogFragment : AppCompatDialogFragment() {
super.onViewCreated(view, savedInstanceState)
binding.btnOk.setOnClickListener {
- PreferenceDataSource(requireContext()).welcomeDialogShown = true
+ val prefs = PreferenceDataSource(requireContext())
+ prefs.welcomeDialogShown = true
+ prefs.update060AndroidAutoDialogShown = true
dismiss()
}
}
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/Update060AndroidAutoDialogFramgent.kt b/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/Update060AndroidAutoDialogFramgent.kt
new file mode 100644
index 00000000..00de34f7
--- /dev/null
+++ b/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/Update060AndroidAutoDialogFramgent.kt
@@ -0,0 +1,40 @@
+package net.vonforst.evmap.fragment.updatedialogs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatDialogFragment
+import net.vonforst.evmap.databinding.DialogUpdate060AndroidautoBinding
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+class Update060AndroidAutoDialogFramgent : AppCompatDialogFragment() {
+ private lateinit var binding: DialogUpdate060AndroidautoBinding
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = DialogUpdate060AndroidautoBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ binding.btnOk.setOnClickListener {
+ PreferenceDataSource(requireContext()).update060AndroidAutoDialogShown = true
+ dismiss()
+ }
+ }
+
+ override fun onStart() {
+ super.onStart()
+ dialog?.window?.setLayout(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.WRAP_CONTENT
+ )
+ }
+}
\ No newline at end of file
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 f04d4982..782aba1a 100644
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -91,4 +91,10 @@ class PreferenceDataSource(val context: Context) {
set(value) {
sp.edit().putBoolean("welcome_dialog_shown", value).apply()
}
+
+ var update060AndroidAutoDialogShown: Boolean
+ get() = sp.getBoolean("update_0.6.0_androidauto_dialog_shown", false)
+ set(value) {
+ sp.edit().putBoolean("update_0.6.0_androidauto_dialog_shown", value).apply()
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/android_auto_screenshot.png b/app/src/main/res/drawable-nodpi/android_auto_screenshot.png
new file mode 100644
index 00000000..07cb6ee7
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/android_auto_screenshot.png differ
diff --git a/app/src/main/res/drawable/android_auto.xml b/app/src/main/res/drawable/android_auto.xml
new file mode 100644
index 00000000..dd6f834f
--- /dev/null
+++ b/app/src/main/res/drawable/android_auto.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/circle_bg_logo.xml b/app/src/main/res/drawable/circle_bg_logo.xml
new file mode 100644
index 00000000..0dbad6dc
--- /dev/null
+++ b/app/src/main/res/drawable/circle_bg_logo.xml
@@ -0,0 +1,12 @@
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_update_060_androidauto.xml b/app/src/main/res/layout/dialog_update_060_androidauto.xml
new file mode 100644
index 00000000..a94d923a
--- /dev/null
+++ b/app/src/main/res/layout/dialog_update_060_androidauto.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 28cf66ec..d54c91ff 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -34,6 +34,9 @@
+
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b61d5fa1..87d37aae 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -159,4 +159,6 @@
Navigieren
Verifiziert
Verifiziert von der GoingElectric.de Community – nicht zwangsläufig auch aktuell verfügbar.
+ Neues Update: Android Auto
+ Mit diesem neuen Update kannst du EVMap nutzen, um Ladestationen in der Nähe auf unterstützen Autos direkt aus Android Auto zu finden. Öffne einfach die EVMap-App aus dem Menü von Android Auto.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7a0bd73f..8696f9d0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,4 +14,5 @@
#9e9e9e
#C3000000
#f44336
+ #039be5
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fcbd396f..238ae894 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,4 +158,6 @@
Navigate
verified
Charger verified by a member at the GoingElectric.de community — not necessarily working right now.
+ New update: Android Auto
+ With this new update, you can also use EVMap to find nearby chargers from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.