Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show loading icon when saving video after capture #56

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show loading icon when saving video after capture #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/java/com/google/android/samples/socialite/ui/camera/Camera.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Autorenew
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
Expand Down Expand Up @@ -76,6 +78,8 @@ fun Camera(
modifier: Modifier = Modifier,
viewModel: CameraViewModel = hiltViewModel(),
) {
val isSavingVideo = viewModel.isSavingVideo.collectAsState()

var surfaceProvider by remember { mutableStateOf<Preview.SurfaceProvider?>(null) }
var cameraSelector by remember { mutableStateOf(CameraSelector.DEFAULT_BACK_CAMERA) }
var captureMode by remember { mutableStateOf(CaptureMode.PHOTO) }
Expand Down Expand Up @@ -308,6 +312,14 @@ fun Camera(
}
}
}

if (isSavingVideo.value) {
CircularProgressIndicator(
modifier = Modifier.align(Alignment.Center)
.background(MaterialTheme.colorScheme.primaryContainer, CircleShape)
.padding(8.dp),
)
}
}
} else {
CameraAndRecordAudioPermission(cameraAndRecordAudioPermissionState) {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/google/android/samples/socialite/ui/camera/CameraViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import java.text.SimpleDateFormat
import java.util.Locale
import javax.inject.Inject
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch

@HiltViewModel
Expand All @@ -70,6 +71,9 @@ class CameraViewModel @Inject constructor(
private lateinit var camera: Camera
private lateinit var extensionsManager: ExtensionsManager

private val _isSavingVideo = MutableStateFlow(false)
val isSavingVideo: StateFlow<Boolean> = _isSavingVideo

val chatId: Long? = savedStateHandle.get("chatId")
var viewFinderState = MutableStateFlow(ViewFinderState())

Expand Down Expand Up @@ -231,6 +235,7 @@ class CameraViewModel @Inject constructor(
recordingState = event
if (event is VideoRecordEvent.Finalize) {
onMediaCaptured(Media(event.outputResults.outputUri, MediaType.VIDEO))
_isSavingVideo.value = false
}
}

Expand All @@ -255,6 +260,8 @@ class CameraViewModel @Inject constructor(
}

fun saveVideo() {
_isSavingVideo.value = true

if (currentRecording == null || recordingState is VideoRecordEvent.Finalize) {
return
}
Expand Down
Loading