Skip to content

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

Handle D-pad for Stalker proxy toggle

David Nashashac3fbfda135f
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
index db0ef0ec..219e2ca2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
@@ -1591,51 +1591,63 @@ private fun AdvancedProviderOptionsSection(
)
}
}
- val targetProxyEnabled = !stalkerProxyEnabled
- TvClickableSurface(
- onClick = { onStalkerProxyEnabledChange(targetProxyEnabled) },
+ Row(
modifier = Modifier
.fillMaxWidth()
- .semantics { contentDescription = "Use HTTP proxy" },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = if (stalkerProxyEnabled) Primary.copy(alpha = 0.1f) else Surface,
- focusedContainerColor = Primary.copy(alpha = 0.22f)
- ),
- border = ClickableSurfaceDefaults.border(
- border = Border(
- BorderStroke(
- 1.dp,
- if (stalkerProxyEnabled) Primary.copy(alpha = 0.4f) else SurfaceHighlight
- )
- ),
- focusedBorder = Border(BorderStroke(3.dp, PrimaryLight))
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
- ) {
- Row(
- modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.spacedBy(12.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
- Text(
- text = "Use HTTP proxy",
- style = MaterialTheme.typography.titleSmall,
- color = TextPrimary
- )
- Text(
- text = "Applies to Stalker API and playback only.",
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
- )
+ .onPreviewKeyEvent { event ->
+ val nativeEvent = event.nativeKeyEvent
+ val isActivationKey = when (nativeEvent.keyCode) {
+ android.view.KeyEvent.KEYCODE_DPAD_CENTER,
+ android.view.KeyEvent.KEYCODE_ENTER,
+ android.view.KeyEvent.KEYCODE_NUMPAD_ENTER,
+ android.view.KeyEvent.KEYCODE_SPACE,
+ android.view.KeyEvent.KEYCODE_BUTTON_A -> true
+ else -> false
+ }
+ if (!isActivationKey) {
+ false
+ } else {
+ if (nativeEvent.action == android.view.KeyEvent.ACTION_UP) {
+ onStalkerProxyEnabledChange(!stalkerProxyEnabled)
+ }
+ nativeEvent.action == android.view.KeyEvent.ACTION_DOWN ||
+ nativeEvent.action == android.view.KeyEvent.ACTION_UP
+ }
}
- Switch(
- checked = stalkerProxyEnabled,
- onCheckedChange = null,
- modifier = Modifier.focusProperties { canFocus = false }
+ .mouseClickable { onStalkerProxyEnabledChange(!stalkerProxyEnabled) }
+ .focusable()
+ .background(
+ if (stalkerProxyEnabled) Primary.copy(alpha = 0.1f) else Surface,
+ RoundedCornerShape(12.dp)
+ )
+ .border(
+ 1.dp,
+ if (stalkerProxyEnabled) Primary.copy(alpha = 0.4f) else SurfaceHighlight,
+ RoundedCornerShape(12.dp)
+ )
+ .padding(horizontal = 16.dp, vertical = 12.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ Text(
+ text = "Use HTTP proxy",
+ style = MaterialTheme.typography.titleSmall,
+ color = TextPrimary
+ )
+ Text(
+ text = "Applies to Stalker API and playback only.",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
)
}
+ Switch(
+ checked = stalkerProxyEnabled,
+ onCheckedChange = { onStalkerProxyEnabledChange(it) },
+ modifier = Modifier.semantics {
+ contentDescription = "Use HTTP proxy"
+ }
+ )
}
AnimatedVisibility(stalkerProxyEnabled) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {