Skip to content

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

Implement UX and UI improvements including grid-based reorder

Davidona60e80238dcd7
diff --git a/PROJECT_PLAN.md b/PROJECT_PLAN.md
deleted file mode 100644
index 3a02f789..00000000
--- a/PROJECT_PLAN.md
+++ /dev/null
@@ -1,260 +0,0 @@
-# 📺 StreamVault — Android TV IPTV Player
-
-## Project Overview
-
-StreamVault is a production-grade Android TV IPTV player targeting Android 14+ (API 34). It provides Live TV, VOD (Movies), Series, Favorites with manual ordering, and EPG — comparable to IPTV Smarters Pro but with cleaner architecture and better maintainability.
-
----
-
-## 🏗 High-Level Architecture
-
-```
-┌──────────────────────────────────────────────────────┐
-│ :app (Main) │
-│ ┌────────────────────────────────────────────────┐ │
-│ │ Jetpack Compose for TV UI │ │
-│ │ ┌──────┬──────┬──────┬──────┬──────────────┐ │ │
-│ │ │LiveTV│Movies│Series│ Favs │ Settings │ │ │
-│ │ └──────┴──────┴──────┴──────┴──────────────┘ │ │
-│ └─────────────────────┬──────────────────────────┘ │
-│ │ │
-│ ┌─────────────────────▼──────────────────────────┐ │
-│ │ :domain (Use Cases) │ │
-│ │ Channel, Movie, Series, Episode, Program │ │
-│ │ IptvProvider interface │ │
-│ │ Repository interfaces │ │
-│ └──────────┬──────────────────────┬──────────────┘ │
-│ │ │ │
-│ ┌──────────▼───────┐ ┌──────────▼──────────────┐ │
-│ │ :data │ │ :player │ │
-│ │ Room DB │ │ Media3 ExoPlayer │ │
-│ │ Xtream Client │ │ PlayerEngine │ │
-│ │ M3U Parser │ │ HLS/DASH/TS/Prog │ │
-│ │ XMLTV Parser │ │ Decoder selection │ │
-│ │ Repositories │ │ Error recovery │ │
-│ └──────────────────┘ └─────────────────────────┘ │
-└──────────────────────────────────────────────────────┘
-```
-
-The UI never touches Xtream, M3U, or XMLTV directly. It operates exclusively on domain models.
-
----
-
-## 📦 Module Breakdown
-
-### `:domain`
-Pure Kotlin, no Android dependencies.
-- Domain models: `Channel`, `Movie`, `Series`, `Season`, `Episode`, `Program`, `Provider`, `Favorite`, `VirtualGroup`
-- Interfaces: `IptvProvider`, `ChannelRepository`, `MovieRepository`, `SeriesRepository`, `EpgRepository`, `FavoriteRepository`
-- Use cases: `GetChannels`, `GetMovies`, `GetSeries`, `GetEpg`, `ManageFavorites`, `LoginProvider`, `SearchContent`
-
-### `:data`
-Android library, implements `:domain` interfaces.
-- **Room database**: Entities, DAOs, type converters, migrations
-- **Xtream Codes client**: Retrofit service + response DTOs + mapper to domain
-- **M3U parser**: Streaming line parser, tolerant of malformed input
-- **XMLTV parser**: SAX/Pull parser for EPG data, timezone-safe
-- **Repository implementations**: Combining network + cache with offline support
-
-### `:player`
-Android library, wraps Media3.
-- `PlayerEngine` interface (domain-level abstraction)
-- `Media3PlayerEngine` implementation
-- `DataSource` factory supporting custom headers, tokens, cookies
-- Decoder mode selection (Auto/HW/SW)
-- Stream type detection + fallback
-- Resume position tracking
-- Error classification & recovery
-
-### `:app`
-The application module.
-- Compose for TV UI (all screens)
-- Navigation graph
-- Hilt DI setup
-- Theme / design system
-- Focus management utilities
-
----
-
-## ⚙️ Tech Stack Summary
-
-| Layer | Technology |
-|--------------|-------------------------------------|
-| Language | Kotlin 2.0+ |
-| UI | Jetpack Compose for TV 1.0 |
-| Player | Media3 1.5 (ExoPlayer) |
-| Database | Room 2.6 |
-| Networking | OkHttp 4.12 + Retrofit 2.11 |
-| Image Loading| Coil 3.x (Compose) |
-| DI | Hilt |
-| Async | Coroutines + Flow |
-| Build | Gradle Kotlin DSL, AGP 8.7 |
-| Min SDK | 34 (Android 14) |
-| Target | Android TV (Leanback launcher) |
-
----
-
-## 📡 Stream & Codec Support
-
-### Protocols
-- HLS (`.m3u8`) including AES-128 encrypted
-- MPEG-TS over HTTP/HTTPS (`.ts`)
-- DASH (`.mpd`)
-- Progressive HTTP (MP4, MKV)
-- Tokenized / expiring URLs
-- Custom headers (Authorization, User-Agent, Cookie, Referrer)
-
-### Video Codecs (device-dependent)
-- H.264 (AVC) — universal
-- H.265 (HEVC) — most modern devices, 4K where hardware supports
-- MPEG-2 — best effort via hardware decoder
-
-### Audio Codecs
-- AAC, MP3 — universal
-- AC3 / E-AC3 (Dolby Digital / Plus) — passthrough where device supports
-- DTS — passthrough only if device allows
-
-### Decoder Strategy
-- Hardware first → automatic software fallback
-- User-configurable: Auto / Hardware / Software
-- No bundled FFmpeg, no soft-codec magic — honest about device limits
-
----
-
-## 🔒 Explicit Assumptions & Limitations
-
-### Assumptions
-- Target devices are Android TV boxes running Android 14+
-- Users provide their own Xtream Codes credentials or M3U URLs
-- EPG data will be in XMLTV format
-- Internet connection is available during content browsing
-
-### Intentionally NOT Supported
-- ❌ DRM (Widevine, PlayReady, FairPlay) — would require licensing
-- ❌ Recording / PVR — requires local storage management beyond scope
-- ❌ Timeshift (pausing live TV) — requires buffering infrastructure
-- ❌ Picture-in-picture — Android TV PiP is limited and rarely useful
-- ❌ Chromecast output — the app IS the TV target
-- ❌ Mobile phone / tablet layout — Android TV only
-- ❌ Multi-user profiles — future consideration
-- ❌ Cloud sync — future consideration
-- ❌ Stalker Portal / MAC-based providers — Xtream + M3U only for MVP
-- ❌ Subtitle rendering from external sources — embedded subtitles only
-
-### Risks & Mitigations
-
-| Risk | Mitigation |
-|------|-----------|
-| Xtream APIs are undocumented | Use well-known community-documented endpoints; build defensive parsing |
-| M3U playlists are wildly inconsistent | Line-by-line streaming parser with extensive fallbacks |
-| EPG data can be huge (100MB+) | SAX/Pull parser, streaming, background processing, incremental DB updates |
-| Cheap TV boxes have limited RAM | Aggressive image caching, lazy loading, minimal overdraw |
-| Providers rate-limit or block | Configurable request delays, retry with backoff |
-| Stream URLs expire | Re-fetch URL on playback start, handle 403/410 gracefully |
-| Android TV focus system is fragile | Explicit focus management, no reliance on implicit Compose guessing |
-
----
-
-## 📐 Project Structure
-
-```
-streamvault/
-├── app/
-│ ├── src/main/
-│ │ ├── java/com/streamvault/app/
-│ │ │ ├── StreamVaultApp.kt
-│ │ │ ├── MainActivity.kt
-│ │ │ ├── di/ # Hilt modules
-│ │ │ ├── navigation/ # Navigation graph
-│ │ │ └── ui/
-│ │ │ ├── theme/ # Colors, typography, theme
-│ │ │ ├── components/ # Reusable card, list, focus components
-│ │ │ ├── screens/
-│ │ │ │ ├── home/ # Live TV
-│ │ │ │ ├── movies/ # Movies
-│ │ │ │ ├── series/ # Series
-│ │ │ │ ├── favorites/ # Favorites + virtual groups
-│ │ │ │ ├── player/ # Playback screen
-│ │ │ │ ├── epg/ # EPG timeline
-│ │ │ │ ├── settings/ # Settings + provider mgmt
-│ │ │ │ └── provider/ # Add/login provider
-│ │ │ └── util/ # Focus helpers, modifiers
-│ │ ├── res/
-│ │ └── AndroidManifest.xml
-│ └── build.gradle.kts
-├── domain/
-│ ├── src/main/java/com/streamvault/domain/
-│ │ ├── model/
-│ │ ├── repository/
-│ │ ├── usecase/
-│ │ └── provider/
-│ └── build.gradle.kts
-├── data/
-│ ├── src/main/java/com/streamvault/data/
-│ │ ├── local/ # Room entities, DAOs, database
-│ │ ├── remote/
-│ │ │ ├── xtream/ # Xtream Codes API
-│ │ │ └── dto/ # Network DTOs
-│ │ ├── parser/
-│ │ │ ├── m3u/ # M3U parser
-│ │ │ └── epg/ # XMLTV parser
-│ │ ├── mapper/ # DTO → Domain mappers
-│ │ └── repository/ # Repository implementations
-│ └── build.gradle.kts
-├── player/
-│ ├── src/main/java/com/streamvault/player/
-│ │ ├── PlayerEngine.kt # Interface
-│ │ ├── Media3PlayerEngine.kt # Implementation
-│ │ ├── StreamTypeDetector.kt
-│ │ ├── CustomDataSourceFactory.kt
-│ │ └── DecoderMode.kt
-│ └── build.gradle.kts
-├── build.gradle.kts # Root build file
-├── settings.gradle.kts
-├── gradle.properties
-└── gradle/
- └── libs.versions.toml # Version catalog
-```
-
----
-
-## 🗓 Development Phases
-
-### Phase 1 — Foundation (Core infrastructure)
-- Project scaffolding, Gradle config, version catalog
-- Domain models and interfaces
-- Room database schema
-- Basic Hilt DI setup
-
-### Phase 2 — Data Layer (Providers + parsing)
-- Xtream Codes API client
-- M3U parser
-- XMLTV EPG parser
-- Repository implementations
-
-### Phase 3 — Player (Playback engine)
-- Media3 wrapper
-- Stream type detection
-- Custom headers / tokens
-- Decoder mode selection
-- Error handling + recovery
-
-### Phase 4 — UI Shell (Navigation + screens)
-- Theme / design system
-- Top-level navigation scaffold
-- Live TV screen
-- Movies screen
-- Series screen
-
-### Phase 5 — Features (EPG, Favorites, Settings)
-- EPG timeline UI
-- Favorites with manual ordering
-- Virtual groups / collections
-- Settings screen
-- Provider management
-
-### Phase 6 — Polish & Release
-- Error handling across all layers
-- Performance optimization
-- APK signing
-- Testing on emulator
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
index 6c3f4e06..905a3f8e 100644
--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt
@@ -7,6 +7,8 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument
import com.streamvault.app.ui.screens.favorites.FavoritesScreen
+import com.streamvault.app.ui.screens.favorites.FavoriteUiModel
+
import com.streamvault.app.ui.screens.home.HomeScreen
import com.streamvault.app.ui.screens.movies.MoviesScreen
import com.streamvault.app.ui.screens.player.PlayerScreen
@@ -162,18 +164,23 @@ fun AppNavigation() {
composable(Routes.FAVORITES) {
FavoritesScreen(
- onItemClick = { streamUrl, title ->
- navController.navigate(Routes.player(streamUrl, title))
+ onItemClick = { item ->
+ navController.navigate(
+ Routes.player(
+ streamUrl = item.streamUrl,
+ title = item.title,
+ internalId = item.favorite.contentId,
+ categoryId = -999L, // Global favorites virtual category
+ providerId = -1L,
+ isVirtual = true,
+ contentType = item.favorite.contentType.name
+ )
+ )
},
onNavigate = { route ->
navController.navigate(route) {
- // Pop up to the start destination and save state
- popUpTo(Routes.HOME) {
- saveState = true
- }
- // Avoid multiple copies of the same destination when reselecting
+ popUpTo(Routes.HOME) { saveState = true }
launchSingleTop = true
- // Restore state when reselecting a previously selected item
restoreState = true
}
},
diff --git a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
index 08454edd..b8ea0c4b 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
@@ -44,17 +44,22 @@ fun FocusableCard(
onLongClick: (() -> Unit)? = null,
width: Dp = 160.dp,
height: Dp = 240.dp,
+ isReorderMode: Boolean = false,
+ isDragging: Boolean = false,
content: @Composable BoxScope.(Boolean) -> Unit
) {
var isFocused by remember { mutableStateOf(false) }
+ // In reorder mode, only the dragging item scales. Otherwise grid is static.
+ val targetScale = if (isDragging) 1.08f else if (isFocused && !isReorderMode) 1.08f else 1f
+
val scale by animateFloatAsState(
- targetValue = if (isFocused) 1.08f else 1f,
+ targetValue = targetScale,
animationSpec = tween(durationMillis = 200, easing = FastOutSlowInEasing),
label = "cardScale"
)
val shadowElevation by animateFloatAsState(
- targetValue = if (isFocused) 24f else 0f,
+ targetValue = if (isFocused || isDragging) 24f else 0f,
animationSpec = tween(200, easing = FastOutSlowInEasing),
label = "cardShadow"
)
@@ -82,7 +87,10 @@ fun FocusableCard(
shape = RoundedCornerShape(10.dp)
),
focusedBorder = Border(
- border = BorderStroke(2.dp, Primary),
+ border = BorderStroke(
+ width = if (isDragging) 4.dp else 2.dp,
+ color = if (isDragging) AccentAmber else Primary
+ ),
shape = RoundedCornerShape(10.dp)
)
)
@@ -101,14 +109,18 @@ fun ChannelCard(
onClick: () -> Unit,
modifier: Modifier = Modifier,
onLongClick: (() -> Unit)? = null,
- isLocked: Boolean = false
+ isLocked: Boolean = false,
+ isReorderMode: Boolean = false,
+ isDragging: Boolean = false
) {
FocusableCard(
onClick = onClick,
onLongClick = onLongClick,
modifier = modifier,
width = 280.dp,
- height = 157.dp
+ height = 157.dp,
+ isReorderMode = isReorderMode,
+ isDragging = isDragging
) { isFocused ->
// Background: logo or solid surface
if (!channel.logoUrl.isNullOrBlank() && !isLocked) {
@@ -218,7 +230,7 @@ fun ChannelCard(
}
}
-// ── Movie Card (2:3 poster) ────────────────────────────────────────
+// ── Movie Card (16:9 landscape thumbnail) ─────────────────────────────────────────
@Composable
fun MovieCard(
@@ -233,8 +245,8 @@ fun MovieCard(
onClick = onClick,
onLongClick = onLongClick,
modifier = modifier,
- width = 150.dp,
- height = 225.dp
+ width = 240.dp,
+ height = 135.dp
) { isFocused ->
// Poster image
if (!movie.posterUrl.isNullOrBlank() && !isLocked) {
@@ -332,7 +344,7 @@ fun MovieCard(
}
}
-// ── Series Card (2:3 poster) ───────────────────────────────────────
+// ── Series Card (16:9 landscape thumbnail) ────────────────────────────────────────
@Composable
fun SeriesCard(
@@ -351,8 +363,8 @@ fun SeriesCard(
onClick = onClick,
onLongClick = onLongClick,
modifier = modifier,
- width = 150.dp,
- height = 225.dp
+ width = 240.dp,
+ height = 135.dp
) { isFocused ->
// Poster image
if (!posterUrl.isNullOrBlank() && !isLocked) {
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
index 51b40949..ffe5522a 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
@@ -43,9 +43,7 @@ fun AddToGroupDialog(
onToggleFavorite: () -> Unit,
onAddToGroup: (Category) -> Unit,
onRemoveFromGroup: (Category) -> Unit,
- onCreateGroup: (String) -> Unit,
- onMoveUp: (() -> Unit)? = null,
- onMoveDown: (() -> Unit)? = null
+ onCreateGroup: (String) -> Unit
) {
var showCreateGroup by remember { mutableStateOf(false) }
var newGroupName by remember { mutableStateOf("") }
@@ -162,30 +160,7 @@ fun AddToGroupDialog(
}
}
- // Reordering Controls (only if enabled)
- if (onMoveUp != null && onMoveDown != null) {
- item {
- Text(
- text = stringResource(R.string.add_group_reorder_title),
- style = MaterialTheme.typography.titleMedium,
- modifier = Modifier.padding(top = 8.dp, bottom = 4.dp)
- )
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.SpaceEvenly
- ) {
- OutlinedButton(onClick = onMoveUp, modifier = Modifier.weight(1f)) {
- Text(stringResource(R.string.add_group_move_up))
- }
- Spacer(modifier = Modifier.width(8.dp))
- OutlinedButton(onClick = onMoveDown, modifier = Modifier.weight(1f)) {
- Text(stringResource(R.string.add_group_move_down))
- }
- }
- HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
- }
- }
-
+ // Reordering Controls removed (handled in dedicated reorder mode)
item {
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
Text(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
index ef45a1cc..944cc3e9 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
@@ -22,7 +22,8 @@ fun CategoryOptionsDialog(
onDismissRequest: () -> Unit,
onSetAsDefault: () -> Unit,
onToggleLock: () -> Unit,
- onDelete: (() -> Unit)? = null
+ onDelete: (() -> Unit)? = null,
+ onReorderChannels: (() -> Unit)? = null
) {
// Fix for ghost clicks: Debounce interaction for 500ms to ignore long-press release
var canInteract by remember { mutableStateOf(false) }
@@ -42,36 +43,43 @@ fun CategoryOptionsDialog(
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
// Option 1: Set as Default
- androidx.compose.material3.Button(
+ androidx.tv.material3.Button(
onClick = { if (canInteract) onSetAsDefault() },
- modifier = Modifier.fillMaxWidth(),
- colors = androidx.compose.material3.ButtonDefaults.buttonColors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- contentColor = MaterialTheme.colorScheme.onSurface
- )
+ modifier = Modifier.fillMaxWidth()
) {
Text(stringResource(R.string.category_options_set_default))
}
- // Option 2: Lock/Unlock
+ // Option 2: Reorder Channels (only for virtual/custom categories)
+ if (onReorderChannels != null) {
+ androidx.tv.material3.Button(
+ onClick = {
+ if (canInteract) {
+ onReorderChannels()
+ onDismissRequest()
+ }
+ },
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text("↕ Reorder Channels")
+ }
+ }
+
+ // Option 3: Lock/Unlock
val lockText = if (category.isUserProtected) stringResource(R.string.category_options_unlock) else stringResource(R.string.category_options_lock)
- androidx.compose.material3.Button(
+ androidx.tv.material3.Button(
onClick = { if (canInteract) onToggleLock() },
- modifier = Modifier.fillMaxWidth(),
- colors = androidx.compose.material3.ButtonDefaults.buttonColors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- contentColor = MaterialTheme.colorScheme.onSurface
- )
+ modifier = Modifier.fillMaxWidth()
) {
Text(lockText)
}
- // Option 3: Delete (Optional)
+ // Option 4: Delete (Optional)
if (onDelete != null) {
- androidx.compose.material3.Button(
+ androidx.tv.material3.Button(
onClick = { if (canInteract) onDelete() },
modifier = Modifier.fillMaxWidth(),
- colors = androidx.compose.material3.ButtonDefaults.buttonColors(
+ colors = androidx.tv.material3.ButtonDefaults.colors(
containerColor = MaterialTheme.colorScheme.errorContainer,
contentColor = MaterialTheme.colorScheme.onErrorContainer
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
index 5a18f6bf..902ddf32 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
@@ -1,8 +1,14 @@
package com.streamvault.app.ui.screens.favorites
import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
@@ -13,6 +19,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.*
+import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.tv.material3.*
@@ -23,7 +30,7 @@ import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
@Composable
fun FavoritesScreen(
- onItemClick: (streamUrl: String, title: String) -> Unit,
+ onItemClick: (FavoriteUiModel) -> Unit,
onNavigate: (String) -> Unit,
currentRoute: String,
viewModel: FavoritesViewModel = hiltViewModel()
@@ -51,112 +58,178 @@ fun FavoritesScreen(
}
}
} else {
- LazyColumn(
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(32.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- // Virtual groups
- if (uiState.groups.isNotEmpty()) {
- items(uiState.groups, key = { it.id }) { group ->
- Text(
- text = "${group.iconEmoji ?: "📁"} ${group.name}",
- style = MaterialTheme.typography.titleMedium,
- color = OnBackground,
- modifier = Modifier.padding(vertical = 8.dp)
- )
+ Box(modifier = Modifier.fillMaxSize()) {
+ // Main favorites list
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(32.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ // Virtual groups
+ if (uiState.groups.isNotEmpty()) {
+ items(uiState.groups, key = { it.id }) { group ->
+ Text(
+ text = "${group.iconEmoji ?: "📁"} ${group.name}",
+ style = MaterialTheme.typography.titleMedium,
+ color = OnBackground,
+ modifier = Modifier.padding(vertical = 8.dp)
+ )
+ }
}
- }
- // All favorites
- items(uiState.favorites, key = { it.favorite.id }) { item ->
- val isReorderingThis = uiState.isReorderMode && uiState.reorderItem?.id == item.favorite.id
- val scale by animateFloatAsState(if (isReorderingThis) 1.05f else 1f)
-
- Surface(
- onClick = {
- if (uiState.isReorderMode) {
- if (isReorderingThis) viewModel.saveReorder()
- } else {
- if (item.favorite.contentType == ContentType.SERIES) {
- onNavigate("series_detail/${item.favorite.contentId}")
+ // All favorites
+ items(uiState.favorites, key = { it.favorite.id }) { item ->
+ val isReorderingThis = uiState.isReorderMode && uiState.reorderItem?.id == item.favorite.id
+ val scale by animateFloatAsState(if (isReorderingThis) 1.05f else 1f)
+
+ Surface(
+ onClick = {
+ if (uiState.isReorderMode) {
+ if (isReorderingThis) viewModel.saveReorder()
} else {
- onItemClick(item.streamUrl, item.title)
+ if (item.favorite.contentType == ContentType.SERIES) {
+ onNavigate("series_detail/${item.favorite.contentId}")
+ } else {
+ onItemClick(item)
+ }
}
- }
- },
- onLongClick = {
- viewModel.enterReorderMode(item)
- },
- modifier = Modifier
- .fillMaxWidth()
- .height(56.dp)
- .scale(scale)
- .then(
- if (isReorderingThis) {
- Modifier.onKeyEvent { event ->
- if (event.type == KeyEventType.KeyDown) {
- when (event.nativeKeyEvent.keyCode) {
- android.view.KeyEvent.KEYCODE_DPAD_UP -> {
- viewModel.moveItem(-1)
- true
- }
- android.view.KeyEvent.KEYCODE_DPAD_DOWN -> {
- viewModel.moveItem(1)
- true
- }
- android.view.KeyEvent.KEYCODE_DPAD_CENTER, android.view.KeyEvent.KEYCODE_ENTER -> {
- viewModel.saveReorder()
- true
- }
- android.view.KeyEvent.KEYCODE_BACK -> {
- viewModel.exitReorderMode()
- true
+ },
+ onLongClick = {
+ viewModel.enterReorderMode(item)
+ },
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(56.dp)
+ .scale(scale)
+ .then(
+ if (isReorderingThis) {
+ Modifier.onKeyEvent { event ->
+ if (event.type == KeyEventType.KeyDown) {
+ when (event.nativeKeyEvent.keyCode) {
+ android.view.KeyEvent.KEYCODE_DPAD_UP -> {
+ viewModel.moveItem(-1)
+ true
+ }
+ android.view.KeyEvent.KEYCODE_DPAD_DOWN -> {
+ viewModel.moveItem(1)
+ true
+ }
+ android.view.KeyEvent.KEYCODE_DPAD_CENTER, android.view.KeyEvent.KEYCODE_ENTER -> {
+ viewModel.saveReorder()
+ true
+ }
+ android.view.KeyEvent.KEYCODE_BACK -> {
+ viewModel.exitReorderMode()
+ true
+ }
+ else -> false
}
- else -> false
- }
- } else false
- }
- } else Modifier
+ } else false
+ }
+ } else Modifier
+ ),
+ shape = ClickableSurfaceDefaults.shape(
+ RoundedCornerShape(8.dp)
),
- shape = ClickableSurfaceDefaults.shape(
- RoundedCornerShape(8.dp)
- ),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = if (isReorderingThis) Primary.copy(alpha = 0.2f) else SurfaceElevated,
- focusedContainerColor = if (isReorderingThis) Primary else SurfaceHighlight,
- contentColor = if (isReorderingThis) Primary else OnSurface,
- focusedContentColor = if (isReorderingThis) OnPrimary else OnSurface
- ),
- border = ClickableSurfaceDefaults.border(
- border = Border(
- border = BorderStroke(
- width = if (isReorderingThis) 2.dp else 0.dp,
- color = if (isReorderingThis) Primary else Color.Transparent
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isReorderingThis) Primary.copy(alpha = 0.2f) else SurfaceElevated,
+ focusedContainerColor = if (isReorderingThis) Primary else SurfaceHighlight,
+ contentColor = if (isReorderingThis) Primary else OnSurface,
+ focusedContentColor = if (isReorderingThis) OnPrimary else OnSurface
+ ),
+ border = ClickableSurfaceDefaults.border(
+ border = Border(
+ border = BorderStroke(
+ width = if (isReorderingThis) 2.dp else 0.dp,
+ color = if (isReorderingThis) Primary else Color.Transparent
+ )
)
)
- )
- ) {
- Row(
- modifier = Modifier
- .fillMaxSize()
- .padding(horizontal = 16.dp),
- verticalAlignment = Alignment.CenterVertically
) {
- Text(
- text = item.title,
- style = MaterialTheme.typography.bodyMedium,
- color = if (isReorderingThis) Primary else OnSurface
- )
- Spacer(Modifier.weight(1f))
- if (isReorderingThis) {
- Text("↕ " + stringResource(R.string.favorites_reordering), style = MaterialTheme.typography.bodySmall, color = Primary)
- } else {
+ Row(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(horizontal = 16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
Text(
- text = item.subtitle ?: "",
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
+ text = item.title,
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isReorderingThis) Primary else OnSurface
)
+ Spacer(Modifier.weight(1f))
+ if (isReorderingThis) {
+ Text("↕ " + stringResource(R.string.favorites_reordering), style = MaterialTheme.typography.bodySmall, color = Primary)
+ } else {
+ Text(
+ text = item.subtitle ?: "",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
+ }
+ }
+ }
+
+ // Reorder mode hint — compact top-right corner overlay
+ androidx.compose.animation.AnimatedVisibility(
+ visible = uiState.isReorderMode,
+ enter = slideInHorizontally(initialOffsetX = { it }) + fadeIn(),
+ exit = slideOutHorizontally(targetOffsetX = { it }) + fadeOut(),
+ modifier = Modifier.align(Alignment.TopEnd).padding(top = 24.dp)
+ ) {
+ Column(
+ modifier = Modifier
+ .width(220.dp)
+ .heightIn(max = 280.dp)
+ .background(CardBackground.copy(alpha = 0.97f), RoundedCornerShape(topStart = 12.dp, bottomStart = 12.dp))
+ .padding(16.dp),
+ verticalArrangement = Arrangement.spacedBy(10.dp)
+ ) {
+ // Header
+ Text(
+ text = "↕ Reorder Mode",
+ style = MaterialTheme.typography.titleSmall,
+ color = Primary
+ )
+
+ // Button hints
+ Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+ ReorderHintRow(icon = "▲", label = "Move Up")
+ ReorderHintRow(icon = "▼", label = "Move Down")
+ ReorderHintRow(icon = "●", label = "Confirm")
+ ReorderHintRow(icon = "← Back", label = "Cancel")
+ }
+
+ // Mini-map — only show up to 8 items to keep panel compact
+ val movingId = uiState.reorderItem?.id
+ Column(
+ modifier = Modifier
+ .background(SurfaceElevated.copy(alpha = 0.5f), RoundedCornerShape(6.dp))
+ .padding(8.dp),
+ verticalArrangement = Arrangement.spacedBy(3.dp)
+ ) {
+ uiState.favorites.take(10).forEach { item ->
+ val isMoving = movingId == item.favorite.id
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = if (isMoving) "▶ " else " ",
+ style = MaterialTheme.typography.labelSmall,
+ color = Primary
+ )
+ Text(
+ text = item.title,
+ style = MaterialTheme.typography.labelSmall,
+ color = if (isMoving) Primary else OnSurfaceDim,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ }
}
}
}
@@ -171,3 +244,22 @@ fun FavoritesScreen(
}
}
}
+
+@Composable
+private fun ReorderHintRow(icon: String, label: String) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ Box(
+ modifier = Modifier
+ .background(SurfaceHighlight, RoundedCornerShape(4.dp))
+ .padding(horizontal = 8.dp, vertical = 4.dp)
+ ) {
+ Text(icon, style = MaterialTheme.typography.labelSmall, color = Primary)
+ }
+ Text(label, style = MaterialTheme.typography.labelSmall, color = OnSurfaceDim)
+ }
+}
+
+
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index e04af89b..5ec81b55 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -18,6 +18,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.foundation.focusGroup
+import androidx.compose.ui.input.key.*
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.Icons
@@ -135,6 +137,9 @@ fun HomeScreen(
viewModel.dismissCategoryOptions()
viewModel.requestDeleteGroup(category)
}
+ } else null,
+ onReorderChannels = if (category.isVirtual) {
+ { viewModel.enterChannelReorderMode(category) }
} else null
)
}
@@ -142,15 +147,59 @@ fun HomeScreen(
Box(modifier = Modifier.fillMaxSize()) {
Column(modifier = Modifier.fillMaxSize()) {
Row(
- modifier = Modifier.fillMaxWidth(),
+ modifier = Modifier.fillMaxWidth().height(80.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
- TopNavBar(
- currentRoute = currentRoute,
- onNavigate = onNavigate,
- modifier = Modifier.weight(1f)
- )
+ if (uiState.isChannelReorderMode) {
+ androidx.compose.animation.AnimatedVisibility(
+ visible = true,
+ enter = androidx.compose.animation.slideInVertically(initialOffsetY = { -it }),
+ exit = androidx.compose.animation.slideOutVertically(targetOffsetY = { -it }),
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp)
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ "Reordering '${uiState.selectedCategory?.name ?: "Channels"}'",
+ style = MaterialTheme.typography.titleLarge,
+ color = Primary
+ )
+ Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+ androidx.tv.material3.Button(
+ onClick = { viewModel.exitChannelReorderMode() },
+ colors = androidx.tv.material3.ButtonDefaults.colors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ contentColor = OnSurface
+ )
+ ) { Text("Cancel", modifier = Modifier.padding(horizontal = 8.dp)) }
+
+ androidx.tv.material3.Button(
+ onClick = { viewModel.saveChannelReorder() },
+ colors = androidx.tv.material3.ButtonDefaults.colors(
+ containerColor = Primary,
+ contentColor = Color.White
+ )
+ ) { Text("Save Order", modifier = Modifier.padding(horizontal = 8.dp)) }
+ }
+ }
+ }
+ } else {
+ androidx.compose.animation.AnimatedVisibility(
+ visible = true,
+ enter = androidx.compose.animation.slideInVertically(initialOffsetY = { -it }),
+ exit = androidx.compose.animation.slideOutVertically(targetOffsetY = { -it })
+ ) {
+ TopNavBar(
+ currentRoute = currentRoute,
+ onNavigate = onNavigate,
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+ }
// Playlist Switcher - REMOVED (Moved to Settings)
}
@@ -333,10 +382,35 @@ fun HomeScreen(
ignoreNextClick = false
}
}
+
+ // Reorder Drag State
+ var draggingChannel by remember { mutableStateOf<Channel?>(null) }
+ // Exit drag state if reorder mode is cancelled
+ LaunchedEffect(uiState.isChannelReorderMode) {
+ if (!uiState.isChannelReorderMode) {
+ draggingChannel = null
+ }
+ }
+
LazyVerticalGrid(
columns = GridCells.Adaptive(minSize = 180.dp),
- modifier = Modifier.fillMaxSize(),
+ modifier = Modifier
+ .fillMaxSize()
+ // Handle BACK key to cancel reorder mode
+ .onPreviewKeyEvent { event ->
+ if (uiState.isChannelReorderMode && event.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+ if (event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_BACK) {
+ if (draggingChannel != null) {
+ draggingChannel = null // Drop item
+ true
+ } else {
+ viewModel.exitChannelReorderMode()
+ true
+ }
+ } else false
+ } else false
+ },
contentPadding = PaddingValues(start = 24.dp, end = 24.dp, bottom = 32.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp)
@@ -346,12 +420,18 @@ fun HomeScreen(
key = { it.id }
) { channel ->
val isLocked = (channel.isAdult || channel.isUserProtected || (uiState.selectedCategory?.isUserProtected ?: false)) && uiState.parentalControlLevel == 1
+ val isDraggingThis = draggingChannel == channel
ChannelCard(
channel = channel,
isLocked = isLocked,
+ isReorderMode = uiState.isChannelReorderMode,
+ isDragging = isDraggingThis,
onClick = {
- if (ignoreNextClick) {
+ if (uiState.isChannelReorderMode) {
+ // Toggle drag state
+ draggingChannel = if (isDraggingThis) null else channel
+ } else if (ignoreNextClick) {
ignoreNextClick = false
} else if (!uiState.showDialog) {
if (isLocked) {
@@ -363,12 +443,25 @@ fun HomeScreen(
}
},
onLongClick = {
- // Allow long click even if locked? Maybe restricts context menu?
- // For now, allow it (e.g. to delete from favorites/groups)
- ignoreNextClick = true
- viewModel.onShowDialog(channel)
+ if (!uiState.isChannelReorderMode) {
+ ignoreNextClick = true
+ viewModel.onShowDialog(channel)
+ }
},
- modifier = Modifier.aspectRatio(16f/9f)
+ modifier = Modifier
+ .aspectRatio(16f/9f)
+ .onPreviewKeyEvent { event ->
+ if (uiState.isChannelReorderMode && isDraggingThis && event.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+ // Consume D-pad to move item instead of changing focus
+ when (event.nativeKeyEvent.keyCode) {
+ android.view.KeyEvent.KEYCODE_DPAD_LEFT -> { viewModel.moveChannelUp(channel); true }
+ android.view.KeyEvent.KEYCODE_DPAD_UP -> { viewModel.moveChannelUp(channel); true }
+ android.view.KeyEvent.KEYCODE_DPAD_RIGHT -> { viewModel.moveChannelDown(channel); true }
+ android.view.KeyEvent.KEYCODE_DPAD_DOWN -> { viewModel.moveChannelDown(channel); true }
+ else -> false
+ }
+ } else false
+ }
)
}
}
@@ -377,7 +470,7 @@ fun HomeScreen(
}
}
}
-
+
SnackbarHost(
hostState = snackbarHostState,
modifier = Modifier
@@ -397,8 +490,6 @@ fun HomeScreen(
onDismiss = { viewModel.onDismissDialog() },
onToggleFavorite = {
if (channel.isFavorite) viewModel.removeFavorite(channel) else viewModel.addFavorite(channel)
- // Dialog dismissed by ViewModel via side-effect or manually here?
- // VM dismisses it now.
},
onAddToGroup = { group ->
viewModel.addToGroup(channel, group)
@@ -406,9 +497,7 @@ fun HomeScreen(
onRemoveFromGroup = { group ->
viewModel.removeFromGroup(channel, group)
},
- onCreateGroup = { name -> viewModel.createCustomGroup(name) },
- onMoveUp = if (uiState.selectedCategory?.isVirtual == true) { { viewModel.moveChannel(channel, -1) } } else null,
- onMoveDown = if (uiState.selectedCategory?.isVirtual == true) { { viewModel.moveChannel(channel, 1) } } else null
+ onCreateGroup = { name -> viewModel.createCustomGroup(name) }
)
}
@@ -556,3 +645,148 @@ fun SearchInput(
}
}
}
+
+@Composable
+fun ReorderSidePanel(
+ channels: List<Channel>,
+ onMoveUp: (Channel) -> Unit,
+ onMoveDown: (Channel) -> Unit,
+ onSave: () -> Unit,
+ onCancel: () -> Unit
+) {
+ var draggingChannel by remember { mutableStateOf<Channel?>(null) }
+
+ // Focus requester to trap focus inside the panel
+ val panelFocusRequester = remember { androidx.compose.ui.focus.FocusRequester() }
+
+ LaunchedEffect(Unit) {
+ panelFocusRequester.requestFocus()
+ }
+
+ Box(
+ modifier = Modifier
+ .fillMaxHeight()
+ .width(280.dp)
+ .background(SurfaceElevated)
+ .padding(16.dp)
+ .focusRequester(panelFocusRequester)
+ .focusGroup() // Traps D-pad focus in this container
+ ) {
+ Column(modifier = Modifier.fillMaxSize()) {
+ // Header
+ Text(
+ "Reorder Channels",
+ style = MaterialTheme.typography.titleMedium,
+ color = Primary,
+ modifier = Modifier.padding(bottom = 12.dp)
+ )
+
+ // Actions
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp)
+ ) {
+ androidx.tv.material3.Button(
+ onClick = onSave,
+ colors = androidx.tv.material3.ButtonDefaults.colors(
+ containerColor = Primary,
+ contentColor = Color.White
+ ),
+ modifier = Modifier.weight(1f)
+ ) { Text("Save", maxLines = 1) }
+
+ androidx.tv.material3.Button(
+ onClick = onCancel,
+ colors = androidx.tv.material3.ButtonDefaults.colors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ contentColor = OnSurface
+ ),
+ modifier = Modifier.weight(1f)
+ ) { Text("Cancel", maxLines = 1) }
+ }
+
+ // List
+ androidx.compose.foundation.lazy.LazyColumn(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ items(channels.size) { index ->
+ val channel = channels[index]
+ var isFocused by remember { mutableStateOf(false) }
+ val isDraggingThis = draggingChannel == channel
+
+ Surface(
+ onClick = {
+ draggingChannel = if (isDraggingThis) null else channel
+ },
+ modifier = Modifier
+ .fillMaxWidth()
+ .onFocusChanged { isFocused = it.isFocused }
+ .onKeyEvent { event ->
+ if (event.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) {
+ if (isDraggingThis) {
+ when (event.nativeKeyEvent.keyCode) {
+ android.view.KeyEvent.KEYCODE_DPAD_UP -> {
+ onMoveUp(channel)
+ true
+ }
+ android.view.KeyEvent.KEYCODE_DPAD_DOWN -> {
+ onMoveDown(channel)
+ true
+ }
+ else -> false
+ }
+ } else {
+ // Trap focus left/right so we don't accidentally exit panel
+ if (event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_DPAD_LEFT ||
+ event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_DPAD_RIGHT) {
+ true
+ } else {
+ false
+ }
+ }
+ } else false
+ },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ focusedContainerColor = if (isDraggingThis) Primary else Primary.copy(alpha = 0.2f),
+ containerColor = if (isDraggingThis) Primary.copy(alpha = 0.5f) else Color.Transparent
+ ),
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = Border(
+ border = BorderStroke(2.dp, FocusBorder),
+ shape = RoundedCornerShape(8.dp)
+ )
+ )
+ ) {
+ Row(
+ modifier = Modifier.padding(12.dp).fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ if (isDraggingThis) {
+ Text("↕", color = Color.White, modifier = Modifier.padding(end = 8.dp))
+ }
+ Text(
+ "${index + 1}. ${channel.name}",
+ modifier = Modifier.weight(1f),
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isDraggingThis) Color.White else if (isFocused) OnBackground else OnSurface,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ )
+ }
+ }
+ }
+ }
+
+ // Helper Text
+ Text(
+ if (draggingChannel != null) "UP/DOWN to move.\nOK to drop." else "OK to grab channel.",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ modifier = Modifier.padding(top = 16.dp).fillMaxWidth(),
+ textAlign = androidx.compose.ui.text.style.TextAlign.Center
+ )
+ }
+ }
+}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
index d812b5b2..6d27ecad 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt
@@ -401,6 +401,85 @@ class HomeViewModel @Inject constructor(
fun dismissCategoryOptions() {
_uiState.update { it.copy(selectedCategoryForOptions = null) }
}
+
+ fun enterChannelReorderMode(category: Category) {
+ dismissCategoryOptions()
+ _uiState.update { it.copy(isChannelReorderMode = true, reorderCategory = category) }
+ }
+
+ fun exitChannelReorderMode() {
+ // Discard any unsaved sorting by restoring from the original local snapshot
+ _uiState.update { it.copy(
+ isChannelReorderMode = false,
+ reorderCategory = null,
+ filteredChannels = _localChannels.value
+ ) }
+ }
+
+ fun moveChannelUp(channel: Channel) {
+ val state = _uiState.value
+ val list = state.filteredChannels.toMutableList()
+ val idx = list.indexOf(channel)
+ if (idx > 0) {
+ list.removeAt(idx)
+ list.add(idx - 1, channel)
+ _uiState.update { it.copy(filteredChannels = list) }
+ }
+ }
+
+ fun moveChannelDown(channel: Channel) {
+ val state = _uiState.value
+ val list = state.filteredChannels.toMutableList()
+ val idx = list.indexOf(channel)
+ if (idx >= 0 && idx < list.size - 1) {
+ list.removeAt(idx)
+ list.add(idx + 1, channel)
+ _uiState.update { it.copy(filteredChannels = list) }
+ }
+ }
+
+ fun saveChannelReorder() {
+ val state = _uiState.value
+ val category = state.reorderCategory ?: return
+ val currentList = state.filteredChannels
+
+ // Exit reorder mode immediately for responsive UI
+ _uiState.update { it.copy(isChannelReorderMode = false, reorderCategory = null) }
+
+ // Optimistically update local channels to match the new order before DB flow catches up
+ _localChannels.value = currentList
+
+ viewModelScope.launch {
+ try {
+ // Map the virtual category ID back to the Favorite Group ID
+ val groupId = if (category.id == -999L) null else -category.id
+
+ val favoritesFlow = if (groupId == null) {
+ favoriteRepository.getFavorites(ContentType.LIVE)
+ } else {
+ favoriteRepository.getFavoritesByGroup(groupId)
+ }
+
+ // Get current favorites
+ val favorites = favoritesFlow.first()
+ val favoriteMap = favorites.associateBy { it.contentId }
+
+ // Map the sorted Channel list back to Favorite entities with new positions
+ val reorderedFavorites = currentList.mapNotNull { ch ->
+ favoriteMap[ch.id]
+ }.mapIndexed { i, fav ->
+ fav.copy(position = i)
+ }
+
+ // Persist the new order in DB
+ favoriteRepository.reorderFavorites(reorderedFavorites)
+
+ _uiState.update { it.copy(userMessage = "Channel order saved") }
+ } catch (e: Exception) {
+ _uiState.update { it.copy(userMessage = "Failed to save channel order") }
+ }
+ }
+ }
}
data class HomeUiState(
@@ -420,5 +499,7 @@ data class HomeUiState(
val showDeleteGroupDialog: Boolean = false,
val groupToDelete: Category? = null,
val parentalControlLevel: Int = 0,
- val selectedCategoryForOptions: Category? = null
+ val selectedCategoryForOptions: Category? = null,
+ val isChannelReorderMode: Boolean = false,
+ val reorderCategory: Category? = null
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
index c11be000..6dc168bb 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.movies
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.text.BasicTextField
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -16,6 +17,9 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
@@ -28,6 +32,7 @@ import com.streamvault.domain.model.Movie
import kotlinx.coroutines.launch
import androidx.compose.ui.res.stringResource
import com.streamvault.app.R
+import androidx.compose.ui.text.input.TextFieldValue
@Composable
fun MoviesScreen(
@@ -74,9 +79,9 @@ fun MoviesScreen(
items(3) {
SkeletonRow(
modifier = Modifier.fillMaxWidth(),
- cardWidth = 140,
- cardHeight = 210,
- itemsCount = 10
+ cardWidth = 240,
+ cardHeight = 135,
+ itemsCount = 4
)
}
}
@@ -89,84 +94,263 @@ fun MoviesScreen(
}
}
} else {
- LazyColumn(
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(bottom = 32.dp)
- ) {
- item {
- Surface(
- onClick = { onNavigate(Routes.SEARCH) },
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 32.dp, vertical = 8.dp),
- shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = SurfaceElevated,
- focusedContainerColor = Primary.copy(alpha = 0.2f)
+ Row(modifier = Modifier.fillMaxSize()) {
+ // Category sidebar
+ LazyColumn(
+ modifier = Modifier
+ .width(220.dp)
+ .fillMaxHeight()
+ .background(SurfaceElevated.copy(alpha = 0.5f))
+ .padding(vertical = 8.dp)
+ ) {
+ item {
+ Text(
+ text = "Categories",
+ style = MaterialTheme.typography.titleMedium,
+ color = Primary,
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
)
- ) {
- Row(
- modifier = Modifier.padding(16.dp),
- verticalAlignment = Alignment.CenterVertically
+ }
+ // Search box — keyboard only opens on OK press (not on D-pad focus)
+ item {
+ val keyboardController = androidx.compose.ui.platform.LocalSoftwareKeyboardController.current
+ val searchFocusRequester = remember { androidx.compose.ui.focus.FocusRequester() }
+ var searchFieldFocused by remember { mutableStateOf(false) }
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 4.dp)
+ .height(44.dp)
+ .background(
+ if (searchFieldFocused) SurfaceHighlight else SurfaceElevated,
+ androidx.compose.foundation.shape.RoundedCornerShape(8.dp)
+ )
+ .border(
+ if (searchFieldFocused) 2.dp else 0.dp,
+ if (searchFieldFocused) Primary else Color.Transparent,
+ androidx.compose.foundation.shape.RoundedCornerShape(8.dp)
+ )
+ .onFocusChanged { searchFieldFocused = it.hasFocus }
+ .clickable {
+ searchFocusRequester.requestFocus()
+ keyboardController?.show()
+ }
+ .padding(horizontal = 12.dp),
+ contentAlignment = Alignment.CenterStart
) {
- Text("🔍", style = MaterialTheme.typography.titleMedium)
- Spacer(Modifier.width(16.dp))
- Text(stringResource(R.string.search_hint), color = OnSurfaceDim, style = MaterialTheme.typography.bodyLarge)
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text("🔍", style = MaterialTheme.typography.bodySmall)
+ Spacer(Modifier.width(8.dp))
+ Box(modifier = Modifier.weight(1f)) {
+ if (uiState.searchQuery.isEmpty() && !searchFieldFocused) {
+ Text("Search movies...", style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ }
+ BasicTextField(
+ value = uiState.searchQuery,
+ onValueChange = { viewModel.setSearchQuery(it) },
+ singleLine = true,
+ textStyle = MaterialTheme.typography.bodySmall.copy(color = OnSurface),
+ modifier = Modifier
+ .fillMaxWidth()
+ .focusRequester(searchFocusRequester),
+ cursorBrush = androidx.compose.ui.graphics.SolidColor(Primary)
+ )
+ }
+ }
}
}
- }
-
- val heroMovie = uiState.moviesByCategory.values.flatten().firstOrNull()
- if (heroMovie != null) {
item {
- HeroBanner(
- movie = heroMovie,
- onClick = {
- val isLocked = (heroMovie.isAdult || heroMovie.isUserProtected) && uiState.parentalControlLevel == 1
- if (isLocked) {
- pendingMovie = heroMovie
- showPinDialog = true
- } else {
- onMovieClick(heroMovie)
- }
+ val isAllSelected = uiState.selectedCategory == null
+ Surface(
+ onClick = { viewModel.selectCategory(null) },
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isAllSelected) Primary.copy(alpha = 0.15f) else Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.25f)
+ ),
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 2.dp)
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "All Categories",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isAllSelected) Primary else OnSurface,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = "${uiState.moviesByCategory.values.sumOf { it.size }}",
+ style = MaterialTheme.typography.labelSmall,
+ color = OnSurfaceDim
+ )
}
- )
+ }
+ }
+ items(uiState.categoryNames.size) { index ->
+ val categoryName = uiState.categoryNames[index]
+ val isSelected = uiState.selectedCategory == categoryName
+ val count = uiState.moviesByCategory[categoryName]?.size ?: 0
+ Surface(
+ onClick = { viewModel.selectCategory(categoryName) },
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isSelected) Primary.copy(alpha = 0.15f) else Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.25f)
+ ),
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 2.dp)
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = categoryName,
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isSelected) Primary else OnSurface,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = "$count",
+ style = MaterialTheme.typography.labelSmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
}
}
- // Continue Watching row (shown first, only if non-empty)
- item(key = "continue_watching") {
- ContinueWatchingRow(
- items = uiState.continueWatching,
- onItemClick = { history -> onMovieClick(
- com.streamvault.domain.model.Movie(
- id = history.contentId,
- name = history.title,
- posterUrl = history.posterUrl,
- streamUrl = history.streamUrl,
- providerId = history.providerId
+ // Main content
+ if (uiState.selectedCategory == null) {
+ // Netflix-style rows (All categories view)
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(bottom = 32.dp)
+ ) {
+ item {
+ Surface(
+ onClick = { onNavigate(Routes.SEARCH) },
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 32.dp, vertical = 8.dp),
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = SurfaceElevated,
+ focusedContainerColor = Primary.copy(alpha = 0.2f)
+ )
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text("🔍", style = MaterialTheme.typography.titleMedium)
+ Spacer(Modifier.width(16.dp))
+ Text(stringResource(R.string.search_hint), color = OnSurfaceDim, style = MaterialTheme.typography.bodyLarge)
+ }
+ }
+ }
+
+ val heroMovie = uiState.moviesByCategory.values.flatten().firstOrNull()
+ if (heroMovie != null) {
+ item {
+ HeroBanner(
+ movie = heroMovie,
+ onClick = {
+ val isLocked = (heroMovie.isAdult || heroMovie.isUserProtected) && uiState.parentalControlLevel == 1
+ if (isLocked) {
+ pendingMovie = heroMovie
+ showPinDialog = true
+ } else {
+ onMovieClick(heroMovie)
+ }
+ }
+ )
+ }
+ }
+
+ // Continue Watching row (shown first, only if non-empty)
+ item(key = "continue_watching") {
+ ContinueWatchingRow(
+ items = uiState.continueWatching,
+ onItemClick = { history -> onMovieClick(
+ com.streamvault.domain.model.Movie(
+ id = history.contentId,
+ name = history.title,
+ posterUrl = history.posterUrl,
+ streamUrl = history.streamUrl,
+ providerId = history.providerId
+ )
+ )}
)
- )}
- )
- }
- items(
- items = uiState.moviesByCategory.entries.toList(),
- key = { it.key }
- ) { (categoryName, movies) ->
- CategoryRow(title = categoryName, items = movies) { movie ->
- val isLocked = (movie.isAdult || movie.isUserProtected) && uiState.parentalControlLevel == 1
- MovieCard(
- movie = movie,
- isLocked = isLocked,
- onClick = {
- if (isLocked) {
- pendingMovie = movie
- showPinDialog = true
- } else {
- onMovieClick(movie)
+ }
+ items(
+ items = uiState.moviesByCategory.entries.toList(),
+ key = { it.key }
+ ) { (categoryName, movies) ->
+ CategoryRow(title = categoryName, items = movies) { movie ->
+ val isLocked = (movie.isAdult || movie.isUserProtected) && uiState.parentalControlLevel == 1
+ MovieCard(
+ movie = movie,
+ isLocked = isLocked,
+ onClick = {
+ if (isLocked) {
+ pendingMovie = movie
+ showPinDialog = true
+ } else {
+ onMovieClick(movie)
+ }
+ }
+ )
+ }
+ }
+ }
+ } else {
+ // Filtered grid for selected category
+ val filteredMovies = uiState.moviesByCategory[uiState.selectedCategory] ?: emptyList()
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(16.dp)
+ ) {
+ item {
+ Text(
+ text = uiState.selectedCategory ?: "",
+ style = MaterialTheme.typography.headlineSmall,
+ color = Primary,
+ fontWeight = androidx.compose.ui.text.font.FontWeight.Bold,
+ modifier = Modifier.padding(bottom = 16.dp)
+ )
+ }
+ // Grid of movies in rows of 4 (wider 16:9 cards)
+ val chunkedMovies = filteredMovies.chunked(4)
+ items(chunkedMovies.size) { rowIndex ->
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ chunkedMovies[rowIndex].forEach { movie ->
+ val isLocked = (movie.isAdult || movie.isUserProtected) && uiState.parentalControlLevel == 1
+ MovieCard(
+ movie = movie,
+ isLocked = isLocked,
+ onClick = {
+ if (isLocked) {
+ pendingMovie = movie
+ showPinDialog = true
+ } else {
+ onMovieClick(movie)
+ }
+ }
+ )
}
}
- )
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
index 7607dd48..dd47dbc3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesViewModel.kt
@@ -24,6 +24,8 @@ class MoviesViewModel @Inject constructor(
private val _uiState = MutableStateFlow(MoviesUiState())
val uiState: StateFlow<MoviesUiState> = _uiState.asStateFlow()
+ private val _searchQuery = MutableStateFlow("")
+
init {
viewModelScope.launch {
providerRepository.getActiveProvider()
@@ -31,9 +33,21 @@ class MoviesViewModel @Inject constructor(
.collectLatest { provider ->
// Movies by category
launch {
- movieRepository.getMovies(provider.id).collect { movies ->
- val grouped = movies.groupBy { it.categoryName ?: "Uncategorized" }
- _uiState.update { it.copy(moviesByCategory = grouped, isLoading = false) }
+ combine(
+ movieRepository.getMovies(provider.id),
+ _searchQuery
+ ) { movies, query ->
+ val filtered = if (query.isBlank()) movies
+ else movies.filter { it.name.contains(query, ignoreCase = true) }
+ val grouped = filtered.groupBy { it.categoryName ?: "Uncategorized" }
+ val categoryNames = grouped.keys.sorted()
+ grouped to categoryNames
+ }.collect { (grouped, categoryNames) ->
+ _uiState.update { it.copy(
+ moviesByCategory = grouped,
+ categoryNames = categoryNames,
+ isLoading = false
+ ) }
}
}
// Continue Watching — last 20 movie/series items for this provider
@@ -53,6 +67,15 @@ class MoviesViewModel @Inject constructor(
}
}
+ fun selectCategory(categoryName: String?) {
+ _uiState.update { it.copy(selectedCategory = categoryName) }
+ }
+
+ fun setSearchQuery(query: String) {
+ _searchQuery.value = query
+ _uiState.update { it.copy(searchQuery = query) }
+ }
+
suspend fun verifyPin(pin: String): Boolean {
return preferencesRepository.parentalPin.first() == pin
}
@@ -60,6 +83,9 @@ class MoviesViewModel @Inject constructor(
data class MoviesUiState(
val moviesByCategory: Map<String, List<Movie>> = emptyMap(),
+ val categoryNames: List<String> = emptyList(),
+ val selectedCategory: String? = null,
+ val searchQuery: String = "",
val continueWatching: List<PlaybackHistory> = emptyList(),
val isLoading: Boolean = true,
val parentalControlLevel: Int = 0
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/EpgOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/EpgOverlay.kt
index 0c76603c..962e5e34 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/EpgOverlay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/EpgOverlay.kt
@@ -27,6 +27,7 @@ import java.util.*
fun EpgOverlay(
isVisible: Boolean,
currentChannel: Channel?,
+ displayChannelNumber: Int = 0,
currentProgram: Program?,
nextProgram: Program?,
modifier: Modifier = Modifier
@@ -61,7 +62,7 @@ fun EpgOverlay(
// Channel Info Header
if (currentChannel != null) {
Text(
- text = "${currentChannel.number}. ${currentChannel.name}",
+ text = "$displayChannelNumber. ${currentChannel.name}",
style = MaterialTheme.typography.displaySmall,
color = Primary,
fontWeight = FontWeight.Bold,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
index d5fc9bef..b4655107 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt
@@ -1,6 +1,7 @@
package com.streamvault.app.ui.screens.player
import android.view.KeyEvent
+import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -86,6 +87,9 @@ fun PlayerScreen(
val showChannelListOverlay by viewModel.showChannelListOverlay.collectAsState()
val showEpgOverlay by viewModel.showEpgOverlay.collectAsState()
val currentChannelList by viewModel.currentChannelList.collectAsState()
+ val displayChannelNumber by viewModel.displayChannelNumber.collectAsState()
+ val upcomingPrograms by viewModel.upcomingPrograms.collectAsState()
+ val showChannelInfoOverlay by viewModel.showChannelInfoOverlay.collectAsState()
val availableAudioTracks by viewModel.availableAudioTracks.collectAsState()
val availableSubtitleTracks by viewModel.availableSubtitleTracks.collectAsState()
@@ -97,12 +101,23 @@ fun PlayerScreen(
var showProgramHistory by remember { mutableStateOf(false) }
val focusRequester = remember { FocusRequester() }
+ val channelListFocusRequester = remember { FocusRequester() }
val layoutDirection = LocalLayoutDirection.current
val isRtl = layoutDirection == LayoutDirection.Rtl
LaunchedEffect(Unit) {
focusRequester.requestFocus()
}
+
+ // Transfer focus to/from channel list overlay
+ LaunchedEffect(showChannelListOverlay) {
+ if (showChannelListOverlay) {
+ kotlinx.coroutines.delay(120) // allow AnimatedVisibility to complete
+ try { channelListFocusRequester.requestFocus() } catch (_: Exception) {}
+ } else {
+ try { focusRequester.requestFocus() } catch (_: Exception) {}
+ }
+ }
// Show resolution overlay temporarily when it changes
var showResolution by remember { mutableStateOf(false) }
@@ -139,41 +154,58 @@ fun PlayerScreen(
.fillMaxSize()
.background(Color.Black)
.focusRequester(focusRequester)
- .focusable()
+ .focusable(!showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay)
.onKeyEvent { event ->
// Only handle KeyDown to avoid double actions
if (event.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
when (event.nativeKeyEvent.keyCode) {
KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> {
- viewModel.toggleControls()
+ when {
+ showChannelInfoOverlay -> viewModel.closeChannelInfoOverlay()
+ !showChannelListOverlay && !showEpgOverlay && contentType == "LIVE" -> viewModel.openChannelInfoOverlay()
+ else -> viewModel.toggleControls()
+ }
true
}
KeyEvent.KEYCODE_DPAD_LEFT -> {
- if (contentType == "LIVE" && !showChannelListOverlay && !showEpgOverlay) {
+ if (contentType == "LIVE" && !showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
if (isRtl) viewModel.openEpgOverlay() else viewModel.openChannelListOverlay()
- } else if (!showChannelListOverlay && !showEpgOverlay) {
+ } else if (!showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
if (isRtl) viewModel.seekForward() else viewModel.seekBackward()
}
true
}
KeyEvent.KEYCODE_DPAD_RIGHT -> {
- if (contentType == "LIVE" && !showChannelListOverlay && !showEpgOverlay) {
+ if (contentType == "LIVE" && !showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
if (isRtl) viewModel.openChannelListOverlay() else viewModel.openEpgOverlay()
- } else if (!showChannelListOverlay && !showEpgOverlay) {
+ } else if (!showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
if (isRtl) viewModel.seekBackward() else viewModel.seekForward()
}
true
}
KeyEvent.KEYCODE_DPAD_UP -> {
- if (!showChannelListOverlay && !showEpgOverlay) viewModel.playNext()
- true
+ if (!showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
+ viewModel.playNext()
+ true
+ } else {
+ // Let the overlay LazyColumn handle this event
+ false
+ }
}
KeyEvent.KEYCODE_DPAD_DOWN -> {
- if (!showChannelListOverlay && !showEpgOverlay) viewModel.playPrevious()
- true
+ if (!showChannelListOverlay && !showEpgOverlay && !showChannelInfoOverlay) {
+ viewModel.playPrevious()
+ true
+ } else {
+ // Let the overlay LazyColumn handle this event
+ false
+ }
}
KeyEvent.KEYCODE_BACK -> {
- if (showChannelListOverlay || showEpgOverlay) {
+ if (showChannelInfoOverlay) {
+ viewModel.closeChannelInfoOverlay()
+ true
+ } else if (showChannelListOverlay || showEpgOverlay) {
viewModel.closeOverlays()
true
} else if (showTrackSelection != null) {
@@ -405,7 +437,7 @@ fun PlayerScreen(
Spacer(modifier = Modifier.height(4.dp))
currentChannel?.let {
Text(
- text = "${it.number}. ${it.name}",
+ text = "$displayChannelNumber. ${it.name}",
style = MaterialTheme.typography.bodySmall,
color = Color.White.copy(alpha = 0.6f)
)
@@ -568,7 +600,7 @@ fun PlayerScreen(
Column {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
- text = currentChannel?.number?.toString() ?: "",
+ text = displayChannelNumber.toString(),
style = MaterialTheme.typography.headlineMedium,
color = Primary,
fontWeight = FontWeight.Bold
@@ -599,6 +631,7 @@ fun PlayerScreen(
EpgOverlay(
isVisible = showControls && contentType == "LIVE",
currentChannel = currentChannel,
+ displayChannelNumber = displayChannelNumber,
currentProgram = currentProgram,
nextProgram = nextProgram
)
@@ -762,6 +795,7 @@ fun PlayerScreen(
ChannelListOverlay(
channels = currentChannelList,
currentChannelId = internalChannelId,
+ overlayFocusRequester = channelListFocusRequester,
onSelectChannel = { channelId -> viewModel.zapToChannel(channelId) },
onDismiss = { viewModel.closeOverlays() }
)
@@ -774,11 +808,228 @@ fun PlayerScreen(
modifier = Modifier.align(if (isRtl) Alignment.TopStart else Alignment.TopEnd).fillMaxHeight().width(400.dp)
) {
EpgOverlay(
+ currentChannel = currentChannel,
+ displayChannelNumber = displayChannelNumber,
currentProgram = currentProgram,
nextProgram = nextProgram,
+ upcomingPrograms = upcomingPrograms,
onDismiss = { viewModel.closeOverlays() }
)
}
+
+ AnimatedVisibility(
+ visible = showChannelInfoOverlay,
+ enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
+ exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
+ modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth()
+ ) {
+ ChannelInfoOverlay(
+ currentChannel = currentChannel,
+ displayChannelNumber = displayChannelNumber,
+ currentProgram = currentProgram,
+ nextProgram = nextProgram,
+ onDismiss = { viewModel.closeChannelInfoOverlay() },
+ onOpenFullEpg = {
+ viewModel.closeChannelInfoOverlay()
+ viewModel.openEpgOverlay()
+ },
+ onOpenFullControls = {
+ viewModel.closeChannelInfoOverlay()
+ viewModel.toggleControls()
+ },
+ onRestartProgram = { viewModel.restartCurrentProgram() }
+ )
+ }
+ }
+}
+
+@Composable
+fun ChannelInfoOverlay(
+ currentChannel: com.streamvault.domain.model.Channel?,
+ displayChannelNumber: Int,
+ currentProgram: Program?,
+ nextProgram: Program?,
+ onDismiss: () -> Unit,
+ onOpenFullEpg: () -> Unit,
+ onOpenFullControls: () -> Unit,
+ onRestartProgram: () -> Unit
+) {
+ val timeFormat = java.text.SimpleDateFormat("HH:mm", java.util.Locale.getDefault())
+
+ BackHandler { onDismiss() }
+
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(
+ Brush.verticalGradient(
+ colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.97f)),
+ startY = 0f
+ )
+ )
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 32.dp, vertical = 24.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ // Channel name & number
+ if (currentChannel != null) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "$displayChannelNumber",
+ style = MaterialTheme.typography.headlineLarge,
+ color = Primary,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(Modifier.width(16.dp))
+ Text(
+ text = currentChannel.name,
+ style = MaterialTheme.typography.headlineMedium,
+ color = Color.White,
+ fontWeight = FontWeight.Bold,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ )
+ if (currentChannel.catchUpSupported) {
+ Spacer(Modifier.width(12.dp))
+ Box(
+ modifier = Modifier
+ .background(Primary.copy(alpha = 0.8f), RoundedCornerShape(4.dp))
+ .padding(horizontal = 8.dp, vertical = 3.dp)
+ ) {
+ Text("⏪ Catch-Up", style = MaterialTheme.typography.labelSmall, color = Color.White)
+ }
+ }
+ }
+ }
+
+ // Current program info
+ if (currentProgram != null) {
+ Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ text = currentProgram.title,
+ style = MaterialTheme.typography.titleLarge,
+ color = Color.White,
+ fontWeight = FontWeight.Bold,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ )
+ Spacer(Modifier.height(2.dp))
+ Text(
+ text = "${timeFormat.format(java.util.Date(currentProgram.startTime))} – ${timeFormat.format(java.util.Date(currentProgram.endTime))} · ${currentProgram.durationMinutes} min",
+ style = MaterialTheme.typography.bodyMedium,
+ color = TextSecondary
+ )
+ }
+ }
+ // Progress bar
+ val now = System.currentTimeMillis()
+ val start = currentProgram.startTime
+ val end = currentProgram.endTime
+ if (start in 1..<end) {
+ val progress = (now - start).toFloat() / (end - start)
+ val remainingMin = ((end - now) / 60000).toInt().coerceAtLeast(0)
+ androidx.compose.material3.LinearProgressIndicator(
+ progress = { progress.coerceIn(0f, 1f) },
+ modifier = Modifier.fillMaxWidth().height(3.dp),
+ color = Primary,
+ trackColor = Color.White.copy(alpha = 0.15f)
+ )
+ Text(
+ text = "$remainingMin min remaining",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
+ }
+
+ // Next program
+ if (nextProgram != null) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "Next: ",
+ style = MaterialTheme.typography.bodyMedium,
+ color = OnSurfaceDim
+ )
+ Text(
+ text = nextProgram.title,
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color.White.copy(alpha = 0.8f),
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = timeFormat.format(java.util.Date(nextProgram.startTime)),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
+
+ // Quick action buttons
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ if (currentChannel?.catchUpSupported == true && currentProgram?.hasArchive == true) {
+ QuickActionButton(
+ icon = "⏮",
+ label = "Restart",
+ onClick = {
+ onRestartProgram()
+ onDismiss()
+ }
+ )
+ }
+ QuickActionButton(
+ icon = "📋",
+ label = "Full EPG",
+ onClick = onOpenFullEpg
+ )
+ QuickActionButton(
+ icon = "⚙",
+ label = "Controls",
+ onClick = onOpenFullControls
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun QuickActionButton(
+ icon: String,
+ label: String,
+ onClick: () -> Unit
+) {
+ Surface(
+ onClick = onClick,
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = Color.White.copy(alpha = 0.1f),
+ focusedContainerColor = Primary.copy(alpha = 0.85f)
+ )
+ ) {
+ Column(
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ Text(icon, style = MaterialTheme.typography.titleMedium)
+ Text(
+ text = label,
+ style = MaterialTheme.typography.labelSmall,
+ color = Color.White
+ )
+ }
}
}
@@ -818,78 +1069,84 @@ private fun TrackItem(
fun ChannelListOverlay(
channels: List<com.streamvault.domain.model.Channel>,
currentChannelId: Long,
+ overlayFocusRequester: FocusRequester = remember { FocusRequester() },
onSelectChannel: (Long) -> Unit,
onDismiss: () -> Unit
) {
val listState = androidx.compose.foundation.lazy.rememberLazyListState()
- val focusRequester = remember { FocusRequester() }
-
- LaunchedEffect(Unit) {
- val index = channels.indexOfFirst { it.id == currentChannelId }
- if (index != -1) {
- listState.scrollToItem(index)
+ val currentIndex = remember(channels, currentChannelId) {
+ channels.indexOfFirst { it.id == currentChannelId }.coerceAtLeast(0)
+ }
+ // Scroll to current item when channels load
+ LaunchedEffect(channels) {
+ if (channels.isNotEmpty()) {
+ listState.scrollToItem(currentIndex)
}
- focusRequester.requestFocus()
}
- Box(
+ BackHandler { onDismiss() }
+
+ androidx.compose.foundation.lazy.LazyColumn(
+ state = listState,
modifier = Modifier
.fillMaxSize()
- .background(Color.Black.copy(alpha = 0.9f))
- .onKeyEvent { event ->
- if (event.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
- if (event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_BACK) {
- onDismiss()
- true
- } else false
- } else false
- }
- .focusRequester(focusRequester)
- .focusable(),
+ .background(Color.Black.copy(alpha = 0.92f)),
+ contentPadding = PaddingValues(top = 16.dp, bottom = 32.dp)
) {
- androidx.compose.foundation.lazy.LazyColumn(
- state = listState,
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(top = 32.dp, bottom = 32.dp)
- ) {
- item {
- Text(
- text = "Channels",
- style = MaterialTheme.typography.titleLarge,
- color = Primary,
- modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)
- )
- }
- items(channels.size) { index ->
- val channel = channels[index]
- val isSelected = channel.id == currentChannelId
- var isFocused by remember { mutableStateOf(false) }
+ item {
+ Text(
+ text = "Channels (${channels.size})",
+ style = MaterialTheme.typography.titleLarge,
+ color = Primary,
+ modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)
+ )
+ }
+ items(channels.size) { index ->
+ val channel = channels[index]
+ val isSelected = channel.id == currentChannelId
+ var isFocused by remember { mutableStateOf(false) }
- Surface(
- onClick = { onSelectChannel(channel.id) },
+ Surface(
+ onClick = {
+ onSelectChannel(channel.id)
+ onDismiss()
+ },
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 3.dp)
+ .onFocusChanged { isFocused = it.isFocused }
+ .then(
+ if (isSelected) Modifier.focusRequester(overlayFocusRequester)
+ else Modifier
+ ),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isSelected) Primary.copy(alpha = 0.25f) else Color.White.copy(alpha = 0.05f),
+ focusedContainerColor = Primary
+ )
+ ) {
+ Row(
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 16.dp, vertical = 4.dp)
- .onFocusChanged { isFocused = it.isFocused },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = if (isSelected) Primary.copy(alpha = 0.2f) else Color.Transparent,
- focusedContainerColor = SurfaceHighlight
- )
+ .padding(horizontal = 16.dp, vertical = 12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(16.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(
- text = channel.name,
- style = MaterialTheme.typography.bodyLarge,
- color = if (isSelected || isFocused) Color.White else OnSurfaceDim,
- maxLines = 1,
- overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
- )
+ if (isSelected) {
+ Text("▶", color = Color.White, style = MaterialTheme.typography.bodySmall)
+ } else {
+ Text(" ", style = MaterialTheme.typography.bodySmall)
+ }
+ Text(
+ text = channel.name,
+ style = MaterialTheme.typography.bodyLarge,
+ color = Color.White,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ if (channel.catchUpSupported) {
+ Text("📼", style = MaterialTheme.typography.bodySmall)
}
}
}
@@ -897,78 +1154,209 @@ fun ChannelListOverlay(
}
}
+
@Composable
fun EpgOverlay(
+ currentChannel: com.streamvault.domain.model.Channel?,
+ displayChannelNumber: Int,
currentProgram: Program?,
nextProgram: Program?,
+ upcomingPrograms: List<Program>,
onDismiss: () -> Unit
) {
- val focusRequester = remember { FocusRequester() }
+ val timeFormat = java.text.SimpleDateFormat("HH:mm", java.util.Locale.getDefault())
- LaunchedEffect(Unit) {
- focusRequester.requestFocus()
- }
+ BackHandler { onDismiss() }
Box(
modifier = Modifier
.fillMaxSize()
- .background(Color.Black.copy(alpha = 0.9f))
- .onKeyEvent { event ->
- if (event.nativeKeyEvent.action == KeyEvent.ACTION_DOWN) {
- if (event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_BACK) {
- onDismiss()
- true
- } else false
- } else false
- }
- .focusRequester(focusRequester)
- .focusable()
+ .background(Color.Black.copy(alpha = 0.92f))
) {
- Column(
+ androidx.compose.foundation.lazy.LazyColumn(
modifier = Modifier
.fillMaxSize()
- .padding(32.dp),
- verticalArrangement = Arrangement.spacedBy(24.dp)
+ .padding(24.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
) {
- Text(
- text = "Advanced EPG",
- style = MaterialTheme.typography.titleLarge,
- color = Primary
- )
-
- if (currentProgram != null) {
- Column {
- Text("Now Playing", style = MaterialTheme.typography.labelMedium, color = Primary)
+ // Header: Channel info
+ item {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "📺 ",
+ style = MaterialTheme.typography.titleLarge
+ )
+ Text(
+ text = "Advanced EPG",
+ style = MaterialTheme.typography.titleLarge,
+ color = Primary,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ if (currentChannel != null) {
Spacer(Modifier.height(8.dp))
- Text(currentProgram.title, style = MaterialTheme.typography.titleMedium, color = Color.White)
Text(
- "${formatTime(currentProgram.startTime)} - ${formatTime(currentProgram.endTime)}",
- style = MaterialTheme.typography.bodyMedium, color = TextSecondary
+ text = "$displayChannelNumber. ${currentChannel.name}",
+ style = MaterialTheme.typography.headlineSmall,
+ color = Color.White,
+ fontWeight = FontWeight.Bold
)
- if (!currentProgram.description.isNullOrEmpty()) {
- Spacer(Modifier.height(8.dp))
+ if (currentChannel.catchUpSupported) {
+ Spacer(Modifier.height(4.dp))
Text(
- currentProgram.description!!,
- style = MaterialTheme.typography.bodyMedium, color = OnSurfaceDim,
- maxLines = 8, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ text = "⏪ Catch-Up available (${currentChannel.catchUpDays} days)",
+ style = MaterialTheme.typography.bodySmall,
+ color = Primary.copy(alpha = 0.8f)
)
}
}
- } else {
- Text("No EPG Information", color = OnSurfaceDim)
}
-
- if (nextProgram != null) {
+
+ // Now Playing section
+ item {
androidx.compose.material3.HorizontalDivider(color = SurfaceVariant)
- Column {
- Text("Up Next", style = MaterialTheme.typography.labelMedium, color = Primary)
+ Spacer(Modifier.height(8.dp))
+ Text(
+ text = "NOW PLAYING",
+ style = MaterialTheme.typography.labelMedium,
+ color = Primary,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(Modifier.height(8.dp))
+ if (currentProgram != null) {
+ Text(
+ currentProgram.title,
+ style = MaterialTheme.typography.titleMedium,
+ color = Color.White,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(Modifier.height(4.dp))
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "${timeFormat.format(java.util.Date(currentProgram.startTime))} - ${timeFormat.format(java.util.Date(currentProgram.endTime))}",
+ style = MaterialTheme.typography.bodyMedium,
+ color = TextSecondary
+ )
+ Spacer(Modifier.width(12.dp))
+ Text(
+ text = "${currentProgram.durationMinutes} min",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ if (currentProgram.lang.isNotEmpty()) {
+ Spacer(Modifier.width(8.dp))
+ Text(
+ text = currentProgram.lang.uppercase(),
+ style = MaterialTheme.typography.labelSmall,
+ color = Primary.copy(alpha = 0.7f)
+ )
+ }
+ }
+ // Progress bar
+ Spacer(Modifier.height(8.dp))
+ val now = System.currentTimeMillis()
+ val start = currentProgram.startTime
+ val end = currentProgram.endTime
+ if (start in 1..<end) {
+ val progress = (now - start).toFloat() / (end - start)
+ val remainingMin = ((end - now) / 60000).toInt().coerceAtLeast(0)
+ androidx.compose.material3.LinearProgressIndicator(
+ progress = { progress.coerceIn(0f, 1f) },
+ modifier = Modifier.fillMaxWidth().height(4.dp),
+ color = Primary,
+ trackColor = Color.White.copy(alpha = 0.2f)
+ )
+ Spacer(Modifier.height(4.dp))
+ Text(
+ text = "$remainingMin min remaining",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ }
+ // Description
+ if (!currentProgram.description.isNullOrEmpty()) {
+ Spacer(Modifier.height(12.dp))
+ Text(
+ currentProgram.description!!,
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color.White.copy(alpha = 0.7f),
+ maxLines = 6,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ )
+ }
+ } else {
+ Text("No EPG Information", color = OnSurfaceDim)
+ }
+ }
+
+ // Upcoming schedule
+ if (upcomingPrograms.isNotEmpty()) {
+ item {
+ Spacer(Modifier.height(8.dp))
+ androidx.compose.material3.HorizontalDivider(color = SurfaceVariant)
Spacer(Modifier.height(8.dp))
- Text(nextProgram.title, style = MaterialTheme.typography.titleMedium, color = Color.White)
Text(
- "${formatTime(nextProgram.startTime)} - ${formatTime(nextProgram.endTime)}",
- style = MaterialTheme.typography.bodyMedium, color = TextSecondary
+ text = "UPCOMING SCHEDULE",
+ style = MaterialTheme.typography.labelMedium,
+ color = Primary,
+ fontWeight = FontWeight.Bold
)
}
+ // Skip the current program if it appears in upcoming list
+ val filteredUpcoming = upcomingPrograms.filter { it.id != currentProgram?.id && it.id != nextProgram?.id }
+ val displayPrograms = if (nextProgram != null) listOf(nextProgram) + filteredUpcoming else filteredUpcoming
+ items(displayPrograms.size) { index ->
+ val program = displayPrograms[index]
+ val isNext = index == 0 && nextProgram != null
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(
+ if (isNext) Primary.copy(alpha = 0.08f) else Color.Transparent,
+ RoundedCornerShape(8.dp)
+ )
+ .padding(12.dp)
+ ) {
+ if (isNext) {
+ Text(
+ text = "UP NEXT",
+ style = MaterialTheme.typography.labelSmall,
+ color = Primary,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(Modifier.height(4.dp))
+ }
+ Text(
+ program.title,
+ style = MaterialTheme.typography.bodyLarge,
+ color = if (isNext) Color.White else Color.White.copy(alpha = 0.8f),
+ fontWeight = if (isNext) FontWeight.Bold else FontWeight.Normal,
+ maxLines = 1,
+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+ )
+ Spacer(Modifier.height(2.dp))
+ Row {
+ Text(
+ text = "${timeFormat.format(java.util.Date(program.startTime))} - ${timeFormat.format(java.util.Date(program.endTime))}",
+ style = MaterialTheme.typography.bodySmall,
+ color = TextSecondary
+ )
+ Spacer(Modifier.width(8.dp))
+ Text(
+ text = "${program.durationMinutes} min",
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim
+ )
+ if (program.hasArchive) {
+ Spacer(Modifier.width(8.dp))
+ Text(
+ text = "📼",
+ style = MaterialTheme.typography.bodySmall
+ )
+ }
+ }
+ }
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
index ad325860..5bcf68fd 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
@@ -56,6 +56,9 @@ class PlayerViewModel @Inject constructor(
private val _programHistory = MutableStateFlow<List<Program>>(emptyList())
val programHistory: StateFlow<List<Program>> = _programHistory.asStateFlow()
+ private val _upcomingPrograms = MutableStateFlow<List<Program>>(emptyList())
+ val upcomingPrograms: StateFlow<List<Program>> = _upcomingPrograms.asStateFlow()
+
private val _currentChannel = MutableStateFlow<com.streamvault.domain.model.Channel?>(null)
val currentChannel: StateFlow<com.streamvault.domain.model.Channel?> = _currentChannel.asStateFlow()
@@ -74,21 +77,50 @@ class PlayerViewModel @Inject constructor(
private val _currentChannelList = MutableStateFlow<List<com.streamvault.domain.model.Channel>>(emptyList())
val currentChannelList: StateFlow<List<com.streamvault.domain.model.Channel>> = _currentChannelList.asStateFlow()
+ private val _displayChannelNumber = MutableStateFlow(0)
+ val displayChannelNumber: StateFlow<Int> = _displayChannelNumber.asStateFlow()
+
+ private val _showChannelInfoOverlay = MutableStateFlow(false)
+ val showChannelInfoOverlay: StateFlow<Boolean> = _showChannelInfoOverlay.asStateFlow()
+
+ private var channelInfoHideJob: Job? = null
+
fun openChannelListOverlay() {
_showChannelListOverlay.value = true
_showEpgOverlay.value = false
+ _showChannelInfoOverlay.value = false
_showControls.value = false
}
fun openEpgOverlay() {
_showEpgOverlay.value = true
_showChannelListOverlay.value = false
+ _showChannelInfoOverlay.value = false
+ _showControls.value = false
+ }
+
+ fun openChannelInfoOverlay() {
+ _showChannelInfoOverlay.value = true
+ _showChannelListOverlay.value = false
+ _showEpgOverlay.value = false
_showControls.value = false
+ channelInfoHideJob?.cancel()
+ channelInfoHideJob = viewModelScope.launch {
+ delay(8000)
+ _showChannelInfoOverlay.value = false
+ }
+ }
+
+ fun closeChannelInfoOverlay() {
+ channelInfoHideJob?.cancel()
+ _showChannelInfoOverlay.value = false
}
fun closeOverlays() {
_showChannelListOverlay.value = false
_showEpgOverlay.value = false
+ _showChannelInfoOverlay.value = false
+ channelInfoHideJob?.cancel()
}
// Zapping state
@@ -221,10 +253,12 @@ class PlayerViewModel @Inject constructor(
}
}
fetchProgramHistory(epgChannelId)
+ fetchUpcomingPrograms(epgChannelId)
} else {
_currentProgram.value = null
_nextProgram.value = null
_programHistory.value = emptyList()
+ _upcomingPrograms.value = emptyList()
}
}
@@ -240,6 +274,17 @@ class PlayerViewModel @Inject constructor(
}
}
+ private fun fetchUpcomingPrograms(channelId: String) {
+ viewModelScope.launch {
+ // Fetch next 6 hours
+ val now = System.currentTimeMillis()
+ val end = now + (6 * 60 * 60 * 1000L)
+ epgRepository.getProgramsForChannel(channelId, now, end).collect { programs ->
+ _upcomingPrograms.value = programs.sortedBy { it.startTime }
+ }
+ }
+ }
+
private fun loadPlaylist(categoryId: Long, providerId: Long, isVirtual: Boolean, initialChannelId: Long) {
playlistJob?.cancel()
playlistJob = viewModelScope.launch {
@@ -278,6 +323,8 @@ class PlayerViewModel @Inject constructor(
if (currentChannelIndex != -1) {
_currentChannel.value = channelList[currentChannelIndex]
+ val ch = channelList[currentChannelIndex]
+ _displayChannelNumber.value = if (ch.number > 0) ch.number else currentChannelIndex + 1
}
}
}
@@ -323,6 +370,7 @@ class PlayerViewModel @Inject constructor(
val channel = channelList[index]
currentChannelIndex = index
_currentChannel.value = channel
+ _displayChannelNumber.value = if (channel.number > 0) channel.number else index + 1
// Prepare player
val streamInfo = com.streamvault.domain.model.StreamInfo(
@@ -346,6 +394,7 @@ class PlayerViewModel @Inject constructor(
fun seekBackward() = playerEngine.seekBackward()
fun toggleControls() {
+ closeChannelInfoOverlay()
_showControls.value = !_showControls.value
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
index 6ffad2e7..9808f1f3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt
@@ -3,6 +3,7 @@ package com.streamvault.app.ui.screens.series
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.text.BasicTextField
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -16,6 +17,9 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import com.streamvault.app.navigation.Routes
import com.streamvault.app.ui.components.CategoryRow
@@ -73,9 +77,9 @@ fun SeriesScreen(
items(3) {
SkeletonRow(
modifier = Modifier.fillMaxWidth(),
- cardWidth = 140,
- cardHeight = 210,
- itemsCount = 10
+ cardWidth = 240,
+ cardHeight = 135,
+ itemsCount = 4
)
}
}
@@ -88,76 +92,256 @@ fun SeriesScreen(
}
}
} else {
- LazyColumn(
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(bottom = 32.dp)
- ) {
- item {
- Surface(
- onClick = { onNavigate(Routes.SEARCH) },
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 32.dp, vertical = 8.dp),
- shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = SurfaceElevated,
- focusedContainerColor = Primary.copy(alpha = 0.2f)
+ Row(modifier = Modifier.fillMaxSize()) {
+ // Category sidebar
+ LazyColumn(
+ modifier = Modifier
+ .width(220.dp)
+ .fillMaxHeight()
+ .background(SurfaceElevated.copy(alpha = 0.5f))
+ .padding(vertical = 8.dp)
+ ) {
+ item {
+ Text(
+ text = "Categories",
+ style = MaterialTheme.typography.titleMedium,
+ color = Primary,
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
)
- ) {
- Row(
- modifier = Modifier.padding(16.dp),
- verticalAlignment = Alignment.CenterVertically
+ }
+ // Search box — keyboard only opens on OK press (not on D-pad focus)
+ item {
+ val keyboardController = androidx.compose.ui.platform.LocalSoftwareKeyboardController.current
+ val searchFocusRequester = remember { androidx.compose.ui.focus.FocusRequester() }
+ var searchFieldFocused by remember { mutableStateOf(false) }
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 4.dp)
+ .height(44.dp)
+ .background(
+ if (searchFieldFocused) SurfaceHighlight else SurfaceElevated,
+ androidx.compose.foundation.shape.RoundedCornerShape(8.dp)
+ )
+ .border(
+ if (searchFieldFocused) 2.dp else 0.dp,
+ if (searchFieldFocused) Primary else Color.Transparent,
+ androidx.compose.foundation.shape.RoundedCornerShape(8.dp)
+ )
+ .onFocusChanged { searchFieldFocused = it.hasFocus }
+ .clickable {
+ searchFocusRequester.requestFocus()
+ keyboardController?.show()
+ }
+ .padding(horizontal = 12.dp),
+ contentAlignment = Alignment.CenterStart
) {
- Text("🔍", style = MaterialTheme.typography.titleMedium)
- Spacer(Modifier.width(16.dp))
- Text(stringResource(R.string.search_hint), color = OnSurfaceDim, style = MaterialTheme.typography.bodyLarge)
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text("🔍", style = MaterialTheme.typography.bodySmall)
+ Spacer(Modifier.width(8.dp))
+ Box(modifier = Modifier.weight(1f)) {
+ if (uiState.searchQuery.isEmpty() && !searchFieldFocused) {
+ Text("Search series...", style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ }
+ BasicTextField(
+ value = uiState.searchQuery,
+ onValueChange = { viewModel.setSearchQuery(it) },
+ singleLine = true,
+ textStyle = MaterialTheme.typography.bodySmall.copy(color = OnSurface),
+ modifier = Modifier
+ .fillMaxWidth()
+ .focusRequester(searchFocusRequester),
+ cursorBrush = androidx.compose.ui.graphics.SolidColor(Primary)
+ )
+ }
+ }
}
}
- }
-
- val heroSeries = uiState.seriesByCategory.values.flatten().firstOrNull()
- if (heroSeries != null) {
item {
- SeriesHeroBanner(
- series = heroSeries,
- onClick = {
- val isLocked = (heroSeries.isAdult || heroSeries.isUserProtected) && uiState.parentalControlLevel == 1
- if (isLocked) {
- pendingSeriesId = heroSeries.id
- showPinDialog = true
- } else {
- onSeriesClick(heroSeries.id)
- }
+ val isAllSelected = uiState.selectedCategory == null
+ Surface(
+
+ onClick = { viewModel.selectCategory(null) },
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isAllSelected) Primary.copy(alpha = 0.15f) else Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.25f)
+ ),
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 2.dp)
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "All Categories",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isAllSelected) Primary else OnSurface,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = "${uiState.seriesByCategory.values.sumOf { it.size }}",
+ style = MaterialTheme.typography.labelSmall,
+ color = OnSurfaceDim
+ )
}
- )
+ }
+ }
+ items(uiState.categoryNames.size) { index ->
+ val categoryName = uiState.categoryNames[index]
+ val isSelected = uiState.selectedCategory == categoryName
+ val count = uiState.seriesByCategory[categoryName]?.size ?: 0
+ Surface(
+ onClick = { viewModel.selectCategory(categoryName) },
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isSelected) Primary.copy(alpha = 0.15f) else Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.25f)
+ ),
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 8.dp, vertical = 2.dp)
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = categoryName,
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isSelected) Primary else OnSurface,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.weight(1f)
+ )
+ Text(
+ text = "$count",
+ style = MaterialTheme.typography.labelSmall,
+ color = OnSurfaceDim
+ )
+ }
+ }
}
}
- // Continue Watching row (shown first, only if non-empty)
- item(key = "continue_watching") {
- ContinueWatchingRow(
- items = uiState.continueWatching,
- onItemClick = { history -> onSeriesClick(history.seriesId ?: history.contentId) }
- )
- }
- items(
- items = uiState.seriesByCategory.entries.toList(),
- key = { it.key }
- ) { (categoryName, seriesList) ->
- CategoryRow(title = categoryName, items = seriesList) { series ->
- val isLocked = (series.isAdult || series.isUserProtected) && uiState.parentalControlLevel == 1
- SeriesCard(
- series = series,
- isLocked = isLocked,
- onClick = {
- if (isLocked) {
- pendingSeriesId = series.id
- showPinDialog = true
- } else {
- onSeriesClick(series.id)
+ // Main content
+ if (uiState.selectedCategory == null) {
+ // Netflix-style rows (All categories view)
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(bottom = 32.dp)
+ ) {
+ item {
+ Surface(
+ onClick = { onNavigate(Routes.SEARCH) },
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 32.dp, vertical = 8.dp),
+ shape = ClickableSurfaceDefaults.shape(androidx.compose.foundation.shape.RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = SurfaceElevated,
+ focusedContainerColor = Primary.copy(alpha = 0.2f)
+ )
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text("🔍", style = MaterialTheme.typography.titleMedium)
+ Spacer(Modifier.width(16.dp))
+ Text(stringResource(R.string.search_hint), color = OnSurfaceDim, style = MaterialTheme.typography.bodyLarge)
}
}
- )
+ }
+
+ val heroSeries = uiState.seriesByCategory.values.flatten().firstOrNull()
+ if (heroSeries != null) {
+ item {
+ SeriesHeroBanner(
+ series = heroSeries,
+ onClick = {
+ val isLocked = (heroSeries.isAdult || heroSeries.isUserProtected) && uiState.parentalControlLevel == 1
+ if (isLocked) {
+ pendingSeriesId = heroSeries.id
+ showPinDialog = true
+ } else {
+ onSeriesClick(heroSeries.id)
+ }
+ }
+ )
+ }
+ }
+
+ // Continue Watching row (shown first, only if non-empty)
+ item(key = "continue_watching") {
+ ContinueWatchingRow(
+ items = uiState.continueWatching,
+ onItemClick = { history -> onSeriesClick(history.seriesId ?: history.contentId) }
+ )
+ }
+ items(
+ items = uiState.seriesByCategory.entries.toList(),
+ key = { it.key }
+ ) { (categoryName, seriesList) ->
+ CategoryRow(title = categoryName, items = seriesList) { series ->
+ val isLocked = (series.isAdult || series.isUserProtected) && uiState.parentalControlLevel == 1
+ SeriesCard(
+ series = series,
+ isLocked = isLocked,
+ onClick = {
+ if (isLocked) {
+ pendingSeriesId = series.id
+ showPinDialog = true
+ } else {
+ onSeriesClick(series.id)
+ }
+ }
+ )
+ }
+ }
+ }
+ } else {
+ // Filtered grid for selected category
+ val filteredSeries = uiState.seriesByCategory[uiState.selectedCategory] ?: emptyList()
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(16.dp)
+ ) {
+ item {
+ Text(
+ text = uiState.selectedCategory ?: "",
+ style = MaterialTheme.typography.headlineSmall,
+ color = Primary,
+ fontWeight = androidx.compose.ui.text.font.FontWeight.Bold,
+ modifier = Modifier.padding(bottom = 16.dp)
+ )
+ }
+ // Grid of series in rows of 6
+ val chunkedSeries = filteredSeries.chunked(6)
+ items(chunkedSeries.size) { rowIndex ->
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ chunkedSeries[rowIndex].forEach { series ->
+ val isLocked = (series.isAdult || series.isUserProtected) && uiState.parentalControlLevel == 1
+ SeriesCard(
+ series = series,
+ isLocked = isLocked,
+ onClick = {
+ if (isLocked) {
+ pendingSeriesId = series.id
+ showPinDialog = true
+ } else {
+ onSeriesClick(series.id)
+ }
+ }
+ )
+ }
+ }
+ }
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
index 62e63afd..a21b738d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesViewModel.kt
@@ -24,6 +24,8 @@ class SeriesViewModel @Inject constructor(
private val _uiState = MutableStateFlow(SeriesUiState())
val uiState: StateFlow<SeriesUiState> = _uiState.asStateFlow()
+ private val _searchQuery = MutableStateFlow("")
+
init {
viewModelScope.launch {
providerRepository.getActiveProvider()
@@ -31,9 +33,21 @@ class SeriesViewModel @Inject constructor(
.collectLatest { provider ->
// Series by category
launch {
- seriesRepository.getSeries(provider.id).collect { seriesList ->
- val grouped = seriesList.groupBy { it.categoryName ?: "Uncategorized" }
- _uiState.update { it.copy(seriesByCategory = grouped, isLoading = false) }
+ combine(
+ seriesRepository.getSeries(provider.id),
+ _searchQuery
+ ) { seriesList, query ->
+ val filtered = if (query.isBlank()) seriesList
+ else seriesList.filter { it.name.contains(query, ignoreCase = true) }
+ val grouped = filtered.groupBy { it.categoryName ?: "Uncategorized" }
+ val categoryNames = grouped.keys.sorted()
+ grouped to categoryNames
+ }.collect { (grouped, categoryNames) ->
+ _uiState.update { it.copy(
+ seriesByCategory = grouped,
+ categoryNames = categoryNames,
+ isLoading = false
+ ) }
}
}
// Continue Watching — last 20 items for this provider
@@ -53,6 +67,15 @@ class SeriesViewModel @Inject constructor(
}
}
+ fun selectCategory(categoryName: String?) {
+ _uiState.update { it.copy(selectedCategory = categoryName) }
+ }
+
+ fun setSearchQuery(query: String) {
+ _searchQuery.value = query
+ _uiState.update { it.copy(searchQuery = query) }
+ }
+
suspend fun verifyPin(pin: String): Boolean {
return preferencesRepository.parentalPin.first() == pin
}
@@ -60,6 +83,9 @@ class SeriesViewModel @Inject constructor(
data class SeriesUiState(
val seriesByCategory: Map<String, List<Series>> = emptyMap(),
+ val categoryNames: List<String> = emptyList(),
+ val selectedCategory: String? = null,
+ val searchQuery: String = "",
val continueWatching: List<PlaybackHistory> = emptyList(),
val isLoading: Boolean = true,
val parentalControlLevel: Int = 0
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
index 391f7a4e..89c803b5 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt
@@ -248,6 +248,7 @@ fun SettingsScreen(
)
SettingsRow(label = stringResource(R.string.settings_app_version), value = "1.0.0")
SettingsRow(label = stringResource(R.string.settings_build), value = stringResource(R.string.settings_build_desc))
+ SettingsRow(label = stringResource(R.string.settings_developed_by), value = stringResource(R.string.settings_developer_name))
}
}
}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ce394677..bded2130 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -88,6 +88,8 @@
<string name="settings_app_version">إصدار التطبيق</string>
<string name="settings_build">نسخة البناء</string>
<string name="settings_build_desc">StreamVault لنظام Android TV</string>
+ <string name="settings_developed_by">تم التطوير بواسطة</string>
+ <string name="settings_developer_name">David Nashash</string>
<string name="settings_syncing">جاري مزامنة البيانات، يرجى الانتظار...</string>
<string name="settings_enter_new_pin">أدخل رمز PIN جديد</string>
<string name="settings_enter_pin">أدخل رمز PIN</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 3c3c3bb6..5f1697c3 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -70,6 +70,8 @@
<string name="settings_app_version">גרסת אפליקציה</string>
<string name="settings_build">בנייה</string>
<string name="settings_build_desc">StreamVault עבור Android TV</string>
+ <string name="settings_developed_by">פותח על ידי</string>
+ <string name="settings_developer_name">David Nashash</string>
<string name="settings_syncing">מסנכרן נתונים, אנא המתן...</string>
<string name="settings_enter_new_pin">הזן קוד סודי חדש</string>
<string name="settings_enter_pin">הזן קוד סודי</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 378fc031..1e34ae54 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -88,6 +88,8 @@
<string name="settings_app_version">Версия приложения</string>
<string name="settings_build">Сборка</string>
<string name="settings_build_desc">StreamVault для Android TV</string>
+ <string name="settings_developed_by">Разработчик</string>
+ <string name="settings_developer_name">David Nashash</string>
<string name="settings_syncing">Синхронизация данных...</string>
<string name="settings_enter_new_pin">Новый ПИН-код</string>
<string name="settings_enter_pin">Введите ПИН-код</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5848a29..ab406a4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,8 @@
<string name="settings_app_version">App Version</string>
<string name="settings_build">Build</string>
<string name="settings_build_desc">StreamVault for Android TV</string>
+ <string name="settings_developed_by">Developed by</string>
+ <string name="settings_developer_name">David Nashash</string>
<string name="settings_syncing">Syncing data, please wait...</string>
<string name="settings_enter_new_pin">Enter New PIN</string>
<string name="settings_enter_pin">Enter PIN</string>
diff --git a/build_apk.log b/build_apk.log
deleted file mode 100644
index 4b275242..00000000
--- a/build_apk.log
+++ /dev/null
@@ -1,137 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:kspDebugKotlin UP-TO-DATE
-> Task :app:compileDebugKotlin UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:compileDebugJavaWithJavac
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :app:hiltAggregateDepsDebug
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :app:hiltJavaCompileDebug
-> Task :app:processDebugJavaRes
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-> Task :app:mergeDebugJavaResource
-> Task :app:transformDebugClassesWithAsm
-> Task :app:dexBuilderDebug
-> Task :app:mergeDebugGlobalSynthetics
-> Task :app:mergeProjectDexDebug
-> Task :app:packageDebug
-> Task :app:createDebugApkListingFileRedirect
-> Task :app:assembleDebug
-
-BUILD SUCCESSFUL in 32s
-106 actionable tasks: 11 executed, 95 up-to-date
diff --git a/build_clean.log b/build_clean.log
deleted file mode 100644
index 91181e92..00000000
--- a/build_clean.log
+++ /dev/null
@@ -1,148 +0,0 @@
-> Task :app:clean
-> Task :data:clean
-> Task :domain:clean
-> Task :player:clean
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:processResources NO-SOURCE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :app:generateDebugResValues
-> Task :data:generateDebugResValues
-> Task :data:writeDebugAarMetadata
-> Task :player:writeDebugAarMetadata
-> Task :data:generateDebugResources
-> Task :app:checkDebugAarMetadata
-> Task :data:packageDebugResources
-> Task :player:generateDebugResValues
-> Task :player:generateDebugResources
-> Task :player:packageDebugResources
-> Task :app:mapDebugSourceSetPaths
-> Task :app:generateDebugResources
-> Task :domain:compileKotlin
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar
-> Task :app:packageDebugResources
-> Task :app:createDebugCompatibleScreenManifests
-> Task :app:extractDeepLinksDebug
-> Task :data:extractDeepLinksDebug
-> Task :player:extractDeepLinksDebug
-> Task :data:parseDebugLocalResources
-> Task :app:parseDebugLocalResources
-> Task :player:compileDebugLibraryResources
-> Task :data:compileDebugLibraryResources
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:parseDebugLocalResources
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:javaPreCompileDebug
-> Task :app:javaPreCompileDebug
-> Task :player:javaPreCompileDebug
-> Task :data:generateDebugRFile
-> Task :player:generateDebugRFile
-> Task :data:processDebugManifest
-> Task :player:processDebugManifest
-> Task :app:mergeDebugResources
-> Task :app:mergeDebugShaders
-> Task :app:processDebugMainManifest
-> Task :app:processDebugManifest
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets
-> Task :player:mergeDebugShaders
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets
-> Task :app:mergeDebugAssets
-> Task :app:compressDebugAssets
-> Task :app:desugarDebugFileDependencies
-> Task :app:mergeDebugJniLibFolders
-> Task :data:mergeDebugJniLibFolders
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly
-> Task :player:mergeDebugJniLibFolders
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly
-> Task :app:validateSigningDebug
-> Task :app:checkDebugDuplicateClasses
-> Task :app:mergeDebugNativeLibs
-> Task :app:processDebugManifestForPackage
-> Task :app:writeDebugAppMetadata
-> Task :app:writeDebugSigningConfigVersions
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars
-> Task :player:copyDebugJniLibsProjectAndLocalJars
-
-> Task :app:stripDebugDebugSymbols
-Unable to strip the following libraries, packaging them as they are: libandroidx.graphics.path.so, libdatastore_shared_counter.so.
-
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:kspDebugKotlin
-> Task :app:processDebugResources
-> Task :player:compileDebugKotlin
-> Task :player:compileDebugJavaWithJavac
-> Task :player:processDebugJavaRes
-> Task :player:extractDebugAnnotations
-> Task :player:mergeDebugJavaResource
-> Task :player:transformDebugClassesWithAsm
-> Task :player:bundleLibRuntimeToJarDebug
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug
-> Task :player:bundleLibRuntimeToDirDebug
-> Task :player:syncDebugLibJars
-> Task :player:bundleDebugAar
-> Task :player:assembleDebug
-> Task :data:kspDebugKotlin
-> Task :app:mergeExtDexDebug
-
-> Task :data:compileDebugKotlin FAILED
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:35:9 None of the following candidates is applicable:
-fun <T1, T2, R> combine(flow: Flow<T1>, flow2: Flow<T2>, transform: suspend (@ParameterName(...) T1, @ParameterName(...) T2) -> R): Flow<R>
-fun <reified T, R> combine(vararg flows: Flow<T>, crossinline transform: suspend (Array<T>) -> R): Flow<R>
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:38:13 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:38:25 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:38:33 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:47 Unresolved reference 'it'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:61 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:64 Unresolved reference 'it'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:48:47 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:48:47 Not enough information to infer type argument for 'T'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:48:47 Not enough information to infer type argument for 'R'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:48:53 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:49:35 Unresolved reference 'copy'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:49:64 Unresolved reference 'categoryId'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:41 Cannot infer type for this parameter. Please specify it explicitly.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:41 Not enough information to infer type argument for 'T'.
-
-> Task :data:copyRoomSchemas NO-SOURCE
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':data:compileDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 20s
-84 actionable tasks: 76 executed, 8 up-to-date
diff --git a/build_err.log b/build_err.log
deleted file mode 100644
index 27cf7fbb..00000000
--- a/build_err.log
+++ /dev/null
@@ -1,27 +0,0 @@
-e: [ksp] [MissingType]: Element 'com.streamvault.data.local.StreamVaultDatabase' references a type that is not present
-e: Error occurred in KSP, check log for detail
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:13 Expecting ')'
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:26 Expecting an element
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:39:34 Expecting an element
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:13 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:19 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:20 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:39 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:41 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:52:43 Expecting member declaration
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt:75:1 Expecting a top level declaration
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':data:kspDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 4s
diff --git a/build_error3.txt b/build_error3.txt
deleted file mode 100644
index a67836e5..00000000
--- a/build_error3.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:kspDebugKotlin FAILED
-.\gradlew : e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main
-/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt:699:2 Expecting '}'
-At line:1 char:1
-+ .\gradlew assembleDebug 2>&1 | Out-File -Encoding utf8 build_error3.t ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (e: file:///C:/U...2 Expecting '}':String) []
- , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:kspDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRun
-nerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 6s
-94 actionable tasks: 1 executed, 93 up-to-date
diff --git a/build_error4.txt b/build_error4.txt
deleted file mode 100644
index 0b382d6e..00000000
--- a/build_error4.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-Starting a Gradle Daemon, 1 busy and 3 incompatible and 2 stopped Daemons could not be reused, use --status for details
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:kspDebugKotlin UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:compileDebugKotlin FAILED
-.\gradlew : e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/components/TopNavBar.kt:46:17 This API is experimental and is likely to change in the future.
-At line:1 char:1
-+ .\gradlew assembleDebug 2>&1 | Out-File -Encoding utf8 build_error4.t ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (e: file:///C:/U... in the future.:String) [] , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt:193:29 Argument type mismatch: actual type is 'androidx.compose.foundation.BorderStroke', but 'androidx.tv.material3.Border' was expected.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt:230:21 Unresolved reference 'not' for operator '!'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt:230:28 Unresolved reference 'description'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt:232:38 Unresolved reference 'description'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:790:19 Unresolved reference 'showChannelListOverlay'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:791:60 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:792:59 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:793:29 Unresolved reference 'align'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:793:39 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:796:24 Unresolved reference 'currentChannelList'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:797:32 Unresolved reference 'internalChannelId'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:798:46 Unresolved reference 'viewModel'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:799:27 Unresolved reference 'viewModel'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:804:19 Unresolved reference 'showEpgOverlay'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:805:60 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:806:59 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:807:29 Unresolved reference 'align'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:807:39 Unresolved reference 'isRtl'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:810:30 Unresolved reference 'currentProgram'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:811:27 Unresolved reference 'nextProgram'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:812:27 Unresolved reference 'viewModel'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:873:26 Unresolved reference 'onFocusChanged'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:873:55 Unresolved reference 'it'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:945:28 Unresolved reference 'formatTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:945:70 Unresolved reference 'formatTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:945:96 Unresolved reference 'stopTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:968:28 Unresolved reference 'formatTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:968:67 Unresolved reference 'formatTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt:968:90 Unresolved reference 'stopTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt:184:29 Argument type mismatch: actual type is 'androidx.compose.foundation.BorderStroke', but 'androidx.tv.material3.Border' was expected.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt:221:21 Unresolved reference 'not' for operator '!'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt:221:29 Unresolved reference 'description'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt:223:39 Unresolved reference 'description'.
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:compileDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 35s
-95 actionable tasks: 1 executed, 94 up-to-date
diff --git a/build_error5.txt b/build_error5.txt
deleted file mode 100644
index fbd21dc6..00000000
--- a/build_error5.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:kspDebugKotlin UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:compileDebugKotlin FAILED
-.\gradlew : e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main
-/java/com/streamvault/app/ui/components/TopNavBar.kt:46:17 This API is experimental and
-is likely to change in the future.
-At line:1 char:1
-+ .\gradlew assembleDebug 2>&1 | Out-File -Encoding utf8 build_error5.t ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (e: file:///C:/U... in the future.:String) []
- , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/st
-reamvault/app/ui/screens/player/PlayerScreen.kt:945:96 Unresolved reference 'stopTime'.
-e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main/java/com/st
-reamvault/app/ui/screens/player/PlayerScreen.kt:968:90 Unresolved reference 'stopTime'.
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:compileDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRun
-nerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 5s
-95 actionable tasks: 1 executed, 94 up-to-date
diff --git a/build_error6.txt b/build_error6.txt
deleted file mode 100644
index a3ca3feb..00000000
--- a/build_error6.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:kspDebugKotlin UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:compileDebugKotlin FAILED
-.\gradlew : e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main
-/java/com/streamvault/app/ui/components/TopNavBar.kt:46:17 This API is experimental and
-is likely to change in the future.
-At line:1 char:1
-+ .\gradlew assembleDebug 2>&1 | Out-File -Encoding utf8 build_error6.t ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (e: file:///C:/U... in the future.:String) []
- , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:compileDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRun
-nerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 6s
-95 actionable tasks: 1 executed, 94 up-to-date
diff --git a/build_error7.txt b/build_error7.txt
deleted file mode 100644
index 6dea735d..00000000
--- a/build_error7.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :data:preDebugUnitTestBuild UP-TO-DATE
-> Task :data:generateDebugUnitTestStubRFile UP-TO-DATE
-> Task :data:kspDebugUnitTestKotlin UP-TO-DATE
-> Task :data:compileDebugUnitTestKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebugUnitTest UP-TO-DATE
-> Task :data:compileDebugUnitTestJavaWithJavac NO-SOURCE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:kspDebugKotlin UP-TO-DATE
-> Task :app:compileDebugKotlin UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:preDebugUnitTestBuild UP-TO-DATE
-> Task :app:javaPreCompileDebugUnitTest UP-TO-DATE
-> Task :app:hiltAggregateDepsDebug UP-TO-DATE
-> Task :app:hiltJavaCompileDebug UP-TO-DATE
-> Task :app:transformDebugClassesWithAsm UP-TO-DATE
-> Task :app:bundleDebugClassesToRuntimeJar UP-TO-DATE
-> Task :app:processDebugJavaRes UP-TO-DATE
-> Task :app:bundleDebugClassesToCompileJar UP-TO-DATE
-> Task :app:kspDebugUnitTestKotlin UP-TO-DATE
-> Task :app:compileDebugUnitTestKotlin UP-TO-DATE
-> Task :app:compileDebugUnitTestJavaWithJavac NO-SOURCE
-> Task :app:hiltAggregateDepsDebugUnitTest UP-TO-DATE
-> Task :app:hiltJavaCompileDebugUnitTest NO-SOURCE
-> Task :app:processDebugUnitTestJavaRes UP-TO-DATE
-> Task :app:transformDebugUnitTestClassesWithAsm UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-.\gradlew : Could not write standard input to Gradle Test Executor 2.
-At line:1 char:1
-+ .\gradlew testDebugUnitTest 2>&1 | Out-File -Encoding utf8 build_erro ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (Could not write...est Executor 2.:String) []
- , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-
-java.io.IOException: The pipe is being closed
- at java.base/java.io.FileOutputStream.writeBytes(Native Method)
- at java.base/java.io.FileOutputStream.write(FileOutputStream.java:367)
- at java.base/java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:125)
- at java.base/java.io.BufferedOutputStream.implFlush(BufferedOutputStream.java:252)
- at java.base/java.io.BufferedOutputStream.flush(BufferedOutputStream.java:240)
- at org.gradle.process.internal.streams.ExecOutputHandleRunner.writeBuffer(ExecOutputHandl
-eRunner.java:98)
- at org.gradle.process.internal.streams.ExecOutputHandleRunner.forwardContent(ExecOutputHa
-ndleRunner.java:85)
- at org.gradle.process.internal.streams.ExecOutputHandleRunner.run(ExecOutputHandleRunner.
-java:64)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(Executo
-rPolicy.java:64)
- at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.j
-ava:48)
- at
-java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
- at
-java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
- at java.base/java.lang.Thread.run(Thread.java:1583)
-> Task :app:testDebugUnitTest FAILED
-Error: Could not find or load main class GX;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v12.4\bin;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v12.4\libnvvp;C:\Program Files\Common Files\Oracle\Java\javapath;C:\WINDOWS\s
-ystem32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:
-\WINDOWS\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files (x86)\NVIDIA
-Corporation\PhysX\Common;C:\tools\cuda\bin;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v11.2\include;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v11.2\extras\CUPTI\lib64;C:\Program Files\Git\cmd;C:\Program Files\Git
-LFS;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\WINDOWS\system32;C:\WINDOWS;C
-:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\Op
-enSSH\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program
-Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program
-Files\Docker\Docker\resources\bin;C:\Program Files\NVIDIA Corporation\NVIDIA
-app\NvDLISR;C:\Program Files\NVIDIA Corporation\Nsight Compute 2024.1.0\;C:\Program
-Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Program Files\nodejs\;C:\Users\david\AppData\Lo
-cal\Programs\Python\Python312\Scripts\;C:\Users\david\AppData\Local\Programs\Python\Python
-312\;C:\Users\david\AppData\Local\Microsoft\WindowsApps;C:\Users\david\AppData\Local\Progr
-ams\Microsoft VS Code\bin;C:\Users\david\AppData\Local\GitHubDesktop\bin;C:\Program
-Files\heroku\bin;C:\ghcup\bin;C:\MinGW\bin;E:\IntelliJ IDEA 2023.3.5\bin;C:\Users\david\.d
-otnet\tools;C:\Users\david\AppData\Local\Microsoft\WinGet\Packages\Gyan.FFmpeg_Microsoft.W
-inget.Source_8wekyb3d8bbwe\ffmpeg-8.0-full_build\bin;C:\Users\david\AppData\Roaming\npm;X:
-\Antigravity\bin;.;C:\Users\david\.gemini\antigravity\scratch\iptv-player\app\src\testDebu
-g\jniLibs;C:\Users\david\.gemini\antigravity\scratch\iptv-player\app\src\test\jniLibs
-Caused by: java.lang.ClassNotFoundException: GX;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v12/4\bin;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v12/4\libnvvp;C:\Program Files\Common Files\Oracle\Java\javapath;C:\WINDOWS\s
-ystem32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1/0\;C:
-\WINDOWS\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files (x86)\NVIDIA
-Corporation\PhysX\Common;C:\tools\cuda\bin;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v11/2\include;C:\Program Files\NVIDIA GPU Computing
-Toolkit\CUDA\v11/2\extras\CUPTI\lib64;C:\Program Files\Git\cmd;C:\Program Files\Git
-LFS;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\WINDOWS\system32;C:\WINDOWS;C
-:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1/0\;C:\WINDOWS\System32\Op
-enSSH\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program
-Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program
-Files\Docker\Docker\resources\bin;C:\Program Files\NVIDIA Corporation\NVIDIA
-app\NvDLISR;C:\Program Files\NVIDIA Corporation\Nsight Compute 2024/1/0\;C:\Program
-Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Program Files\nodejs\;C:\Users\david\AppData\Lo
-cal\Programs\Python\Python312\Scripts\;C:\Users\david\AppData\Local\Programs\Python\Python
-312\;C:\Users\david\AppData\Local\Microsoft\WindowsApps;C:\Users\david\AppData\Local\Progr
-ams\Microsoft VS Code\bin;C:\Users\david\AppData\Local\GitHubDesktop\bin;C:\Program
-Files\heroku\bin;C:\ghcup\bin;C:\MinGW\bin;E:\IntelliJ IDEA 2023/3/5\bin;C:\Users\david\/d
-otnet\tools;C:\Users\david\AppData\Local\Microsoft\WinGet\Packages\Gyan/FFmpeg_Microsoft/W
-inget/Source_8wekyb3d8bbwe\ffmpeg-8/0-full_build\bin;C:\Users\david\AppData\Roaming\npm;X:
-\Antigravity\bin;/;C:\Users\david\/gemini\antigravity\scratch\iptv-player\app\src\testDebu
-g\jniLibs;C:\Users\david\/gemini\antigravity\scratch\iptv-player\app\src\test\jniLibs
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:testDebugUnitTest'.
-> Process 'Gradle Test Executor 2' finished with non-zero exit value 1
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 4s
-70 actionable tasks: 1 executed, 69 up-to-date
diff --git a/build_log.txt b/build_log.txt
index 49c4c353..957a3b2f 100644
Binary files a/build_log.txt and b/build_log.txt differ
diff --git a/build_out.txt b/build_out.txt
deleted file mode 100644
index f361ac8a..00000000
Binary files a/build_out.txt and /dev/null differ
diff --git a/build_out8.txt b/build_out8.txt
deleted file mode 100644
index b67814cc..00000000
--- a/build_out8.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:kspDebugKotlin FAILED
-94 actionable tasks: 1 executed, 93 up-to-date
diff --git a/build_output.txt b/build_output.txt
deleted file mode 100644
index 982eb5b1..00000000
Binary files a/build_output.txt and /dev/null differ
diff --git a/build_output2.txt b/build_output2.txt
deleted file mode 100644
index 55176ed4..00000000
--- a/build_output2.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-> Task :app:preBuild UP-TO-DATE
-> Task :app:preDebugBuild UP-TO-DATE
-> Task :app:mergeDebugNativeDebugMetadata NO-SOURCE
-> Task :domain:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :domain:compileKotlin UP-TO-DATE
-> Task :domain:compileJava NO-SOURCE
-> Task :domain:processResources NO-SOURCE
-> Task :domain:classes UP-TO-DATE
-> Task :domain:jar UP-TO-DATE
-> Task :app:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:preBuild UP-TO-DATE
-> Task :data:preDebugBuild UP-TO-DATE
-> Task :data:writeDebugAarMetadata UP-TO-DATE
-> Task :player:preBuild UP-TO-DATE
-> Task :player:preDebugBuild UP-TO-DATE
-> Task :player:writeDebugAarMetadata UP-TO-DATE
-> Task :app:checkDebugAarMetadata UP-TO-DATE
-> Task :app:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResValues UP-TO-DATE
-> Task :data:generateDebugResources UP-TO-DATE
-> Task :data:packageDebugResources UP-TO-DATE
-> Task :player:generateDebugResValues UP-TO-DATE
-> Task :player:generateDebugResources UP-TO-DATE
-> Task :player:packageDebugResources UP-TO-DATE
-> Task :app:mapDebugSourceSetPaths UP-TO-DATE
-> Task :app:generateDebugResources UP-TO-DATE
-> Task :app:mergeDebugResources UP-TO-DATE
-> Task :app:packageDebugResources UP-TO-DATE
-> Task :app:parseDebugLocalResources UP-TO-DATE
-> Task :app:createDebugCompatibleScreenManifests UP-TO-DATE
-> Task :app:extractDeepLinksDebug UP-TO-DATE
-> Task :data:extractDeepLinksDebug UP-TO-DATE
-> Task :data:processDebugManifest UP-TO-DATE
-> Task :player:extractDeepLinksDebug UP-TO-DATE
-> Task :player:processDebugManifest UP-TO-DATE
-> Task :app:processDebugMainManifest UP-TO-DATE
-> Task :app:processDebugManifest UP-TO-DATE
-> Task :app:processDebugManifestForPackage UP-TO-DATE
-> Task :data:compileDebugLibraryResources UP-TO-DATE
-> Task :data:parseDebugLocalResources UP-TO-DATE
-> Task :data:generateDebugRFile UP-TO-DATE
-> Task :player:compileDebugLibraryResources UP-TO-DATE
-> Task :player:parseDebugLocalResources UP-TO-DATE
-> Task :player:generateDebugRFile UP-TO-DATE
-> Task :app:processDebugResources UP-TO-DATE
-> Task :data:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :data:kspDebugKotlin UP-TO-DATE
-> Task :data:compileDebugKotlin UP-TO-DATE
-> Task :data:javaPreCompileDebug UP-TO-DATE
-> Task :data:compileDebugJavaWithJavac UP-TO-DATE
-> Task :data:copyRoomSchemas NO-SOURCE
-> Task :data:transformDebugClassesWithAsm UP-TO-DATE
-> Task :data:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :player:checkKotlinGradlePluginConfigurationErrors SKIPPED
-> Task :player:kspDebugKotlin UP-TO-DATE
-> Task :player:compileDebugKotlin UP-TO-DATE
-> Task :player:javaPreCompileDebug UP-TO-DATE
-> Task :player:compileDebugJavaWithJavac UP-TO-DATE
-> Task :player:transformDebugClassesWithAsm UP-TO-DATE
-> Task :player:bundleLibCompileToJarDebug UP-TO-DATE
-> Task :app:javaPreCompileDebug UP-TO-DATE
-> Task :app:mergeDebugShaders UP-TO-DATE
-> Task :app:compileDebugShaders NO-SOURCE
-> Task :app:generateDebugAssets UP-TO-DATE
-> Task :data:mergeDebugShaders UP-TO-DATE
-> Task :data:compileDebugShaders NO-SOURCE
-> Task :data:generateDebugAssets UP-TO-DATE
-> Task :data:packageDebugAssets UP-TO-DATE
-> Task :player:mergeDebugShaders UP-TO-DATE
-> Task :player:compileDebugShaders NO-SOURCE
-> Task :player:generateDebugAssets UP-TO-DATE
-> Task :player:packageDebugAssets UP-TO-DATE
-> Task :app:mergeDebugAssets UP-TO-DATE
-> Task :app:compressDebugAssets UP-TO-DATE
-> Task :data:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToJarDebug UP-TO-DATE
-> Task :app:desugarDebugFileDependencies UP-TO-DATE
-> Task :data:processDebugJavaRes UP-TO-DATE
-> Task :player:processDebugJavaRes UP-TO-DATE
-> Task :app:checkDebugDuplicateClasses UP-TO-DATE
-> Task :app:mergeExtDexDebug UP-TO-DATE
-> Task :data:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :player:bundleLibRuntimeToDirDebug UP-TO-DATE
-> Task :app:mergeDebugJniLibFolders UP-TO-DATE
-> Task :data:mergeDebugJniLibFolders UP-TO-DATE
-> Task :app:mergeLibDexDebug UP-TO-DATE
-> Task :data:mergeDebugNativeLibs NO-SOURCE
-> Task :data:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :player:mergeDebugJniLibFolders UP-TO-DATE
-> Task :player:mergeDebugNativeLibs NO-SOURCE
-> Task :player:copyDebugJniLibsProjectOnly UP-TO-DATE
-> Task :app:mergeDebugNativeLibs UP-TO-DATE
-> Task :app:stripDebugDebugSymbols UP-TO-DATE
-> Task :app:validateSigningDebug UP-TO-DATE
-> Task :app:writeDebugAppMetadata UP-TO-DATE
-> Task :app:writeDebugSigningConfigVersions UP-TO-DATE
-> Task :data:stripDebugDebugSymbols NO-SOURCE
-> Task :data:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :data:extractDebugAnnotations UP-TO-DATE
-> Task :data:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :data:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :data:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :data:prepareDebugArtProfile UP-TO-DATE
-> Task :data:prepareLintJarForPublish UP-TO-DATE
-> Task :data:mergeDebugJavaResource UP-TO-DATE
-> Task :data:syncDebugLibJars UP-TO-DATE
-> Task :data:bundleDebugAar UP-TO-DATE
-> Task :data:assembleDebug UP-TO-DATE
-> Task :player:stripDebugDebugSymbols NO-SOURCE
-> Task :player:copyDebugJniLibsProjectAndLocalJars UP-TO-DATE
-> Task :player:extractDebugAnnotations UP-TO-DATE
-> Task :player:extractDeepLinksForAarDebug UP-TO-DATE
-> Task :player:mergeDebugGeneratedProguardFiles UP-TO-DATE
-> Task :player:mergeDebugConsumerProguardFiles UP-TO-DATE
-> Task :player:prepareDebugArtProfile UP-TO-DATE
-> Task :player:prepareLintJarForPublish UP-TO-DATE
-> Task :player:mergeDebugJavaResource UP-TO-DATE
-> Task :player:syncDebugLibJars UP-TO-DATE
-> Task :player:bundleDebugAar UP-TO-DATE
-> Task :player:assembleDebug UP-TO-DATE
-
-> Task :app:kspDebugKotlin FAILED
-.\gradlew : e: file:///C:/Users/david/.gemini/antigravity/scratch/iptv-player/app/src/main
-/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt:420:1 Expecting a top
-level declaration
-At line:1 char:1
-+ .\gradlew assembleDebug 2>&1 | Out-File -Encoding utf8 build_output2. ...
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- + CategoryInfo : NotSpecified: (e: file:///C:/U...vel declaration:String) []
- , RemoteException
- + FullyQualifiedErrorId : NativeCommandError
-
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':app:kspDebugKotlin'.
-> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRun
-nerWithWorkers$GradleKotlinCompilerWorkAction
- > Compilation error. See log for more details
-
-* Try:
-> Run with --stacktrace option to get the stack trace.
-> Run with --info or --debug option to get more log output.
-> Run with --scan to get full insights.
-> Get more help at https://help.gradle.org.
-
-BUILD FAILED in 6s
-94 actionable tasks: 1 executed, 93 up-to-date