mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-06-12 00:08:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix issues after dependency update

Browse Source
This commit is contained in:
johan12345
2022-03-20 15:48:20 +01:00
parent f12ed008dd
commit 57747a9f01
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/vonforst/evmap/MapsActivity.kt
View File

@@ -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 {

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

@@ -42,8 +42,8 @@ class AboutFragment : PreferenceFragmentCompat() {
findPreference<Preference>("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

5
app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt
View File

@@ -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()
}
}

4
app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt
View File

@@ -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(),

6
app/src/main/java/net/vonforst/evmap/ui/MultiSelectDialogPreference.kt
View File

@@ -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<String>?)
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()
}
}

8
app/src/main/java/net/vonforst/evmap/ui/RangeSliderPreference.kt
View File

@@ -46,14 +46,14 @@ class RangeSliderPreference(context: Context, attrs: AttributeSet) : Preference(
private var dragging = false
var values: List<Float>
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()