From 57747a9f01099962e0cbc2e62421d39b8d259fe0 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 20 Mar 2022 15:48:20 +0100 Subject: [PATCH] fix issues after dependency update --- app/src/main/java/net/vonforst/evmap/MapsActivity.kt | 2 +- .../vonforst/evmap/fragment/preference/AboutFragment.kt | 4 ++-- .../evmap/fragment/preference/BaseSettingsFragment.kt | 5 ++--- .../evmap/fragment/preference/DataSettingsFragment.kt | 4 ++-- .../net/vonforst/evmap/ui/MultiSelectDialogPreference.kt | 6 +++--- .../java/net/vonforst/evmap/ui/RangeSliderPreference.kt | 8 ++++---- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt index d8045870..be94aa99 100644 --- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt +++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt @@ -98,7 +98,7 @@ class MapsActivity : AppCompatActivity(), if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { // wait for splash screen animation to finish on first start - splashScreen.setKeepVisibleCondition(object : SplashScreen.KeepOnScreenCondition { + splashScreen.setKeepOnScreenCondition(object : SplashScreen.KeepOnScreenCondition { var startTime: Long? = null override fun shouldKeepOnScreen(): Boolean { diff --git a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt index cf353620..3daa16ea 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt @@ -42,8 +42,8 @@ class AboutFragment : PreferenceFragmentCompat() { findPreference("version")?.summary = BuildConfig.VERSION_NAME } - override fun onPreferenceTreeClick(preference: Preference?): Boolean { - return when (preference?.key) { + override fun onPreferenceTreeClick(preference: Preference): Boolean { + return when (preference.key) { "github_link" -> { (activity as? MapsActivity)?.openUrl(getString(R.string.github_link)) true diff --git a/app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt index c8e31728..c7376dbc 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt @@ -48,12 +48,11 @@ abstract class BaseSettingsFragment : PreferenceFragmentCompat(), override fun onResume() { super.onResume() - preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this) + preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this) } override fun onPause() { - preferenceManager.sharedPreferences - .unregisterOnSharedPreferenceChangeListener(this) + preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this) super.onPause() } } \ No newline at end of file diff --git a/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt index aa0983b9..c9e11ecd 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt @@ -47,8 +47,8 @@ class DataSettingsFragment : BaseSettingsFragment() { } } - override fun onPreferenceTreeClick(preference: Preference?): Boolean { - return when (preference?.key) { + override fun onPreferenceTreeClick(preference: Preference): Boolean { + return when (preference.key) { "search_delete_recent" -> { Snackbar.make( requireView(), diff --git a/app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt b/app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt index 3acc79a2..84c147b5 100644 --- a/app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt @@ -26,7 +26,7 @@ class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) : // backwards compatibility when changing a ListPreference into a MultiSelectListPreference val value = getPersistedString(null)?.let { setOf(it) } ?: (defaultValue as Set?) - sharedPreferences.edit() + sharedPreferences!!.edit() .remove(key) .putStringSet(key, value) .apply() @@ -51,8 +51,8 @@ class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) : } var all: Boolean - get() = sharedPreferences.getBoolean(key + "_all", defaultToAll) + get() = sharedPreferences!!.getBoolean(key + "_all", defaultToAll) set(value) { - sharedPreferences.edit().putBoolean(key + "_all", value).apply() + sharedPreferences!!.edit().putBoolean(key + "_all", value).apply() } } \ No newline at end of file diff --git a/app/src/main/java/net/vonforst/evmap/ui/RangeSliderPreference.kt b/app/src/main/java/net/vonforst/evmap/ui/RangeSliderPreference.kt index 5b29792f..fd082288 100644 --- a/app/src/main/java/net/vonforst/evmap/ui/RangeSliderPreference.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/RangeSliderPreference.kt @@ -46,14 +46,14 @@ class RangeSliderPreference(context: Context, attrs: AttributeSet) : Preference( private var dragging = false var values: List - get() = if ((sharedPreferences.contains(key + "_min") && sharedPreferences.contains(key + "_max"))) { + get() = if ((sharedPreferences!!.contains(key + "_min") && sharedPreferences!!.contains(key + "_max"))) { listOf( - sharedPreferences.getFloat(key + "_min", 0f), - sharedPreferences.getFloat(key + "_max", 0f) + sharedPreferences!!.getFloat(key + "_min", 0f), + sharedPreferences!!.getFloat(key + "_max", 0f) ) } else defaultValue set(value) { - sharedPreferences.edit() + sharedPreferences!!.edit() .putFloat(key + "_min", value[0]) .putFloat(key + "_max", value[1]) .apply()