Add video player

Author: Wavesonics

app/build.gradle.kts

@@ -122,6 +122,8 @@ dependencies {
 	implementation(libs.accompanist.permissions)
 	implementation(libs.androidx.lifecycle.runtime.compose)
 	implementation(libs.zoomable)
+	implementation(libs.media3.exoplayer)
+	implementation(libs.media3.ui)
 	implementation(libs.androidx.runtime.livedata)
 	implementation(libs.bcrypt)
 	implementation(libs.androidx.work.runtime.ktx)

app/src/main/kotlin/com/darkrockstudios/app/securecamera/gallery/GalleryContent.kt

@@ -33,7 +33,7 @@ import com.darkrockstudios.app.securecamera.camera.MediaType
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
 import com.darkrockstudios.app.securecamera.navigation.NavController
-import com.darkrockstudios.app.securecamera.navigation.ViewPhoto
+import com.darkrockstudios.app.securecamera.navigation.ViewMedia
 import com.darkrockstudios.app.securecamera.ui.HandleUiEvents
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -111,9 +111,7 @@ fun GalleryContent(
 						if (uiState.isSelectionMode) {
 							viewModel.toggleMediaSelection(mediaName)
 						} else {
-							// For now, only navigate to photo viewer for photos
-							// TODO: Add video player navigation
-							navController.navigate(ViewPhoto(mediaName))
+							navController.navigate(ViewMedia(mediaName))
 						}
 					},
 				)

app/src/main/kotlin/com/darkrockstudios/app/securecamera/navigation/AppDestinations.kt

@@ -16,7 +16,7 @@ object Camera : DestinationKey
 object Gallery : DestinationKey
 
 @Serializable
-data class ViewPhoto(val photoName: String) : DestinationKey
+data class ViewMedia(val mediaName: String) : DestinationKey
 
 @Serializable
 data class ObfuscatePhoto(val photoName: String) : DestinationKey

app/src/main/kotlin/com/darkrockstudios/app/securecamera/navigation/AppNavigation.kt

@@ -81,19 +81,19 @@ fun AppNavHost(
 					}
 				}
 			}
