Release 1.3.10

fixes #223

app/build.gradle

@@ -19,8 +19,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 31
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 104
-        versionName "1.3.9"
+        versionCode 106
+        versionName "1.3.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/net/vonforst/evmap/fragment/DataSourceSelectDialog.kt

@@ -27,7 +27,7 @@ class DataSourceSelectDialog : MaterialDialogFragment() {
         }
     }
 
-    override fun onCreateView(
+    override fun createView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?

app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt

@@ -39,7 +39,7 @@ class MultiSelectDialog : MaterialDialogFragment() {
     private lateinit var items: List<MultiSelectItem>
     private lateinit var binding: DialogMultiSelectBinding
 
-    override fun onCreateView(
+    override fun createView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?

app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt

@@ -8,6 +8,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 import com.mikepenz.aboutlibraries.LibsBuilder
@@ -44,6 +45,14 @@ class AboutFragment : PreferenceFragmentCompat() {
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         return when (preference.key) {
+            "contributors" -> {
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.about_contributors)
+                    .setMessage(getString(R.string.about_contributors_text) + "\n\n" + getString(R.string.about_contributors_list))
+                    .setPositiveButton(R.string.ok) { _, _ -> }
+                    .show()
+                true
+            }
             "github_link" -> {
                 (activity as? MapsActivity)?.openUrl(getString(R.string.github_link))
                 true

app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFragment.kt

@@ -13,7 +13,7 @@ import net.vonforst.evmap.ui.MaterialDialogFragment
 class OpensourceDonationsDialogFragment : MaterialDialogFragment() {
     private lateinit var binding: DialogOpensourceDonationsBinding
 
-    override fun onCreateView(
+    override fun createView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?

app/src/main/java/net/vonforst/evmap/ui/Dialogs.kt

@@ -69,7 +69,7 @@ abstract class MaterialDialogFragment : AppCompatDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = MaterialAlertDialogBuilder(requireContext(), theme).apply {
             dialogView =
-                onCreateView(LayoutInflater.from(requireContext()), null, savedInstanceState)!!
+                createView(LayoutInflater.from(requireContext()), null, savedInstanceState)
 
             setView(dialogView)
         }.create()
@@ -77,6 +77,12 @@ abstract class MaterialDialogFragment : AppCompatDialogFragment() {
         return dialog
     }
 
+    abstract fun createView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View
+
     abstract fun initView(view: View, savedInstanceState: Bundle?)
 
     override fun getView(): View {

app/src/main/res/values-de/strings.xml

@@ -271,4 +271,6 @@
     <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="about_contributors">Mitwirkende</string>
+    <string name="about_contributors_text">Dank an alle Mitwirkenden für ihre Beiträge von Code und Übersetzungen für EVMap:</string>
 </resources>

app/src/main/res/values/donottranslate.xml

@@ -12,4 +12,5 @@
     <string name="pref_language_de">Deutsch</string>
     <string name="pref_language_fr">Français</string>
     <string name="pref_language_nb_rNO">Norsk Bokmål</string>
+    <string name="about_contributors_list">Danilo Bargen\nAltonss\nAllan Nordhøy\nLicaon_Kter\npt2121</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -270,4 +270,6 @@
     <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="about_contributors">Contributors</string>
+    <string name="about_contributors_text">Thanks to all contributors for their coding and translation contributions to EVMap:</string>
 </resources>

app/src/main/res/xml/about.xml

@@ -14,6 +14,10 @@
             android:title="@string/copyright"
             android:summary="@string/copyright_summary" />
 
+        <Preference
+            android:key="contributors"
+            android:title="@string/about_contributors" />
+
         <Preference
             android:key="faq"
             android:title="@string/faq"

fastlane/metadata/android/de-DE/changelogs/106.txt

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Wechseln der Datenquelle nicht möglich

fastlane/metadata/android/en-US/changelogs/106.txt

@@ -0,0 +1,2 @@
+Bugfixes:
+- Data source selection was not possible