bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-07-23 19:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: reorganize package structure and remove unused files (remove old core parent package) in domain module

Browse Source
This commit is contained in:
Barnabas Balogh
2026-04-24 09:31:30 +02:00
parent a9bd23e26c
commit a1239c907a
95 changed files with 189 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt
View File

@@ -19,9 +19,9 @@ import androidx.compose.ui.unit.dp
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.EpisodeUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.screen.home.TvHomeScreen
import hu.bbara.purefin.ui.theme.AppTheme

9
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt
View File

@@ -33,17 +33,16 @@ import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onAllNodesWithContentDescription
import androidx.compose.ui.test.onAllNodesWithTag
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performKeyInput
import androidx.compose.ui.test.performSemanticsAction
import androidx.compose.ui.test.pressKey
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.core.player.model.QueueItemUi
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.core.player.model.TrackType
import hu.bbara.purefin.player.model.PlayerUiState
import hu.bbara.purefin.player.model.QueueItemUi
import hu.bbara.purefin.player.model.TrackOption
import hu.bbara.purefin.player.model.TrackType
import hu.bbara.purefin.ui.screen.player.TV_HIDDEN_STOP_FEEDBACK_MS
import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedback
import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedbackTag

2
app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt
View File

@@ -6,7 +6,7 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityRetainedComponent
import dagger.multibindings.IntoSet
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.tvEpisodeSection
import hu.bbara.purefin.navigation.tvHomeSection
import hu.bbara.purefin.navigation.tvLibrarySection

2
app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
View File

@@ -3,8 +3,6 @@ package hu.bbara.purefin.navigation
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.staticCompositionLocalOf
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
staticCompositionLocalOf { error("NavigationManager not provided") }

1
app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt
View File

@@ -4,7 +4,6 @@ import androidx.navigation3.runtime.EntryProviderScope
import hu.bbara.purefin.ui.screen.episode.TvEpisodeScreen
import hu.bbara.purefin.ui.screen.movie.TvMovieScreen
import hu.bbara.purefin.ui.screen.series.TvSeriesScreen
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.ui.screen.login.LoginScreen
import hu.bbara.purefin.ui.screen.TvAppScreen
import hu.bbara.purefin.ui.screen.library.TvLibraryScreen

6
app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt
View File

@@ -38,9 +38,9 @@ import coil3.util.DebugLogger
import dagger.hilt.android.AndroidEntryPoint
import hu.bbara.purefin.data.SessionBootstrapper
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.core.navigation.NavigationCommand
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.NavigationCommand
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
import hu.bbara.purefin.navigation.LocalNavigationBackStack
import hu.bbara.purefin.navigation.LocalNavigationManager

8
app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
View File

@@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.core.ui.model.SeriesUiModel
import hu.bbara.purefin.ui.model.EpisodeUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.SeriesUiModel
import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import java.util.UUID

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt
View File

@@ -22,9 +22,9 @@ import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
import hu.bbara.purefin.ui.screen.episode.components.TvEpisodeHeroSection
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
import hu.bbara.purefin.image.ArtworkKind

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt
View File

@@ -11,8 +11,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.screen.home.components.TvFocusedItemHero
import hu.bbara.purefin.ui.screen.home.components.TvHomeContent

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt
View File

@@ -23,7 +23,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
internal const val TvHomeHeroTitleTag = "tv-home-hero-title"

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt
View File

@@ -23,7 +23,7 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import java.util.UUID

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt
View File

@@ -44,7 +44,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.bar.MediaProgressBar
import hu.bbara.purefin.ui.common.card.PosterCardContent
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt
View File

@@ -22,8 +22,8 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.core.navigation.LibraryDto
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.navigation.LibraryDto
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.library.LibraryViewModel
import hu.bbara.purefin.ui.common.button.PurefinIconButton
import hu.bbara.purefin.ui.common.card.PosterCard

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt
View File

@@ -22,7 +22,7 @@ import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
import hu.bbara.purefin.ui.common.media.tvMediaDetailBackgroundImageUrl
import hu.bbara.purefin.ui.screen.movie.components.TvMovieHeroSection
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt
View File

