Browse Source

Merge branch 'renovate/androidx.preference-preference-ktx-1.x' into 'develop'

Update dependency androidx.preference:preference-ktx to v1.2.0

See merge request funkwhale/funkwhale-android!139
technical/update-compile-sdk-version-docker
Ryan Harg 3 years ago
parent
commit
fd90f2d1a0
  1. 2
      app/build.gradle.kts
  2. 5
      app/src/main/java/audio/funkwhale/ffa/activities/SettingsActivity.kt

2
app/build.gradle.kts

@ -161,7 +161,7 @@ dependencies { @@ -161,7 +161,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
implementation("androidx.preference:preference-ktx:1.1.1")
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.google.android.material:material:1.5.0")

5
app/src/main/java/audio/funkwhale/ffa/activities/SettingsActivity.kt

@ -41,7 +41,6 @@ class SettingsActivity : AppCompatActivity() { @@ -41,7 +41,6 @@ class SettingsActivity : AppCompatActivity() {
.commit()
}
fun getThemeResId(): Int = R.style.AppTheme
}
class SettingsFragment :
@ -51,7 +50,7 @@ class SettingsFragment : @@ -51,7 +50,7 @@ class SettingsFragment :
override fun onResume() {
super.onResume()
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@ -60,7 +59,7 @@ class SettingsFragment : @@ -60,7 +59,7 @@ class SettingsFragment :
updateValues()
}
override fun onPreferenceTreeClick(preference: Preference?): Boolean {
override fun onPreferenceTreeClick(preference: Preference): Boolean {
when (preference?.key) {
"oss_licences" -> startActivity(Intent(activity, LicencesActivity::class.java))

Loading…
Cancel
Save