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
This commit is contained in:
commit
fd90f2d1a0
|
@ -161,7 +161,7 @@ dependencies {
|
||||||
implementation("androidx.core:core-ktx:1.7.0")
|
implementation("androidx.core:core-ktx:1.7.0")
|
||||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
|
||||||
implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
|
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.recyclerview:recyclerview:1.2.1")
|
||||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
||||||
implementation("com.google.android.material:material:1.5.0")
|
implementation("com.google.android.material:material:1.5.0")
|
||||||
|
|
|
@ -41,7 +41,6 @@ class SettingsActivity : AppCompatActivity() {
|
||||||
.commit()
|
.commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getThemeResId(): Int = R.style.AppTheme
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class SettingsFragment :
|
class SettingsFragment :
|
||||||
|
@ -51,7 +50,7 @@ class SettingsFragment :
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
|
||||||
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
|
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||||
|
@ -60,7 +59,7 @@ class SettingsFragment :
|
||||||
updateValues()
|
updateValues()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPreferenceTreeClick(preference: Preference?): Boolean {
|
override fun onPreferenceTreeClick(preference: Preference): Boolean {
|
||||||
when (preference?.key) {
|
when (preference?.key) {
|
||||||
"oss_licences" -> startActivity(Intent(activity, LicencesActivity::class.java))
|
"oss_licences" -> startActivity(Intent(activity, LicencesActivity::class.java))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue