Improved AboutContent

Author: Wavesonics

app/src/main/kotlin/com/darkrockstudios/app/securecamera/AppModule.kt

@@ -1,6 +1,8 @@
 package com.darkrockstudios.app.securecamera
 
 import androidx.work.WorkManager
+import com.darkrockstudios.app.securecamera.about.AboutViewModel
+import com.darkrockstudios.app.securecamera.about.AboutViewModelImpl
 import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
 import com.darkrockstudios.app.securecamera.auth.PinVerificationViewModel
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
@@ -92,4 +94,5 @@ val appModule = module {
     viewModelOf(::IntroductionViewModelImpl) bind IntroductionViewModel::class
 	viewModelOf(::PinVerificationViewModel)
 	viewModelOf(::ImportPhotosViewModel)
+	viewModelOf(::AboutViewModelImpl) bind AboutViewModel::class
 }

app/src/main/kotlin/com/darkrockstudios/app/securecamera/about/AboutContent.Preview.kt

@@ -0,0 +1,40 @@
+package com.darkrockstudios.app.securecamera.about
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
+import com.darkrockstudios.app.securecamera.navigation.NavController
+
+private class DummyNavController : NavController {
+	override fun navigate(
+		key: NavKey,
+		builder: (com.darkrockstudios.app.securecamera.navigation.NavOptions.() -> Unit)?
+	) {
+	}
+
+	override fun navigate(key: NavKey) {}
+	override fun navigateUp(): Boolean = true
+}
+
+@Preview(name = "About", showBackground = true)
+@Composable
+private fun AboutContentPreview() {
+	Surface(color = MaterialTheme.colorScheme.background) {
+		val dummyVm = object : AboutViewModel {
+			private val _state = kotlinx.coroutines.flow.MutableStateFlow(AboutUiState(versionName = "1.2.3"))
+			override val uiState: kotlinx.coroutines.flow.StateFlow<AboutUiState> = _state
+		}
+		AboutContent(
+			navController = DummyNavController(),
+			modifier = Modifier,
+			paddingValues = PaddingValues(0.dp),
+			viewModel = dummyVm
+		)
+	}
+}
+

app/src/main/kotlin/com/darkrockstudios/app/securecamera/about/AboutContent.kt

@@ -10,15 +10,18 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.darkrockstudios.app.securecamera.R
 import com.darkrockstudios.app.securecamera.navigation.NavController
+import org.koin.androidx.compose.koinViewModel
 
 /**
  * About screen content
@@ -29,6 +32,7 @@ fun AboutContent(
 	navController: NavController,
 	modifier: Modifier = Modifier,
 	paddingValues: PaddingValues,
+	viewModel: AboutViewModel = koinViewModel<AboutViewModelImpl>()
 ) {
 	Column(
 		modifier = modifier
@@ -58,6 +62,7 @@ fun AboutContent(
 		)
 
 		val context = LocalContext.current
+		val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
 		// About content
 		Column(
@@ -189,9 +194,8 @@ fun AboutContent(
 					style = MaterialTheme.typography.bodyLarge,
 					modifier = Modifier.weight(1f)
 				)
-				val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
 				Text(
-					text = packageInfo.versionName ?: "---",
+					text = uiState.versionName,
 					style = MaterialTheme.typography.bodyMedium,
 					color = MaterialTheme.colorScheme.primary
 				)

app/src/main/kotlin/com/darkrockstudios/app/securecamera/about/AboutViewModel.kt

@@ -0,0 +1,11 @@
+package com.darkrockstudios.app.securecamera.about
+
+import kotlinx.coroutines.flow.StateFlow
+
+interface AboutViewModel {
+	val uiState: StateFlow<AboutUiState>
+}
+
+data class AboutUiState(
+	val versionName: String = "---",
+)

app/src/main/kotlin/com/darkrockstudios/app/securecamera/about/AboutViewModelImpl.kt

@@ -0,0 +1,21 @@
+package com.darkrockstudios.app.securecamera.about
+
+import android.content.Context
+import com.darkrockstudios.app.securecamera.BaseViewModel
+
+class AboutViewModelImpl(
+	private val appContext: Context,
+) : BaseViewModel<AboutUiState>(), AboutViewModel {
+
+	override fun createState(): AboutUiState {
+		val pm = appContext.packageManager
+		val pkg = appContext.packageName
+		val version = try {
+			val info = pm.getPackageInfo(pkg, 0)
+			info.versionName ?: "---"
+		} catch (e: Exception) {
+			"---"
+		}
+		return AboutUiState(versionName = version)
+	}
+}

app/src/test/kotlin/com/darkrockstudios/app/securecamera/about/AboutViewModelImplTest.kt

@@ -0,0 +1,27 @@
+package com.darkrockstudios.app.securecamera.about
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AboutViewModelImplTest {
+	@Test
+	fun `uiState exposes app version`() {
+		val pm = mockk<PackageManager>()
+		val ctx = mockk<Context>()
+		every { ctx.packageManager } returns pm
+		every { ctx.packageName } returns "com.example.app"
+
+		val pkgInfo = PackageInfo()
+		pkgInfo.versionName = "9.9.9"
+		every { pm.getPackageInfo("com.example.app", 0) } returns pkgInfo
+
+		val vm = AboutViewModelImpl(ctx)
+		val state = vm.uiState.value
+		assertEquals("9.9.9", state.versionName)
+	}
+}