mirror of
https://github.com/SimpleMobileTools/Simple-Calculator.git
synced 2025-04-25 07:18:49 +02:00
Minor readability improvements
This commit is contained in:
parent
27989149b8
commit
b9b5cfa249
@ -46,19 +46,19 @@ class MainActivity : SimpleActivity(), Calculator {
|
|||||||
btn_root.setOnClickOperation(ROOT)
|
btn_root.setOnClickOperation(ROOT)
|
||||||
btn_minus.setOnLongClickListener { calc.turnToNegative() }
|
btn_minus.setOnLongClickListener { calc.turnToNegative() }
|
||||||
|
|
||||||
btn_clear.setVibratingOnClick { calc.handleClear() }
|
btn_clear.setVibratingOnClickListener { calc.handleClear() }
|
||||||
btn_clear.setOnLongClickListener {
|
btn_clear.setOnLongClickListener {
|
||||||
calc.handleReset()
|
calc.handleReset()
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
getButtonIds().forEach {
|
getButtonIds().forEach {
|
||||||
it.setVibratingOnClick { view ->
|
it.setVibratingOnClickListener { view ->
|
||||||
calc.numpadClicked(view.id)
|
calc.numpadClicked(view.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
btn_equals.setVibratingOnClick { calc.handleEquals() }
|
btn_equals.setVibratingOnClickListener { calc.handleEquals() }
|
||||||
formula.setOnLongClickListener { copyToClipboard(false) }
|
formula.setOnLongClickListener { copyToClipboard(false) }
|
||||||
result.setOnLongClickListener { copyToClipboard(true) }
|
result.setOnLongClickListener { copyToClipboard(true) }
|
||||||
|
|
||||||
@ -211,7 +211,7 @@ class MainActivity : SimpleActivity(), Calculator {
|
|||||||
btn_decimal.text = decimalSeparator
|
btn_decimal.text = decimalSeparator
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun View.setVibratingOnClick(callback: (view: View) -> Unit) {
|
private fun View.setVibratingOnClickListener(callback: (view: View) -> Unit) {
|
||||||
setOnClickListener {
|
setOnClickListener {
|
||||||
callback(it)
|
callback(it)
|
||||||
checkHaptic(it)
|
checkHaptic(it)
|
||||||
@ -219,7 +219,7 @@ class MainActivity : SimpleActivity(), Calculator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun View.setOnClickOperation(operation: String) {
|
private fun View.setOnClickOperation(operation: String) {
|
||||||
setVibratingOnClick {
|
setVibratingOnClickListener {
|
||||||
calc.handleOperation(operation)
|
calc.handleOperation(operation)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user