Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-19 07:15:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use optimistic updates for torch

Browse Source 
Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com>
This commit is contained in:
Myzel394 2024-02-23 22:46:13 +01:00
parent 590f3f2d13
commit f426cfe287
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
View File

@ -194,7 +194,9 @@ class VideoRecorderService :
selectedCamera, selectedCamera,
videoCapture videoCapture
) )
cameraControl = CameraControl(camera!!) cameraControl = CameraControl(camera!!).also {
it.init()
}
onCameraControlAvailable() onCameraControlAvailable()
_cameraAvailableListener.complete(Unit) _cameraAvailableListener.complete(Unit)
@ -309,17 +311,25 @@ class VideoRecorderService :
} }
class CameraControl( class CameraControl(
val camera: Camera val camera: Camera,
// Save state for optimistic updates
var torchEnabled: Boolean = false,
) { ) {
fun init() {
torchEnabled = camera.cameraInfo.torchState.value == TorchState.ON
}
fun enableTorch() { fun enableTorch() {
torchEnabled = true
camera.cameraControl.enableTorch(true) camera.cameraControl.enableTorch(true)
} }
fun disableTorch() { fun disableTorch() {
torchEnabled = false
camera.cameraControl.enableTorch(false) camera.cameraControl.enableTorch(false)
} }
fun isTorchEnabled(): Boolean { fun isHardwareTorchReallyEnabled(): Boolean {
return camera.cameraInfo.torchState.value == TorchState.ON return camera.cameraInfo.torchState.value == TorchState.ON
} }

12
app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/VideoRecordingStatus.kt
View File

@ -19,7 +19,11 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalConfiguration
@ -224,14 +228,16 @@ fun _VideoControls(videoRecorder: VideoRecorderModel) {
if (!videoRecorder.isStartingRecording) { if (!videoRecorder.isStartingRecording) {
val cameraControl = videoRecorder.recorderService!!.cameraControl!! val cameraControl = videoRecorder.recorderService!!.cameraControl!!
if (cameraControl.hasTorchAvailable()) { if (cameraControl.hasTorchAvailable()) {
val isTorchEnabled = cameraControl.isTorchEnabled() var torchEnabled by rememberSaveable { mutableStateOf(cameraControl.torchEnabled) }
TorchStatus( TorchStatus(
enabled = isTorchEnabled, enabled = torchEnabled,
onChange = { onChange = {
if (isTorchEnabled) { if (torchEnabled) {
torchEnabled = false
cameraControl.disableTorch() cameraControl.disableTorch()
} else { } else {
torchEnabled = true
cameraControl.enableTorch() cameraControl.enableTorch()
} }
}, },