fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 from Dejvino/bugfix/159

Browse Source 
Fix #159: Button remains in pressed state if you turn screen lock on/off
This commit is contained in:
Tibor Kaputa
2023-07-25 15:28:30 +02:00
committed by GitHub
parent be1ba1a8b9 f9a1bb1e04
commit 6a351fe3c5
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
View File

@@ -194,6 +194,7 @@ class MainActivity : SimpleActivity() {
private fun setupCameraImpl() { private fun setupCameraImpl() {
mCameraImpl = MyCameraImpl.newInstance(this, object : CameraTorchListener { mCameraImpl = MyCameraImpl.newInstance(this, object : CameraTorchListener {
override fun onTorchEnabled(isEnabled: Boolean) { override fun onTorchEnabled(isEnabled: Boolean) {
mCameraImpl!!.onTorchEnabled(isEnabled)
if (mCameraImpl!!.supportsBrightnessControl()) { if (mCameraImpl!!.supportsBrightnessControl()) {
brightness_bar.beVisibleIf(isEnabled) brightness_bar.beVisibleIf(isEnabled)
} }

9
app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
View File

@@ -182,6 +182,15 @@ class MyCameraImpl private constructor(val context: Context, private var cameraT
stateChanged(false) stateChanged(false)
} }
fun onTorchEnabled(isEnabled: Boolean) {
if (isStroboscopeRunning || isSOSRunning) {
return
}
if (isFlashlightOn != isEnabled) {
stateChanged(isEnabled)
}
}
private fun stateChanged(isEnabled: Boolean) { private fun stateChanged(isEnabled: Boolean) {
isFlashlightOn = isEnabled isFlashlightOn = isEnabled
EventBus.getDefault().post(Events.StateChanged(isEnabled)) EventBus.getDefault().post(Events.StateChanged(isEnabled))