Skip to content

Commit 20684b3

Browse files
dependabot[bot]Okuro3499dogi
authored
actions: bump androidx.preference:preference to 1.2.1 (fixes #1931) (#1915)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gideon Okuro <[email protected]> Co-authored-by: dogi <[email protected]>
1 parent 5fd5f3d commit 20684b3

File tree

7 files changed

+18
-24
lines changed

7 files changed

+18
-24
lines changed

Diff for: app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181
implementation 'com.google.android:flexbox:2.0.1'
8282
implementation 'androidx.cardview:cardview:1.0.0'
8383
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
84-
implementation "androidx.preference:preference:1.1.1"
84+
implementation "androidx.preference:preference:1.2.1"
8585
testImplementation 'junit:junit:4.13.2'
8686
implementation 'com.github.parse-community:ParseLiveQuery-Android:1.2.2'
8787
implementation 'com.github.parse-community.Parse-SDK-Android:parse:4.2.1'

Diff for: app/src/main/kotlin/io/treehouses/remote/bases/BasePreferenceFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ abstract class BasePreferenceFragment: PreferenceFragmentCompat(), BackPressRece
2525

2626
override fun onResume() {
2727
super.onResume()
28-
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
28+
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
2929
}
3030

3131
override fun onPause() {
3232
super.onPause()
33-
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
33+
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
3434
}
3535

3636
override fun onBackPressed() {

Diff for: app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.preference.PreferenceManager
2121
import android.text.ClipboardManager
2222
import android.view.KeyCharacterMap
2323
import android.view.KeyEvent
24+
import io.treehouses.remote.MainApplication.Companion.context
2425
import io.treehouses.remote.views.terminal.VDUBuffer
2526
import io.treehouses.remote.views.terminal.vt320
2627
import io.treehouses.remote.PreferenceConstants
@@ -60,7 +61,7 @@ open class BaseTerminalKeyListener(var manager: TerminalManager?,
6061
private var clipboard: ClipboardManager? = null
6162
protected var selectingForCopy = false
6263
protected val selectionArea: SelectionArea = SelectionArea()
63-
protected val prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(manager)
64+
protected val prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
6465

6566
protected fun handleDpadCenter(keyCode: Int, flag: Boolean): Boolean {
6667
var newFlag = flag

Diff for: app/src/main/kotlin/io/treehouses/remote/fragments/SettingsFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
3535

3636
override fun onResume() {
3737
super.onResume()
38-
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
38+
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
3939
}
4040

4141
override fun onPause() {
4242
super.onPause()
43-
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
43+
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
4444
}
4545

4646
override fun onPreferenceClick(preference: Preference): Boolean {

Diff for: app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt

+5-12
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,13 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
2828
val clearSSHHosts = findPreference<Preference>("ssh_hosts")
2929
val clearSSHKeys = findPreference<Preference>("ssh_keys")
3030
val fontSize = findPreference<Preference>("font_size")
31-
32-
//fontSize?.setOnPreferenceChangeListener(object: Preference.OnPreferenceChangeListener(SharedPreferences, "font_size"))
33-
fontSize?.setOnPreferenceChangeListener(object : Preference.OnPreferenceChangeListener{
34-
@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
35-
override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
36-
PreferenceManager.getDefaultSharedPreferences(activity).edit().putInt("font_size", newValue.toString().toInt()).commit()
31+
fontSize?.onPreferenceChangeListener =
32+
Preference.OnPreferenceChangeListener { _, newValue ->
33+
PreferenceManager.getDefaultSharedPreferences(requireContext()).edit().putInt("font_size", newValue.toString().toInt()).commit()
3734
adjustFontScale(resources.configuration, newValue.toString().toInt())
3835
activity?.recreate()
39-
return false
36+
false
4037
}
41-
})
4238
SettingsUtils.setClickListener(this, clearCommandsList)
4339
SettingsUtils.setClickListener(this, resetCommandsList)
4440
SettingsUtils.setClickListener(this, clearNetworkProfiles)
@@ -48,7 +44,6 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
4844

4945
@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
5046
fun adjustFontScale(configuration: Configuration?, fontSize: Int) {
51-
5247
configuration?.let {
5348
it.fontScale = 0.05F*fontSize.toFloat()
5449
val metrics: DisplayMetrics = resources.displayMetrics
@@ -58,7 +53,6 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
5853

5954
MainApplication.context.createConfigurationContext(it)
6055
MainApplication.context.resources.displayMetrics.setTo(metrics)
61-
6256
}
6357
}
6458

@@ -69,7 +63,6 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
6963
"network_profiles" -> networkProfiles()
7064
"ssh_hosts" -> clearSSHHosts()
7165
"ssh_keys" -> clearSSHKeys()
72-
7366
}
7467
return false
7568
}
@@ -124,4 +117,4 @@ class UserCustomizationPreferenceFragment: BasePreferenceFragment() {
124117
private const val CLEAR_SSH_HOSTS = 4
125118
private const val CLEAR_SSH_KEYS = 5
126119
}
127-
}
120+
}

Diff for: app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HomeFragment : BaseHomeFragment() {
5757
private lateinit var bind: ActivityHomeFragmentBinding
5858
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
5959
bind = ActivityHomeFragmentBinding.inflate(inflater, container, false)
60-
preferences = PreferenceManager.getDefaultSharedPreferences(context)
60+
preferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
6161
setupProfiles()
6262
showDialogOnce(preferences!!)
6363
connectRpiListener()
@@ -213,7 +213,7 @@ class HomeFragment : BaseHomeFragment() {
213213
*/
214214
private fun testConnectionListener() {
215215
bind.testConnection.setOnClickListener {
216-
val preference = PreferenceManager.getDefaultSharedPreferences(context).getString("led_pattern", "LED Heavy Metal")
216+
val preference = PreferenceManager.getDefaultSharedPreferences(requireContext()).getString("led_pattern", "LED Heavy Metal")
217217
val options = listOf(*resources.getStringArray(R.array.led_options))
218218
val optionsCode = resources.getStringArray(R.array.led_options_commands)
219219
viewModel.selectedLed = options.indexOf(preference)

Diff for: app/src/main/kotlin/io/treehouses/remote/views/RoundedListPreference.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import io.treehouses.remote.R
1212

1313
class RoundedListPreference : ListPreference {
1414

15-
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
15+
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
1616
context,
1717
attrs,
1818
defStyleAttr
1919
)
2020

21-
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
21+
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
2222

23-
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
23+
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
2424

25-
constructor(context: Context?) : super(context)
25+
constructor(context: Context) : super(context)
2626

2727
override fun onClick() {
2828
val currentIndex = findIndexOfValue(value)

0 commit comments

Comments
 (0)