Simplified initialIndex VS currentIndex

Author: Wavesonics

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

@@ -45,7 +45,7 @@ fun ObfuscatePhotoContent(
 	outerScope: CoroutineScope,
 	paddingValues: PaddingValues
 ) {
-	val viewModel: ObfuscatePhotoViewModel = koinViewModel()
+	val viewModel: ObfuscatePhotoViewModel = koinViewModel(key = photoName)
 	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
 	LaunchedEffect(photoName) {
@@ -60,10 +60,8 @@ fun ObfuscatePhotoContent(
 			uiState.isCreatingRegion ||
 			uiState.currentRegion != null
 
-	// State for discard confirmation dialog
 	val showDiscardDialog = remember { mutableStateOf(false) }
 
-	// Handle system back button
 	BackHandler(enabled = hasUnsavedChanges) {
 		showDiscardDialog.value = true
 	}

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

@@ -103,15 +103,14 @@ fun ViewPhotoContent(
 		}
 
 		if (uiState.photos.isNotEmpty()) {
-			val listState =
-				remember(uiState.initialIndex) { LazyListState(firstVisibleItemIndex = uiState.initialIndex) }
+			val listState = remember { LazyListState(firstVisibleItemIndex = uiState.currentIndex) }
 
 			LaunchedEffect(listState) {
 				snapshotFlow {
 					listState.firstVisibleItemIndex to
 							listState.firstVisibleItemScrollOffset
 				}.collect { (idx, off) ->
-					if (listState.firstVisibleItemIndex != viewModel.currentIndex) {
+					if (listState.firstVisibleItemIndex != uiState.currentIndex) {
 						viewModel.setCurrentPhotoIndex(listState.firstVisibleItemIndex)
 					}
 				}

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

@@ -24,8 +24,11 @@ class ViewPhotoViewModel(
 	private val initialPhotoName: String,
 ) : BaseViewModel<ViewPhotoUiState>() {
 
-	var currentIndex: Int = 0
-		private set
+	private var currentIndex: Int
+		get() = uiState.value.currentIndex
+		set(value) {
+			_uiState.update { it.copy(currentIndex = value) }
+		}
 
 	override fun createState() = ViewPhotoUiState()
 
@@ -43,7 +46,7 @@ class ViewPhotoViewModel(
 			_uiState.update {
 				it.copy(
 					photos = photos,
-					initialIndex = initialIndex,
+					currentIndex = initialIndex,
 					hasPoisonPill = hasPoisonPill,
 					isDecoy = isDecoy
 				)
@@ -155,7 +158,7 @@ class ViewPhotoViewModel(
 
 data class ViewPhotoUiState(
 	val photos: List<PhotoDef> = emptyList(),
-	val initialIndex: Int = 0,
+	val currentIndex: Int = 0,
 	val hasPoisonPill: Boolean = false,
 	val isDecoy: Boolean = false,
 	val isDecoyLoading: Boolean = false,