@@ -48,8 +48,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.media3.common.util.UnstableApi
import androidx.media3.ui.AspectRatioFrameLayout
import androidx.media3.ui.PlayerView
import hu.bbara.purefin.core.player.viewmodel.ControlsAutoHideBlocker
import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
import hu.bbara.purefin.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay
import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard
import hu.bbara.purefin.ui.screen.player.components.TvTrackPanelType

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt
View File

@@ -47,7 +47,7 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.player.model.PlayerUiState
internal const val TvPlayerPlaylistStateTag = "tv_player_playlist_state"
internal const val TvPlayerPlayPauseButtonTag = "tv_player_play_pause_button"

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt
View File

@@ -4,7 +4,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.player.model.PlayerUiState
@Composable
internal fun TvPlayerLoadingErrorEndCard(

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt
View File

@@ -41,8 +41,8 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.core.player.model.QueueItemUi
import hu.bbara.purefin.player.model.PlayerUiState
import hu.bbara.purefin.player.model.QueueItemUi
import coil3.compose.AsyncImage
internal const val TvPlayerPlaylistRowTag = "tv_player_playlist_row"

3
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt
View File

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -23,7 +22,7 @@ import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.TimedMarker
import hu.bbara.purefin.player.model.TimedMarker
@Composable
internal fun TvPlayerSeekBar(

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt
View File

@@ -44,8 +44,8 @@ import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.player.model.PlayerUiState
import hu.bbara.purefin.player.model.TrackOption
internal const val TvPlayerQualityButtonTag = "tv_player_quality_button"
internal const val TvPlayerAudioButtonTag = "tv_player_audio_button"

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt
View File

@@ -27,7 +27,7 @@ import hu.bbara.purefin.ui.screen.series.components.SeriesFirstSeasonTabTag
import hu.bbara.purefin.ui.screen.series.components.TvEpisodeCarousel
import hu.bbara.purefin.ui.screen.series.components.TvSeasonTabs
import hu.bbara.purefin.ui.screen.series.components.TvSeriesHeroSection
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.navigation.SeriesDto
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.content.series.SeriesViewModel

2
app/src/main/AndroidManifest.xml
View File

@@ -33,7 +33,7 @@
android:exported="false"
android:theme="@style/Theme.Purefin" />
<service
android:name="hu.bbara.purefin.core.download.PurefinDownloadService"
android:name="hu.bbara.purefin.download.PurefinDownloadService"
android:exported="false"
android:foregroundServiceType="dataSync" />
</application>

6
app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
View File

@@ -41,9 +41,9 @@ import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.navigation.LocalNavigationBackStack
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.NavigationCommand
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.NavigationCommand
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.screen.login.LoginScreen
import hu.bbara.purefin.ui.theme.AppTheme

2
app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt
View File

@@ -6,7 +6,7 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityRetainedComponent
import dagger.multibindings.IntoSet
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.appRouteEntryBuilder
@Module

2
app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
View File

@@ -3,8 +3,6 @@ package hu.bbara.purefin.navigation
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.staticCompositionLocalOf
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
staticCompositionLocalOf { error("NavigationManager not provided") }

1
app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
View File

@@ -1,7 +1,6 @@
package hu.bbara.purefin.navigation
import androidx.navigation3.runtime.EntryProviderScope
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.ui.screen.library.LibraryScreen
import hu.bbara.purefin.ui.screen.login.LoginScreen
import hu.bbara.purefin.ui.screen.AppScreen

2
app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt
View File

@@ -11,7 +11,7 @@ import androidx.core.view.WindowInsetsControllerCompat
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dagger.hilt.android.AndroidEntryPoint
import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.ui.screen.player.PlayerScreen
import hu.bbara.purefin.ui.theme.AppTheme

8
app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
View File

@@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.core.ui.model.SeriesUiModel
import hu.bbara.purefin.ui.model.EpisodeUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.SeriesUiModel
import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import java.util.UUID

6
app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
View File

@@ -34,11 +34,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationBackStack
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel

2
app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
View File

@@ -42,7 +42,7 @@ import hu.bbara.purefin.ui.common.button.GhostIconButton
import hu.bbara.purefin.ui.common.button.MediaActionButton
import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.player.PlayerActivity

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt
View File

@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.screen.AppBottomBar
import hu.bbara.purefin.ui.screen.home.components.HomeContent

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt
View File

@@ -21,7 +21,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.screen.home.components.continuewatching.ContinueWatchingSection
import hu.bbara.purefin.ui.screen.home.components.featured.SuggestionsSection

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt
View File

@@ -23,7 +23,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.bar.MediaProgressBar
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.header.SectionHeader
@Composable

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt
View File

@@ -24,7 +24,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.bar.MediaProgressBar
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt
View File

@@ -22,7 +22,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
@Composable
fun SuggestionsSection(

6
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt
View File

@@ -23,9 +23,9 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.EpisodeUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.common.header.SectionHeader

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt
View File

@@ -22,7 +22,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
@Composable

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt
View File

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.common.header.SectionHeader
@Composable

4
app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt
View File

@@ -21,8 +21,8 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.core.navigation.LibraryDto
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.navigation.LibraryDto
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.feature.browse.library.LibraryViewModel
import hu.bbara.purefin.ui.common.button.PurefinIconButton
import hu.bbara.purefin.ui.common.card.PosterCard

4
app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
View File

@@ -33,9 +33,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel

2
app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
View File

@@ -37,7 +37,7 @@ import hu.bbara.purefin.ui.common.button.GhostIconButton
import hu.bbara.purefin.ui.common.button.MediaActionButton
import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.player.PlayerActivity

2
app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt
View File

@@ -37,7 +37,7 @@ import androidx.compose.ui.viewinterop.AndroidView
import androidx.media3.common.util.UnstableApi
import androidx.media3.ui.AspectRatioFrameLayout
import androidx.media3.ui.PlayerView
import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.player.viewmodel.PlayerViewModel
import hu.bbara.purefin.ui.common.visual.EmptyValueTimedVisibility
import hu.bbara.purefin.ui.common.visual.ValueChangeTimedVisibility
import hu.bbara.purefin.ui.screen.player.components.PersistentOverlayContainer

4
app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt
View File

@@ -37,8 +37,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.ui.common.button.GhostIconButton
import hu.bbara.purefin.ui.common.button.PurefinIconButton
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.player.model.PlayerUiState
import hu.bbara.purefin.player.model.TrackOption
@Composable
fun PlayerControlsOverlay(

2
app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt
View File

@@ -3,7 +3,7 @@ package hu.bbara.purefin.ui.screen.player.components
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.player.model.PlayerUiState
@Composable
fun PlayerLoadingErrorEndCard(

2
app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt
View File

@@ -31,7 +31,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.player.model.PlayerUiState
@Composable
fun PlayerQueuePanel(

4
app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt
View File

@@ -1,12 +1,10 @@
package hu.bbara.purefin.ui.screen.player.components
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Slider
import androidx.compose.material3.SliderDefaults
import androidx.compose.runtime.Composable
@@ -19,7 +17,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.TimedMarker
import hu.bbara.purefin.player.model.TimedMarker
@Composable
fun PlayerSeekBar(

2
app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt
View File

@@ -36,7 +36,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.ui.common.button.PurefinIconButton
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.player.model.TrackOption
@Composable
fun QualitySelectionButton(

4
app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
View File

@@ -33,9 +33,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.ui.common.media.MediaSynopsis
import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.navigation.SeriesDto
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season

6
app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
View File

@@ -65,11 +65,11 @@ import hu.bbara.purefin.ui.common.bar.MediaProgressBar
import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season

3
domain/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt → domain/src/main/java/hu/bbara/purefin/download/DownloadControllerModule.kt
View File

@@ -1,10 +1,9 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.download.MediaDownloadController
import javax.inject.Singleton
@Module

2
domain/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt → domain/src/main/java/hu/bbara/purefin/download/DownloadModule.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
import android.content.Context
import androidx.annotation.OptIn

2
domain/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt → domain/src/main/java/hu/bbara/purefin/download/DownloadState.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
sealed class DownloadState {
data object NotDownloaded : DownloadState()

2
domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt → domain/src/main/java/hu/bbara/purefin/download/MediaDownloadController.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow

2
domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt → domain/src/main/java/hu/bbara/purefin/download/MediaDownloadManager.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
import android.content.Context
import android.util.Log

3
domain/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt → domain/src/main/java/hu/bbara/purefin/download/PurefinDownloadService.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.download
package hu.bbara.purefin.download
import android.app.Notification
import android.content.Context
@@ -15,6 +15,7 @@ import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.android.EntryPointAccessors
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.download.R
@OptIn(UnstableApi::class)
class PurefinDownloadService : DownloadService(

22
domain/src/main/java/hu/bbara/purefin/feature/browse/home/AppViewModel.kt
View File

@@ -6,19 +6,19 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.HomeRepository
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.core.download.MediaDownloadController
import hu.bbara.purefin.download.MediaDownloadController
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.Media
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.core.navigation.LibraryDto
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.core.ui.model.SeriesUiModel
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LibraryDto
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.SeriesDto
import hu.bbara.purefin.ui.model.EpisodeUiModel
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.SeriesUiModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow

14
domain/src/main/java/hu/bbara/purefin/feature/browse/library/LibraryViewModel.kt
View File

@@ -5,13 +5,13 @@ import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.HomeRepository
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.core.ui.model.SeriesUiModel
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.SeriesDto
import hu.bbara.purefin.ui.model.MediaUiModel
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.SeriesUiModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow

10
domain/src/main/java/hu/bbara/purefin/feature/content/episode/EpisodeScreenViewModel.kt
View File

@@ -4,12 +4,12 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.download.MediaDownloadController
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.download.MediaDownloadController
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.SeriesDto
import java.util.UUID
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted

8
domain/src/main/java/hu/bbara/purefin/feature/content/movie/MovieScreenViewModel.kt
View File

@@ -4,11 +4,11 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.download.MediaDownloadController
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.download.MediaDownloadController
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import java.util.UUID
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted

10
domain/src/main/java/hu/bbara/purefin/feature/content/series/SeriesViewModel.kt
View File

@@ -4,13 +4,13 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.download.MediaDownloadController
import hu.bbara.purefin.download.DownloadState
import hu.bbara.purefin.download.MediaDownloadController
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import java.util.UUID
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.MutableStateFlow

14
domain/src/main/java/hu/bbara/purefin/feature/downloads/DownloadsViewModel.kt
View File

@@ -4,15 +4,15 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.data.OfflineCatalogReader
import hu.bbara.purefin.core.download.MediaDownloadController
import hu.bbara.purefin.download.MediaDownloadController
import hu.bbara.purefin.image.ArtworkKind
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.core.ui.model.MovieUiModel
import hu.bbara.purefin.core.ui.model.SeriesUiModel
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.navigation.NavigationManager
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.SeriesDto
import hu.bbara.purefin.ui.model.MovieUiModel
import hu.bbara.purefin.ui.model.SeriesUiModel
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn

2
domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt → domain/src/main/java/hu/bbara/purefin/navigation/EpisodeDto.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import java.util.UUID
import kotlinx.serialization.Serializable

2
domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt → domain/src/main/java/hu/bbara/purefin/navigation/LibraryDto.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import java.util.UUID
import kotlinx.serialization.Serializable

2
domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt → domain/src/main/java/hu/bbara/purefin/navigation/MovieDto.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import java.util.UUID
import kotlinx.serialization.Serializable

2
domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt → domain/src/main/java/hu/bbara/purefin/navigation/NavigationManager.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.MutableSharedFlow

2
domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt → domain/src/main/java/hu/bbara/purefin/navigation/NavigationManagerModule.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import dagger.Module
import dagger.Provides

2
domain/src/main/java/hu/bbara/purefin/core/navigation/Route.kt → domain/src/main/java/hu/bbara/purefin/navigation/Route.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import androidx.navigation3.runtime.NavKey
import kotlinx.serialization.Serializable

2
domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt → domain/src/main/java/hu/bbara/purefin/navigation/SeriesDto.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import java.util.UUID
import kotlinx.serialization.Serializable

4
domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt → domain/src/main/java/hu/bbara/purefin/player/manager/MediaSegmentManager.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.manager
package hu.bbara.purefin.player.manager
import android.os.Looper
import android.util.Log
@@ -8,7 +8,7 @@ import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.PlayerMessage
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.model.SegmentType
import hu.bbara.purefin.core.player.model.SegmentStatus
import hu.bbara.purefin.player.model.SegmentStatus
@OptIn(UnstableApi::class)
class MediaSegmentManager(private val player: ExoPlayer) {

24
domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt → domain/src/main/java/hu/bbara/purefin/player/manager/PlayerManager.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.manager
package hu.bbara.purefin.player.manager
import androidx.annotation.OptIn
import androidx.media3.common.C
@@ -11,17 +11,17 @@ import androidx.media3.exoplayer.ExoPlayer
import dagger.hilt.android.scopes.ViewModelScoped
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.core.player.model.MediaContext
import hu.bbara.purefin.core.player.model.MetadataState
import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
import hu.bbara.purefin.core.player.model.QueueItemUi
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.core.player.model.TrackType
import hu.bbara.purefin.core.player.preference.AudioTrackProperties
import hu.bbara.purefin.core.player.preference.SubtitleTrackProperties
import hu.bbara.purefin.core.player.preference.TrackMatcher
import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository
import hu.bbara.purefin.player.model.MediaContext
import hu.bbara.purefin.player.model.MetadataState
import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
import hu.bbara.purefin.player.model.PlaybackStateSnapshot
import hu.bbara.purefin.player.model.QueueItemUi
import hu.bbara.purefin.player.model.TrackOption
import hu.bbara.purefin.player.model.TrackType
import hu.bbara.purefin.player.preference.AudioTrackProperties
import hu.bbara.purefin.player.preference.SubtitleTrackProperties
import hu.bbara.purefin.player.preference.TrackMatcher
import hu.bbara.purefin.player.preference.TrackPreferencesRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob

8
domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt → domain/src/main/java/hu/bbara/purefin/player/manager/ProgressManager.kt
View File

@@ -1,13 +1,13 @@
package hu.bbara.purefin.core.player.manager
package hu.bbara.purefin.player.manager
import android.util.Log
import dagger.hilt.android.scopes.ViewModelScoped
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.PlaybackProgressReporter
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.core.player.model.MetadataState
import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
import hu.bbara.purefin.player.model.MetadataState
import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
import hu.bbara.purefin.player.model.PlaybackStateSnapshot
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job

6
domain/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt → domain/src/main/java/hu/bbara/purefin/player/manager/TrackMapper.kt
View File

@@ -1,12 +1,12 @@
package hu.bbara.purefin.core.player.manager
package hu.bbara.purefin.player.manager
import androidx.annotation.OptIn
import androidx.media3.common.C
import androidx.media3.common.Format
import androidx.media3.common.Tracks
import androidx.media3.common.util.UnstableApi
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.core.player.model.TrackType
import hu.bbara.purefin.player.model.TrackOption
import hu.bbara.purefin.player.model.TrackType
import javax.inject.Inject
data class TrackSelectionState(

4
domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt → domain/src/main/java/hu/bbara/purefin/player/model/MediaContext.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.core.player.preference.MediaTrackPreferences
import hu.bbara.purefin.player.preference.MediaTrackPreferences
data class MediaContext(
val mediaId: String,

2
domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt → domain/src/main/java/hu/bbara/purefin/player/model/MetadataState.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
import hu.bbara.purefin.data.PlaybackReportContext

2
domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt → domain/src/main/java/hu/bbara/purefin/player/model/PlaybackProgressSnapshot.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
data class PlaybackProgressSnapshot(
val durationMs: Long = 0L,

2
domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt → domain/src/main/java/hu/bbara/purefin/player/model/PlaybackStateSnapshot.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
data class PlaybackStateSnapshot(
val isPlaying: Boolean = false,

2
domain/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt → domain/src/main/java/hu/bbara/purefin/player/model/PlayerUiModels.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
data class PlayerUiState(
val isPlaying: Boolean = false,

2
domain/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt → domain/src/main/java/hu/bbara/purefin/player/model/SegmentStatus.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.model
package hu.bbara.purefin.player.model
enum class SegmentStatus {
START,

2
domain/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt → domain/src/main/java/hu/bbara/purefin/player/module/PlaybackNetworkModule.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.module
package hu.bbara.purefin.player.module
import androidx.annotation.OptIn
import androidx.media3.common.util.UnstableApi

2
domain/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt → domain/src/main/java/hu/bbara/purefin/player/module/VideoPlayerModule.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.module
package hu.bbara.purefin.player.module
import android.app.Application
import androidx.annotation.OptIn

6
domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt → domain/src/main/java/hu/bbara/purefin/player/preference/TrackMatcher.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.core.player.preference
package hu.bbara.purefin.player.preference
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.core.player.model.TrackType
import hu.bbara.purefin.player.model.TrackOption
import hu.bbara.purefin.player.model.TrackType
import javax.inject.Inject
class TrackMatcher @Inject constructor() {

3
domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreference.kt → domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreference.kt
View File

@@ -1,6 +1,5 @@
package hu.bbara.purefin.core.player.preference
package hu.bbara.purefin.player.preference
import kotlinx.serialization.InternalSerializationApi
import kotlinx.serialization.Serializable
@Serializable

2
domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt → domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesModule.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.preference
package hu.bbara.purefin.player.preference
import android.content.Context
import androidx.datastore.core.DataStore

2
domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt → domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesRepository.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.preference
package hu.bbara.purefin.player.preference
import androidx.datastore.core.DataStore
import kotlinx.coroutines.flow.Flow

2
domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt → domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesSerializer.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.preference
package hu.bbara.purefin.player.preference
import androidx.datastore.core.CorruptionException
import androidx.datastore.core.Serializer

2
domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt → domain/src/main/java/hu/bbara/purefin/player/viewmodel/ControlsAutoHidePolicy.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.player.viewmodel
package hu.bbara.purefin.player.viewmodel
enum class ControlsAutoHideBlocker {
PLAYLIST,

14
domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt → domain/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt
View File

@@ -1,15 +1,15 @@
package hu.bbara.purefin.core.player.viewmodel
package hu.bbara.purefin.player.viewmodel
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import hu.bbara.purefin.core.player.manager.PlayerManager
import hu.bbara.purefin.core.player.manager.ProgressManager
import hu.bbara.purefin.core.player.model.MediaContext
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.core.player.model.TrackOption
import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository
import hu.bbara.purefin.player.manager.PlayerManager
import hu.bbara.purefin.player.manager.ProgressManager
import hu.bbara.purefin.player.model.MediaContext
import hu.bbara.purefin.player.model.PlayerUiState
import hu.bbara.purefin.player.model.TrackOption
import hu.bbara.purefin.player.preference.TrackPreferencesRepository
import hu.bbara.purefin.data.PlayableMediaRepository
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay

2
domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt → domain/src/main/java/hu/bbara/purefin/ui/model/MediaUiModel.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.ui.model
package hu.bbara.purefin.ui.model
import hu.bbara.purefin.image.ArtworkKind
import hu.bbara.purefin.image.ImageUrlBuilder

1
domain/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt
View File

@@ -3,6 +3,7 @@ package hu.bbara.purefin.core.download
import androidx.media3.datasource.DataSource
import androidx.media3.datasource.cache.CacheDataSource
import androidx.media3.datasource.cache.NoOpCacheEvictor
import hu.bbara.purefin.download.DownloadModuleFactories
import org.junit.Assert.assertNull
import org.junit.Assert.assertSame
import org.junit.Assert.assertTrue

7
domain/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt
View File

@@ -1,8 +1,11 @@
package hu.bbara.purefin.core.navigation
import hu.bbara.purefin.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LibraryDto
import hu.bbara.purefin.navigation.MovieDto
import hu.bbara.purefin.navigation.Route
import hu.bbara.purefin.navigation.SeriesDto
import java.util.UUID
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import org.junit.Assert.assertEquals
import org.junit.Test

3
domain/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt
View File

@@ -1,5 +1,8 @@
package hu.bbara.purefin.core.player.viewmodel
import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
import hu.bbara.purefin.player.viewmodel.ControlsAutoHideCommand
import hu.bbara.purefin.player.viewmodel.ControlsAutoHidePolicy
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test

2
ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
View File

@@ -21,7 +21,7 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.PlayerUiState
import hu.bbara.purefin.player.model.PlayerUiState
@Composable
fun PlayerLoadingErrorEndCardContent(

4
ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
View File

@@ -10,8 +10,8 @@ import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.player.model.MarkerType
import hu.bbara.purefin.core.player.model.TimedMarker
import hu.bbara.purefin.player.model.MarkerType
import hu.bbara.purefin.player.model.TimedMarker
@Composable
fun PlayerSeekBarTrack(