Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

refactor(system): move plugins presentation

David Nashash3ab9239bfd30
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
index d5183c60..5b79b103 100644
--- a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt
@@ -4,13 +4,13 @@ import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import com.streamvault.app.navigation.AppRouteCodec
import com.streamvault.app.navigation.AppRoutePatterns
-import com.streamvault.app.ui.screens.plugins.PluginsScreen
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.core.navigation.AppDestination
import com.streamvault.core.navigation.NavigationActions
import com.streamvault.feature.system.api.SystemScaffoldContent
import com.streamvault.feature.system.presentation.downloads.DownloadsScreen
+import com.streamvault.feature.system.presentation.plugins.PluginsScreen
internal fun NavGraphBuilder.registerSystemGraph(
actions: NavigationActions,
@@ -24,10 +24,7 @@ internal fun NavGraphBuilder.registerSystemGraph(
composable(AppRoutePatterns.PLUGINS) {
PluginsScreen(
- currentRoute = AppRoutePatterns.PLUGINS,
- onNavigate = { route ->
- AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
- }
+ scaffold = appSystemScaffold(onTopLevelDestinationRequested)
)
}
diff --git a/feature/system/src/androidTest/java/com/streamvault/feature/system/presentation/plugins/PluginsPresentationTest.kt b/feature/system/src/androidTest/java/com/streamvault/feature/system/presentation/plugins/PluginsPresentationTest.kt
new file mode 100644
index 00000000..34841390
--- /dev/null
+++ b/feature/system/src/androidTest/java/com/streamvault/feature/system/presentation/plugins/PluginsPresentationTest.kt
@@ -0,0 +1,190 @@
+package com.streamvault.feature.system.presentation.plugins
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.streamvault.core.ui.theme.StreamVaultTheme
+import com.streamvault.feature.system.api.InstalledStreamVaultPlugin
+import com.streamvault.feature.system.api.PluginConfigurationAction
+import com.streamvault.feature.system.api.PluginConfigurationField
+import com.streamvault.feature.system.api.PluginConfigurationSchema
+import com.streamvault.feature.system.api.PluginConfigurationSection
+import com.streamvault.feature.system.api.StreamVaultPluginContract
+import com.streamvault.feature.system.api.StreamVaultPluginManifest
+import com.streamvault.feature.system.api.SystemScaffoldContent
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PluginsPresentationTest {
+ @get:Rule
+ val composeRule = createComposeRule()
+
+ @Test
+ fun emptyStateRetainsInstallAndRefreshActions() {
+ var installUrlClicks = 0
+ var installFileClicks = 0
+ var refreshClicks = 0
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ PluginsContent(
+ uiState = PluginsUiState(isLoading = false),
+ scaffold = testScaffold,
+ showInstallUrlDialog = false,
+ onShowInstallUrlDialog = { installUrlClicks++ },
+ onDismissInstallUrlDialog = {},
+ onInstallFromFile = { installFileClicks++ },
+ actions = noOpActions(onRefreshPlugins = { refreshClicks++ }),
+ )
+ }
+ }
+
+ composeRule.onNodeWithText("No compatible StreamVault plugins are installed.")
+ .assertIsDisplayed()
+ composeRule.onNodeWithText("Install URL").performClick()
+ composeRule.onNodeWithText("Install file").performClick()
+ composeRule.onNodeWithText("Refresh").performClick()
+
+ assertThat(installUrlClicks).isEqualTo(1)
+ assertThat(installFileClicks).isEqualTo(1)
+ assertThat(refreshClicks).isEqualTo(1)
+ }
+
+ @Test
+ fun discoveredPluginRetainsConfigureAndEnableCallbacks() {
+ var configured = false
+ var enabled: Boolean? = null
+ val plugin = pluginFixture()
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ PluginsContent(
+ uiState = PluginsUiState(isLoading = false, plugins = listOf(plugin)),
+ scaffold = testScaffold,
+ showInstallUrlDialog = false,
+ onShowInstallUrlDialog = {},
+ onDismissInstallUrlDialog = {},
+ onInstallFromFile = {},
+ actions = noOpActions(
+ onSetPluginEnabled = { _, value -> enabled = value },
+ onOpenPluginConfiguration = { configured = true },
+ ),
+ )
+ }
+ }
+
+ composeRule.onNodeWithText("Example plugin").assertIsDisplayed()
+ composeRule.onNodeWithText("Disabled").assertIsDisplayed()
+ composeRule.onNodeWithText("Configure").performClick()
+
+ assertThat(configured).isTrue()
+ assertThat(enabled).isNull()
+ }
+
+ @Test
+ fun hostConfigurationRetainsRequiredFieldIndicationAndSaveAction() {
+ var saves = 0
+ val plugin = pluginFixture()
+ val configuration = ActivePluginConfiguration(
+ plugin = plugin,
+ schema = PluginConfigurationSchema(
+ title = "Plugin settings",
+ sections = listOf(
+ PluginConfigurationSection(
+ id = "connection",
+ title = "Connection",
+ fields = listOf(
+ PluginConfigurationField(
+ key = "server",
+ label = "Server",
+ type = PluginConfigurationField.TYPE_URL,
+ required = true,
+ ),
+ PluginConfigurationField(
+ key = "enabled",
+ label = "Enabled",
+ type = PluginConfigurationField.TYPE_BOOLEAN,
+ ),
+ ),
+ )
+ ),
+ actions = listOf(PluginConfigurationAction("reload", "Reload")),
+ ),
+ values = buildJsonObject {
+ put("server", "")
+ put("enabled", false)
+ },
+ draftValues = mapOf("server" to "", "enabled" to "false"),
+ validationErrors = mapOf("server" to "Server is required"),
+ )
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ PluginsContent(
+ uiState = PluginsUiState(configuration = configuration),
+ scaffold = testScaffold,
+ showInstallUrlDialog = false,
+ onShowInstallUrlDialog = {},
+ onDismissInstallUrlDialog = {},
+ onInstallFromFile = {},
+ actions = noOpActions(onSavePluginConfiguration = { saves++ }),
+ )
+ }
+ }
+
+ composeRule.onNodeWithText("Plugin settings").assertIsDisplayed()
+ composeRule.onNodeWithText("Some plugin settings need attention before saving.")
+ .assertIsDisplayed()
+ composeRule.onNodeWithText("Server is required").assertIsDisplayed()
+ composeRule.onNodeWithText("Enabled").assertIsDisplayed()
+ composeRule.onNodeWithText("Save").performClick()
+
+ assertThat(saves).isEqualTo(1)
+ }
+
+ private val testScaffold: SystemScaffoldContent = { _, _, _, _, _, content ->
+ Column(modifier = androidx.compose.ui.Modifier.fillMaxSize()) { content() }
+ }
+
+ private fun noOpActions(
+ onRefreshPlugins: () -> Unit = {},
+ onSetPluginEnabled: (InstalledStreamVaultPlugin, Boolean) -> Unit = { _, _ -> },
+ onOpenPluginConfiguration: (InstalledStreamVaultPlugin) -> Unit = {},
+ onSavePluginConfiguration: () -> Unit = {},
+ ) = PluginsActions(
+ onUpdateInstallUrl = {},
+ onInstallFromLocalUri = {},
+ onInstallFromUrl = {},
+ onRefreshPlugins = onRefreshPlugins,
+ onSetPluginEnabled = onSetPluginEnabled,
+ onOpenPluginConfiguration = onOpenPluginConfiguration,
+ onClosePluginConfiguration = {},
+ onRefreshPluginConfiguration = {},
+ onSavePluginConfiguration = onSavePluginConfiguration,
+ onUpdateConfigurationValue = { _, _ -> },
+ onRunConfigurationAction = {},
+ onClearMessage = {},
+ )
+
+ private fun pluginFixture() = InstalledStreamVaultPlugin(
+ packageName = "com.example.plugin",
+ serviceClassName = "com.example.PluginService",
+ appLabel = "Example plugin",
+ manifest = StreamVaultPluginManifest(
+ id = "example",
+ name = "Example plugin",
+ capabilities = listOf(StreamVaultPluginContract.CAPABILITY_CONFIGURATION_SCHEMA),
+ configurationMode = StreamVaultPluginContract.CONFIGURATION_MODE_HOST_SCHEMA,
+ ),
+ enabled = false,
+ )
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt
similarity index 87%
rename from app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
rename to feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt
index dd2a1036..00c26ff0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
+++ b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsScreen.kt
@@ -1,5 +1,6 @@
-package com.streamvault.app.ui.screens.plugins
+package com.streamvault.feature.system.presentation.plugins
+import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.BorderStroke
@@ -51,17 +52,16 @@ import androidx.tv.material3.Border
import androidx.tv.material3.ButtonDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.navigation.Routes
+import com.streamvault.core.navigation.AppDestination
import com.streamvault.feature.system.api.InstalledStreamVaultPlugin
import com.streamvault.feature.system.api.PluginConfigurationAction
import com.streamvault.feature.system.api.PluginConfigurationField
import com.streamvault.feature.system.api.PluginConfigurationSection
import com.streamvault.feature.system.api.owner
import com.streamvault.feature.system.api.toBundleSafeKey
+import com.streamvault.feature.system.api.SystemScaffoldContent
import com.streamvault.core.ui.components.dialogs.PremiumDialog
import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.components.shell.AppNavigationChrome
-import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.core.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
@@ -72,74 +72,125 @@ import com.streamvault.core.ui.theme.Primary
@Composable
fun PluginsScreen(
- currentRoute: String,
- onNavigate: (String) -> Unit,
+ scaffold: SystemScaffoldContent,
modifier: Modifier = Modifier,
viewModel: PluginsViewModel = hiltViewModel()
) {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val snackbarHostState = remember { SnackbarHostState() }
var showInstallUrlDialog by remember { mutableStateOf(false) }
+ val actions = PluginsActions(
+ onUpdateInstallUrl = viewModel::updateInstallUrl,
+ onInstallFromLocalUri = viewModel::installFromLocalUri,
+ onInstallFromUrl = {
+ showInstallUrlDialog = false
+ viewModel.installFromUrl()
+ },
+ onRefreshPlugins = viewModel::refreshPlugins,
+ onSetPluginEnabled = viewModel::setPluginEnabled,
+ onOpenPluginConfiguration = viewModel::openPluginConfiguration,
+ onClosePluginConfiguration = viewModel::closePluginConfiguration,
+ onRefreshPluginConfiguration = viewModel::refreshPluginConfiguration,
+ onSavePluginConfiguration = viewModel::savePluginConfiguration,
+ onUpdateConfigurationValue = viewModel::updateConfigurationValue,
+ onRunConfigurationAction = viewModel::runConfigurationAction,
+ onClearMessage = viewModel::clearMessage,
+ )
val apkPicker = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
- if (uri != null) viewModel.installFromLocalUri(uri)
+ if (uri != null) actions.onInstallFromLocalUri(uri)
}
LaunchedEffect(uiState.userMessage) {
uiState.userMessage?.let { message ->
snackbarHostState.showSnackbar(message)
- viewModel.clearMessage()
+ actions.onClearMessage()
}
}
- AppScreenScaffold(
- currentRoute = currentRoute,
- onNavigate = onNavigate,
- title = "Plugins",
- subtitle = "Install companion APKs, activate capabilities, and sync plugin providers.",
+ PluginsContent(
+ uiState = uiState,
+ scaffold = scaffold,
+ showInstallUrlDialog = showInstallUrlDialog,
+ onShowInstallUrlDialog = { showInstallUrlDialog = true },
+ onDismissInstallUrlDialog = { showInstallUrlDialog = false },
+ onInstallFromFile = {
+ apkPicker.launch(
+ arrayOf(
+ "application/vnd.android.package-archive",
+ "application/octet-stream",
+ "*/*"
+ )
+ )
+ },
+ actions = actions,
modifier = modifier,
- navigationChrome = AppNavigationChrome.TopBar,
- compactHeader = true
+ snackbarHostState = snackbarHostState
+ )
+}
+
+internal data class PluginsActions(
+ val onUpdateInstallUrl: (String) -> Unit,
+ val onInstallFromLocalUri: (Uri) -> Unit,
+ val onInstallFromUrl: () -> Unit,
+ val onRefreshPlugins: () -> Unit,
+ val onSetPluginEnabled: (InstalledStreamVaultPlugin, Boolean) -> Unit,
+ val onOpenPluginConfiguration: (InstalledStreamVaultPlugin) -> Unit,
+ val onClosePluginConfiguration: () -> Unit,
+ val onRefreshPluginConfiguration: () -> Unit,
+ val onSavePluginConfiguration: () -> Unit,
+ val onUpdateConfigurationValue: (String, String) -> Unit,
+ val onRunConfigurationAction: (PluginConfigurationAction) -> Unit,
+ val onClearMessage: () -> Unit,
+)
+
+@Composable
+internal fun PluginsContent(
+ uiState: PluginsUiState,
+ scaffold: SystemScaffoldContent,
+ showInstallUrlDialog: Boolean,
+ onShowInstallUrlDialog: () -> Unit,
+ onDismissInstallUrlDialog: () -> Unit,
+ onInstallFromFile: () -> Unit,
+ actions: PluginsActions,
+ modifier: Modifier = Modifier,
+ snackbarHostState: SnackbarHostState? = null,
+) {
+ scaffold(
+ AppDestination.Plugins,
+ "Plugins",
+ "Install companion APKs, activate capabilities, and sync plugin providers.",
+ true,
+ true
) {
Column(
- modifier = Modifier.fillMaxSize(),
+ modifier = modifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
val configuration = uiState.configuration
if (configuration != null) {
PluginConfigurationPanel(
configuration = configuration,
- onBack = viewModel::closePluginConfiguration,
- onRefresh = viewModel::refreshPluginConfiguration,
- onSave = viewModel::savePluginConfiguration,
- onValueChange = viewModel::updateConfigurationValue,
- onRunAction = viewModel::runConfigurationAction
+ onBack = actions.onClosePluginConfiguration,
+ onRefresh = actions.onRefreshPluginConfiguration,
+ onSave = actions.onSavePluginConfiguration,
+ onValueChange = actions.onUpdateConfigurationValue,
+ onRunAction = actions.onRunConfigurationAction
)
} else {
PluginInstallPanel(
isInstalling = uiState.isInstalling,
- onInstallFromUrl = { showInstallUrlDialog = true },
- onInstallFromFile = {
- apkPicker.launch(
- arrayOf(
- "application/vnd.android.package-archive",
- "application/octet-stream",
- "*/*"
- )
- )
- },
- onRefresh = viewModel::refreshPlugins
+ onInstallFromUrl = onShowInstallUrlDialog,
+ onInstallFromFile = onInstallFromFile,
+ onRefresh = actions.onRefreshPlugins
)
if (showInstallUrlDialog) {
PluginInstallUrlDialog(
installUrl = uiState.installUrl,
isInstalling = uiState.isInstalling,
- onInstallUrlChange = viewModel::updateInstallUrl,
- onDismiss = { showInstallUrlDialog = false },
- onInstall = {
- showInstallUrlDialog = false
- viewModel.installFromUrl()
- }
+ onInstallUrlChange = actions.onUpdateInstallUrl,
+ onDismiss = onDismissInstallUrlDialog,
+ onInstall = actions.onInstallFromUrl
)
}
@@ -176,15 +227,17 @@ fun PluginsScreen(
PluginCard(
plugin = plugin,
busy = uiState.activePluginOwner == plugin.owner,
- onEnabledChange = { enabled -> viewModel.setPluginEnabled(plugin, enabled) },
- onOpenConfiguration = { viewModel.openPluginConfiguration(plugin) }
+ onEnabledChange = { enabled -> actions.onSetPluginEnabled(plugin, enabled) },
+ onOpenConfiguration = { actions.onOpenPluginConfiguration(plugin) }
)
}
item { Spacer(modifier = Modifier.height(20.dp)) }
}
}
}
- SnackbarHost(hostState = snackbarHostState)
+ snackbarHostState?.let { hostState ->
+ SnackbarHost(hostState = hostState)
+ }
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsViewModel.kt b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModel.kt
similarity index 90%
rename from app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsViewModel.kt
rename to feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModel.kt
index e3603514..b729184f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsViewModel.kt
+++ b/feature/system/src/main/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModel.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.plugins
+package com.streamvault.feature.system.presentation.plugins
import android.net.Uri
import androidx.lifecycle.ViewModel
@@ -7,12 +7,11 @@ import com.streamvault.feature.system.api.InstalledStreamVaultPlugin
import com.streamvault.feature.system.api.PluginConfigurationAction
import com.streamvault.feature.system.api.PluginConfigurationField
import com.streamvault.feature.system.api.PluginConfigurationSchema
-import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.feature.system.api.StreamVaultPluginOwner
import com.streamvault.feature.system.api.owner
+import com.streamvault.feature.system.api.SystemPluginManagementPort
import com.streamvault.domain.model.Result
import com.streamvault.domain.provider.ProviderSource
-import com.streamvault.domain.provider.ProviderSourceRegistry
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import kotlinx.coroutines.flow.MutableStateFlow
@@ -58,8 +57,7 @@ data class ActivePluginConfiguration(
@HiltViewModel
class PluginsViewModel @Inject constructor(
- private val pluginManager: StreamVaultPluginManager,
- private val providerSourceRegistry: ProviderSourceRegistry
+ private val pluginManagement: SystemPluginManagementPort
) : ViewModel() {
private val _uiState = MutableStateFlow(PluginsUiState(isLoading = true))
val uiState: StateFlow<PluginsUiState> = _uiState.asStateFlow()
@@ -75,8 +73,8 @@ class PluginsViewModel @Inject constructor(
fun refreshPlugins() {
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true, syncProgress = null) }
- val result = runCatching { pluginManager.discoverPlugins() }
- val sources = runCatching { providerSourceRegistry.sources() }
+ val result = runCatching { pluginManagement.discoverPlugins() }
+ val sources = runCatching { pluginManagement.providerSources() }
_uiState.update { state ->
state.copy(
plugins = result.getOrDefault(emptyList()),
@@ -102,7 +100,7 @@ class PluginsViewModel @Inject constructor(
}
viewModelScope.launch {
_uiState.update { it.copy(isInstalling = true, userMessage = "Preparing plugin installer...") }
- val result = pluginManager.installApkFromUrl(url)
+ val result = pluginManagement.installApkFromUrl(url)
_uiState.update {
it.copy(
isInstalling = false,
@@ -116,7 +114,7 @@ class PluginsViewModel @Inject constructor(
fun installFromLocalUri(uri: Uri) {
viewModelScope.launch {
_uiState.update { it.copy(isInstalling = true, userMessage = "Preparing selected APK...") }
- val result = pluginManager.installApkFromUri(uri)
+ val result = pluginManagement.installApkFromUri(uri)
_uiState.update {
it.copy(
isInstalling = false,
@@ -136,11 +134,11 @@ class PluginsViewModel @Inject constructor(
userMessage = null
)
}
- val result = pluginManager.setPluginEnabled(plugin, enabled) { progress ->
+ val result = pluginManagement.setPluginEnabled(plugin, enabled) { progress ->
_uiState.update { it.copy(syncProgress = progress) }
}
- val refreshed = runCatching { pluginManager.discoverPlugins() }.getOrDefault(_uiState.value.plugins)
- val refreshedSources = runCatching { providerSourceRegistry.sources() }
+ val refreshed = runCatching { pluginManagement.discoverPlugins() }.getOrDefault(_uiState.value.plugins)
+ val refreshedSources = runCatching { pluginManagement.providerSources() }
.getOrDefault(_uiState.value.providerSources)
_uiState.update {
it.copy(
@@ -156,7 +154,7 @@ class PluginsViewModel @Inject constructor(
fun openPluginConfiguration(plugin: InstalledStreamVaultPlugin) {
if (plugin.manifest.usesActivityConfiguration || !plugin.manifest.supportsHostRenderedConfiguration) {
- val result = pluginManager.openPluginConfiguration(plugin)
+ val result = pluginManagement.openPluginConfiguration(plugin)
_uiState.update { it.copy(userMessage = result.message) }
return
}
@@ -169,7 +167,7 @@ class PluginsViewModel @Inject constructor(
userMessage = null
)
}
- when (val result = pluginManager.loadPluginConfiguration(plugin)) {
+ when (val result = pluginManagement.loadPluginConfiguration(plugin)) {
is Result.Error -> {
_uiState.update {
it.copy(
@@ -231,9 +229,9 @@ class PluginsViewModel @Inject constructor(
viewModelScope.launch {
_uiState.updateConfiguration { it.copy(isSaving = true, validationErrors = emptyMap()) }
val valuesJson = configuration.schema.toValuesJson(configuration.draftValues).toString()
- val result = pluginManager.savePluginConfiguration(configuration.plugin, valuesJson)
+ val result = pluginManagement.savePluginConfiguration(configuration.plugin, valuesJson)
val refreshedValues = if (result.success) {
- pluginManager.loadPluginConfigurationValues(configuration.plugin).getOrNull()
+ pluginManagement.loadPluginConfigurationValues(configuration.plugin).getOrNull()
} else {
null
}
@@ -253,7 +251,7 @@ class PluginsViewModel @Inject constructor(
val configuration = _uiState.value.configuration ?: return
viewModelScope.launch {
_uiState.updateConfiguration { it.copy(isSaving = true, validationErrors = emptyMap()) }
- when (val result = pluginManager.loadPluginConfiguration(configuration.plugin)) {
+ when (val result = pluginManagement.loadPluginConfiguration(configuration.plugin)) {
is Result.Error -> {
_uiState.updateConfiguration { it.copy(isSaving = false) }
_uiState.update { it.copy(userMessage = result.message) }
@@ -279,9 +277,9 @@ class PluginsViewModel @Inject constructor(
val configuration = _uiState.value.configuration ?: return
viewModelScope.launch {
_uiState.updateConfiguration { it.copy(runningActionId = action.id) }
- val result = pluginManager.runPluginConfigurationAction(configuration.plugin, action.id)
+ val result = pluginManagement.runPluginConfigurationAction(configuration.plugin, action.id)
if (result.success && action.refreshAfterRun) {
- pluginManager.loadPluginConfiguration(configuration.plugin).getOrNull()?.let { snapshot ->
+ pluginManagement.loadPluginConfiguration(configuration.plugin).getOrNull()?.let { snapshot ->
_uiState.update {
it.copy(
configuration = ActivePluginConfiguration(
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginConfigurationDraftTest.kt b/feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginConfigurationDraftTest.kt
similarity index 82%
rename from app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginConfigurationDraftTest.kt
rename to feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginConfigurationDraftTest.kt
index 42a12b06..c915caa6 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginConfigurationDraftTest.kt
+++ b/feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginConfigurationDraftTest.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.screens.plugins
+package com.streamvault.feature.system.presentation.plugins
import com.google.common.truth.Truth.assertThat
import com.streamvault.feature.system.api.InstalledStreamVaultPlugin
@@ -8,10 +8,9 @@ import com.streamvault.feature.system.api.PluginConfigurationSchema
import com.streamvault.feature.system.api.PluginConfigurationSection
import com.streamvault.feature.system.api.PluginConfigurationSnapshot
import com.streamvault.feature.system.api.StreamVaultPluginContract
-import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.feature.system.api.StreamVaultPluginManifest
+import com.streamvault.feature.system.api.SystemPluginManagementPort
import com.streamvault.domain.model.Result
-import com.streamvault.domain.provider.ProviderSourceRegistry
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.StandardTestDispatcher
@@ -47,14 +46,13 @@ class PluginConfigurationDraftTest {
@Test
fun requiredBlankValueIsRejectedBeforePluginSave() = runTest {
val plugin = pluginFixture()
- val manager = mock<StreamVaultPluginManager>()
- val registry = mock<ProviderSourceRegistry>()
+ val port = mock<SystemPluginManagementPort>()
val snapshot = configurationSnapshot(plugin)
- wheneverBlocking { manager.discoverPlugins() }.thenReturn(listOf(plugin))
- wheneverBlocking { registry.sources() }.thenReturn(emptyList())
- wheneverBlocking { manager.loadPluginConfiguration(plugin) }.thenReturn(Result.Success(snapshot))
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(listOf(plugin))
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
+ wheneverBlocking { port.loadPluginConfiguration(plugin) }.thenReturn(Result.Success(snapshot))
- val viewModel = PluginsViewModel(manager, registry)
+ val viewModel = PluginsViewModel(port)
advanceUntilIdle()
viewModel.openPluginConfiguration(plugin)
advanceUntilIdle()
@@ -70,23 +68,22 @@ class PluginConfigurationDraftTest {
@Test
fun validDraftSerializesTypedFieldsAndRefreshesSavedValues() = runTest {
val plugin = pluginFixture()
- val manager = mock<StreamVaultPluginManager>()
- val registry = mock<ProviderSourceRegistry>()
+ val port = mock<SystemPluginManagementPort>()
val snapshot = configurationSnapshot(plugin)
val updatedValues = buildJsonObject {
put("server", "https://updated.example")
put("port", 9090)
put("enabled", true)
}
- wheneverBlocking { manager.discoverPlugins() }.thenReturn(listOf(plugin))
- wheneverBlocking { registry.sources() }.thenReturn(emptyList())
- wheneverBlocking { manager.loadPluginConfiguration(plugin) }.thenReturn(Result.Success(snapshot))
- wheneverBlocking { manager.savePluginConfiguration(eq(plugin), any()) }
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(listOf(plugin))
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
+ wheneverBlocking { port.loadPluginConfiguration(plugin) }.thenReturn(Result.Success(snapshot))
+ wheneverBlocking { port.savePluginConfiguration(eq(plugin), any()) }
.thenReturn(PluginActionResult(true, "Plugin settings saved"))
- wheneverBlocking { manager.loadPluginConfigurationValues(plugin) }
+ wheneverBlocking { port.loadPluginConfigurationValues(plugin) }
.thenReturn(Result.Success(updatedValues))
- val viewModel = PluginsViewModel(manager, registry)
+ val viewModel = PluginsViewModel(port)
advanceUntilIdle()
viewModel.openPluginConfiguration(plugin)
advanceUntilIdle()
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginsViewModelTest.kt b/feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModelTest.kt
similarity index 53%
rename from app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginsViewModelTest.kt
rename to feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModelTest.kt
index 5edc149c..34c334d8 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/plugins/PluginsViewModelTest.kt
+++ b/feature/system/src/test/java/com/streamvault/feature/system/presentation/plugins/PluginsViewModelTest.kt
@@ -1,11 +1,10 @@
-package com.streamvault.app.ui.screens.plugins
+package com.streamvault.feature.system.presentation.plugins
import com.google.common.truth.Truth.assertThat
import com.streamvault.feature.system.api.InstalledStreamVaultPlugin
import com.streamvault.feature.system.api.StreamVaultPluginContract
-import com.streamvault.app.plugins.StreamVaultPluginManager
import com.streamvault.feature.system.api.StreamVaultPluginManifest
-import com.streamvault.domain.provider.ProviderSourceRegistry
+import com.streamvault.feature.system.api.SystemPluginManagementPort
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.StandardTestDispatcher
@@ -16,7 +15,10 @@ import kotlinx.coroutines.test.setMain
import org.junit.After
import org.junit.Before
import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
import org.mockito.kotlin.verifyBlocking
import org.mockito.kotlin.wheneverBlocking
@@ -37,12 +39,11 @@ class PluginsViewModelTest {
@Test
fun refreshPublishesDiscoveredPluginsAndProviderSources() = runTest {
val plugin = pluginFixture()
- val manager = mock<StreamVaultPluginManager>()
- val registry = mock<ProviderSourceRegistry>()
- wheneverBlocking { manager.discoverPlugins() }.thenReturn(listOf(plugin))
- wheneverBlocking { registry.sources() }.thenReturn(emptyList())
+ val port = mock<SystemPluginManagementPort>()
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(listOf(plugin))
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
- val viewModel = PluginsViewModel(manager, registry)
+ val viewModel = PluginsViewModel(port)
advanceUntilIdle()
assertThat(viewModel.uiState.value.isLoading).isFalse()
@@ -52,12 +53,11 @@ class PluginsViewModelTest {
@Test
fun blankInstallUrlPublishesExistingValidationMessage() = runTest {
- val manager = mock<StreamVaultPluginManager>()
- val registry = mock<ProviderSourceRegistry>()
- wheneverBlocking { manager.discoverPlugins() }.thenReturn(emptyList())
- wheneverBlocking { registry.sources() }.thenReturn(emptyList())
+ val port = mock<SystemPluginManagementPort>()
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(emptyList())
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
- val viewModel = PluginsViewModel(manager, registry)
+ val viewModel = PluginsViewModel(port)
advanceUntilIdle()
viewModel.updateInstallUrl(" ")
@@ -70,22 +70,44 @@ class PluginsViewModelTest {
@Test
fun localInstallDelegatesUriAndRefreshesState() = runTest {
val uri = mock<android.net.Uri>()
- val manager = mock<StreamVaultPluginManager>()
- val registry = mock<ProviderSourceRegistry>()
- wheneverBlocking { manager.discoverPlugins() }.thenReturn(emptyList())
- wheneverBlocking { registry.sources() }.thenReturn(emptyList())
- wheneverBlocking { manager.installApkFromUri(uri) }
+ val port = mock<SystemPluginManagementPort>()
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(emptyList())
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
+ wheneverBlocking { port.installApkFromUri(uri) }
.thenReturn(com.streamvault.domain.model.Result.Success(Unit))
- val viewModel = PluginsViewModel(manager, registry)
+ val viewModel = PluginsViewModel(port)
advanceUntilIdle()
viewModel.installFromLocalUri(uri)
advanceUntilIdle()
- verifyBlocking(manager) { installApkFromUri(uri) }
+ verifyBlocking(port) { installApkFromUri(uri) }
assertThat(viewModel.uiState.value.isLoading).isFalse()
}
+ @Test
+ fun enablePassesProgressAndPublishesUnchangedResultMessage() = runTest {
+ val plugin = pluginFixture()
+ val enabledPlugin = plugin.copy(enabled = true)
+ val port = mock<SystemPluginManagementPort>()
+ wheneverBlocking { port.discoverPlugins() }.thenReturn(listOf(plugin), listOf(enabledPlugin))
+ wheneverBlocking { port.providerSources() }.thenReturn(emptyList())
+ wheneverBlocking { port.setPluginEnabled(eq(plugin), eq(true), any()) }
+ .thenAnswer { invocation ->
+ invocation.getArgument<(String) -> Unit>(2)("Syncing plugin provider...")
+ com.streamvault.feature.system.api.PluginActionResult(true, "Plugin enabled")
+ }
+ val viewModel = PluginsViewModel(port)
+ advanceUntilIdle()
+
+ viewModel.setPluginEnabled(plugin, true)
+ advanceUntilIdle()
+
+ assertThat(viewModel.uiState.value.plugins).containsExactly(enabledPlugin)
+ assertThat(viewModel.uiState.value.userMessage).isEqualTo("Plugin enabled")
+ assertThat(viewModel.uiState.value.syncProgress).isNull()
+ }
+
private fun pluginFixture() = InstalledStreamVaultPlugin(
packageName = "com.example.plugin",
serviceClassName = "com.example.PluginService",