-			entry<ViewPhoto> { key ->
+			entry<ViewMedia> { key ->
 				if (authManager.checkSessionValidity()) {
-					val photo = imageManager.getPhotoByName(key.photoName)
-					if (photo != null) {
+					val mediaItem = imageManager.getMediaItemByName(key.mediaName)
+					if (mediaItem != null) {
 						ViewPhotoContent(
-							initialPhoto = photo,
+							initialMedia = mediaItem,
 							navController = navController,
 							modifier = Modifier.fillMaxSize(),
 							paddingValues = paddingValues,
 							snackbarHostState = snackbarHostState,
 						)
 					} else {
-						Text(text = stringResource(R.string.photo_content_none_selected))
+						Text(text = stringResource(R.string.media_content_none_selected))
 					}
 				} else {
 					Box(modifier = Modifier.fillMaxSize()) {
@@ -176,7 +176,7 @@ fun enforceAuth(
 		currentKey !is Introduction
 	) {
 		val returnKey = when (currentKey) {
-			is ViewPhoto -> ViewPhoto(currentKey.photoName)
+			is ViewMedia -> ViewMedia(currentKey.mediaName)
 			is ObfuscatePhoto -> ObfuscatePhoto(currentKey.photoName)
 			is Gallery -> Gallery
 			is Settings -> Settings

app/src/main/kotlin/com/darkrockstudios/app/securecamera/obfuscation/ObfuscatePhotoViewModel.kt

@@ -11,7 +11,7 @@ import com.darkrockstudios.app.securecamera.BaseViewModel
 import com.darkrockstudios.app.securecamera.R
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
-import com.darkrockstudios.app.securecamera.navigation.ViewPhoto
+import com.darkrockstudios.app.securecamera.navigation.ViewMedia
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -181,7 +181,7 @@ class ObfuscatePhotoViewModel(
 
 					Timber.i("Saved copy of image: ${newPhotoDef.photoName}")
 					showCopySuccessMessage()
-					onNavigate(ViewPhoto(newPhotoDef.photoName))
+					onNavigate(ViewMedia(newPhotoDef.photoName))
 				} catch (e: Exception) {
 					Timber.e(e, "Failed to save copy of image")
 					showSaveErrorMessage()

app/src/main/kotlin/com/darkrockstudios/app/securecamera/viewphoto/ViewPhotoContent.kt

@@ -24,10 +24,17 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.media3.common.Player
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.ui.PlayerView
 import com.darkrockstudios.app.securecamera.ConfirmDeletePhotoDialog
 import com.darkrockstudios.app.securecamera.R
+import com.darkrockstudios.app.securecamera.camera.MediaItem
+import com.darkrockstudios.app.securecamera.camera.MediaType
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
+import com.darkrockstudios.app.securecamera.camera.VideoDef
 import com.darkrockstudios.app.securecamera.navigation.NavController
 import com.darkrockstudios.app.securecamera.navigation.ObfuscatePhoto
 import com.darkrockstudios.app.securecamera.ui.HandleUiEvents
@@ -36,25 +43,26 @@ import net.engawapg.lib.zoomable.rememberZoomState
 import net.engawapg.lib.zoomable.zoomableWithScroll
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
+import androidx.media3.common.MediaItem as ExoMediaItem
 
 @SuppressLint("UnusedBoxWithConstraintsScope")
 @OptIn(ExperimentalZoomableApi::class)
 @Composable
 fun ViewPhotoContent(
-	initialPhoto: PhotoDef,
+	initialMedia: MediaItem,
 	navController: NavController,
 	modifier: Modifier = Modifier,
 	snackbarHostState: SnackbarHostState,
 	paddingValues: PaddingValues
 ) {
 	val viewModel: ViewPhotoViewModel =
-		koinViewModel(key = initialPhoto.photoName) { parametersOf(initialPhoto.photoName) }
+		koinViewModel(key = initialMedia.mediaName) { parametersOf(initialMedia.mediaName) }
 	val context = LocalContext.current
 
 	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-	LaunchedEffect(uiState.photoDeleted) {
-		if (uiState.photoDeleted) {
+	LaunchedEffect(uiState.mediaDeleted) {
+		if (uiState.mediaDeleted) {
 			navController.navigateUp()
 		}
 	}
@@ -66,6 +74,7 @@ fun ViewPhotoContent(
 	) {
 		ViewPhotoTopBar(
 			navController = navController,
+			mediaType = uiState.currentMediaType,
 			onDeleteClick = {
 				viewModel.showDeleteConfirmation()
 			},
@@ -81,7 +90,7 @@ fun ViewPhotoContent(
 			onShareClick = {
 				viewModel.sharePhoto(context)
 			},
-			showDecoyButton = uiState.hasPoisonPill,
+			showDecoyButton = uiState.hasPoisonPill && uiState.currentMediaType == MediaType.PHOTO,
 			isDecoy = uiState.isDecoy,
 			isDecoyLoading = uiState.isDecoyLoading,
 			onDecoyClick = {
@@ -93,7 +102,7 @@ fun ViewPhotoContent(
 			ConfirmDeletePhotoDialog(
 				selectedCount = 1,
 				onConfirm = {
-					viewModel.deleteCurrentPhoto()
+					viewModel.deleteCurrentMedia()
 					viewModel.hideDeleteConfirmation()
 				},
 				onDismiss = {
@@ -102,7 +111,7 @@ fun ViewPhotoContent(
 			)
 		}
 
-		if (uiState.photos.isNotEmpty()) {
+		if (uiState.mediaItems.isNotEmpty()) {
 			val listState = remember { LazyListState(firstVisibleItemIndex = uiState.currentIndex) }
 
 			LaunchedEffect(listState) {
@@ -111,7 +120,7 @@ fun ViewPhotoContent(
 							listState.firstVisibleItemScrollOffset
 				}.collect { (idx, off) ->
 					if (listState.firstVisibleItemIndex != uiState.currentIndex) {
-						viewModel.setCurrentPhotoIndex(listState.firstVisibleItemIndex)
+						viewModel.setCurrentMediaIndex(listState.firstVisibleItemIndex)
 					}
 				}
 			}
@@ -123,16 +132,26 @@ fun ViewPhotoContent(
 				verticalAlignment = Alignment.CenterVertically,
 				horizontalArrangement = Arrangement.spacedBy(32.dp),
 			) {
-				items(count = uiState.photos.size, key = { uiState.photos[it].photoName }) { index ->
-					val photo = uiState.photos[index]
-
-					ViewPhoto(
-						modifier = Modifier
-							.fillParentMaxSize()
-							.padding(bottom = paddingValues.calculateBottomPadding()),
-						photo = photo,
-						viewModel = viewModel,
-					)
+				items(count = uiState.mediaItems.size, key = { uiState.mediaItems[it].mediaName }) { index ->
+					val mediaItem = uiState.mediaItems[index]
+
+					when (mediaItem) {
+						is PhotoDef -> ViewPhoto(
+							modifier = Modifier
+								.fillParentMaxSize()
+								.padding(bottom = paddingValues.calculateBottomPadding()),
+							photo = mediaItem,
+							viewModel = viewModel,
+						)
+
+						is VideoDef -> ViewVideo(
+							modifier = Modifier
+								.fillParentMaxSize()
+								.padding(bottom = paddingValues.calculateBottomPadding()),
+							video = mediaItem,
+							isCurrentItem = index == uiState.currentIndex,
+						)
+					}
 				}
 			}
 		}
@@ -210,3 +229,57 @@ private fun ViewPhoto(
 		}
 	}
 }
+
+@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+@Composable
+private fun ViewVideo(
+	modifier: Modifier,
+	video: VideoDef,
+	isCurrentItem: Boolean,
+) {
+	val context = LocalContext.current
+
+	val exoPlayer = remember(video.videoName) {
+		ExoPlayer.Builder(context).build().apply {
+			val mediaItem = ExoMediaItem.fromUri(video.videoFile.toURI().toString())
+			setMediaItem(mediaItem)
+			prepare()
+			repeatMode = Player.REPEAT_MODE_OFF
+		}
+	}
+
+	// Pause when not the current item
+	LaunchedEffect(isCurrentItem) {
+		if (!isCurrentItem) {
+			exoPlayer.pause()
+		}
+	}
+
+	DisposableEffect(video.videoName) {
+		onDispose {
+			exoPlayer.release()
+		}
+	}
+
+	Box(
+		modifier = modifier.clipToBounds(),
+		contentAlignment = Alignment.Center
+	) {
+		if (video.videoFile.exists()) {
+			AndroidView(
+				factory = { ctx ->
+					PlayerView(ctx).apply {
+						player = exoPlayer
+						useController = true
+					}
+				},
+				modifier = Modifier.fillMaxSize()
+			)
+		} else {
+			Text(
+				modifier = Modifier.align(alignment = Alignment.Center),
+				text = stringResource(id = R.string.video_not_found),
+			)
+		}
+	}
+}