Commit fd90f2d1 authored by Ryan Harg's avatar Ryan Harg
Browse files

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

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

See merge request !139
parents 5e2e8234 89d4515c
Pipeline #19629 passed with stages
in 41 minutes and 40 seconds
...@@ -161,7 +161,7 @@ dependencies { ...@@ -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() { ...@@ -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 : ...@@ -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 : ...@@ -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))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment