PeterCxy/OpenEUICC
16
24
Fork 20
Code Issues 7 Pull requests Projects Releases 8 Wiki Activity Actions

refactor: simplify settings fragment click handling #67

Closed
septs wants to merge 1 commit from septs:refactor-settings into master
pull from: septs:refactor-settings
merge into: PeterCxy:master
Conversation 0 Commits 1 Files changed 1 +21 -20
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
View file

@ -39,24 +39,7 @@ class SettingsFragment: PreferenceFragmentCompat() {
} }
findPreference<Preference>("pref_info_app_version") findPreference<Preference>("pref_info_app_version")
?.apply { ?.summary = requireContext().selfAppVersion
summary = requireContext().selfAppVersion
// Enable developer options when this is clicked for 7 times
setOnPreferenceClickListener(this@SettingsFragment::onAppVersionClicked)
}
findPreference<Preference>("pref_info_source_code")
?.setOnPreferenceClickListener {
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.summary.toString())))
true
}
findPreference<Preference>("pref_advanced_logs")
?.setOnPreferenceClickListener {
startActivity(Intent(requireContext(), LogsActivity::class.java))
true
}
findPreference<CheckBoxPreference>("pref_notifications_download") findPreference<CheckBoxPreference>("pref_notifications_download")
?.bindBooleanFlow(preferenceRepository.notificationDownloadFlow, PreferenceKeys.NOTIFICATION_DOWNLOAD) ?.bindBooleanFlow(preferenceRepository.notificationDownloadFlow, PreferenceKeys.NOTIFICATION_DOWNLOAD)
@ -85,8 +68,26 @@ class SettingsFragment: PreferenceFragmentCompat() {
setupRootViewInsets(requireView().requireViewById(androidx.preference.R.id.recycler_view)) setupRootViewInsets(requireView().requireViewById(androidx.preference.R.id.recycler_view))
} }
@Suppress("UNUSED_PARAMETER") override fun onPreferenceTreeClick(preference: Preference) = when (preference.key) {
private fun onAppVersionClicked(pref: Preference): Boolean { "pref_advanced_logs" -> {
startActivity(Intent(requireContext(), LogsActivity::class.java))
true
}
"pref_info_app_version" -> {
// Enable developer options when this is clicked for 7 times
this.onAppVersionClicked()
}
"pref_info_source_code" -> {
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(preference.summary.toString())))
true
}
else -> super.onPreferenceTreeClick(preference)
}
private fun onAppVersionClicked(): Boolean {
if (developerPref.isVisible) return false if (developerPref.isVisible) return false
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
if (now - lastClickTimestamp >= 1000) { if (now - lastClickTimestamp >= 1000) {