PeterCxy/OpenEUICC
16
30
Fork 22
Code Issues 6 Pull requests 4 Projects Releases 8 Wiki Activity Actions

refactor: simplify developer options click handling and toast messages #221

Open
septs wants to merge 1 commit from septs/OpenEUICC:settings into master
pull from: septs/OpenEUICC:settings
merge into: PeterCxy:master
Conversation 0 Commits 1 Files changed 1 +15 -26
1 changed files with 15 additions and 26 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

@ -34,7 +34,7 @@ open class SettingsFragment: PreferenceFragmentCompat() {
// Show / hide developer preference based on whether it is enabled // Show / hide developer preference based on whether it is enabled
lifecycleScope.launch { lifecycleScope.launch {
preferenceRepository.developerOptionsEnabledFlow preferenceRepository.developerOptionsEnabledFlow
.onEach { developerPref.isVisible = it } .onEach(developerPref::setVisible)
.collect() .collect()
} }
@ -100,41 +100,30 @@ open class SettingsFragment: PreferenceFragmentCompat() {
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
private fun onAppVersionClicked(pref: Preference): Boolean { private fun onAppVersionClicked(pref: Preference): Boolean {
if (developerPref.isVisible) return false if (developerPref.isVisible) return false
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
if (now - lastClickTimestamp >= 1000) { numClicks = if (now - lastClickTimestamp >= 1000) 1 else numClicks + 1
numClicks = 1
} else {
numClicks++
}
lastClickTimestamp = now lastClickTimestamp = now
if (numClicks == 7) { lifecycleScope.launch {
lifecycleScope.launch { preferenceRepository.developerOptionsEnabledFlow.updatePreference(numClicks >= 7)
preferenceRepository.developerOptionsEnabledFlow.updatePreference(true)
lastToast?.cancel()
Toast.makeText(
requireContext(),
R.string.developer_options_enabled,
Toast.LENGTH_SHORT
).show()
}
} else if (numClicks > 1) {
lastToast?.cancel()
lastToast = Toast.makeText(
requireContext(),
getString(R.string.developer_options_steps, 7 - numClicks),
Toast.LENGTH_SHORT
)
lastToast!!.show()
} }
val toastText = when {
numClicks == 7 -> getString(R.string.developer_options_enabled)
numClicks > 1 -> getString(R.string.developer_options_steps, 7 - numClicks)
else -> return true
}
lastToast?.cancel()
lastToast = Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT)
lastToast!!.show()
return true return true
} }
protected fun CheckBoxPreference.bindBooleanFlow(flow: PreferenceFlowWrapper<Boolean>) { protected fun CheckBoxPreference.bindBooleanFlow(flow: PreferenceFlowWrapper<Boolean>) {
lifecycleScope.launch { lifecycleScope.launch {
flow.collect { isChecked = it } flow.collect(::setChecked)
} }
setOnPreferenceChangeListener { _, newValue -> setOnPreferenceChangeListener { _, newValue ->