From cfe37e06bf833a3acd27ecbe8034e99f2c16fbfa Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Mon, 23 Dec 2024 15:04:33 +0100 Subject: [PATCH] lint: run ktlintFormat --- .../jellyfin/presentation/setup/addserver/AddServerScreen.kt | 2 +- .../presentation/setup/components/DiscoveredServerItem.kt | 2 +- .../jellyfin/presentation/setup/components/ServerItem.kt | 2 +- .../jdtech/jellyfin/presentation/setup/components/UserItem.kt | 2 +- .../jellyfin/presentation/setup/servers/ServerScreen.kt | 4 ++-- .../jdtech/jellyfin/presentation/setup/users/UsersScreen.kt | 2 +- .../src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt | 2 +- app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt | 2 +- app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt | 4 ++-- app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt | 2 +- app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt | 2 +- app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt | 2 +- .../java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt | 2 +- .../main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt | 4 ++-- .../java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt | 2 +- .../java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/addserver/AddServerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/addserver/AddServerScreen.kt index dbbb638f0a..4e51df08f1 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/addserver/AddServerScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/addserver/AddServerScreen.kt @@ -42,6 +42,7 @@ import androidx.tv.material3.Icon import androidx.tv.material3.LocalContentColor import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer import dev.jdtech.jellyfin.presentation.setup.components.DiscoveredServerItem import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings @@ -50,7 +51,6 @@ import dev.jdtech.jellyfin.setup.presentation.addserver.AddServerAction import dev.jdtech.jellyfin.setup.presentation.addserver.AddServerEvent import dev.jdtech.jellyfin.setup.presentation.addserver.AddServerState import dev.jdtech.jellyfin.setup.presentation.addserver.AddServerViewModel -import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer import dev.jdtech.jellyfin.utils.ObserveAsEvents @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/DiscoveredServerItem.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/DiscoveredServerItem.kt index d62ffc1f64..cd891b9827 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/DiscoveredServerItem.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/DiscoveredServerItem.kt @@ -23,9 +23,9 @@ import androidx.tv.material3.Icon import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer import dev.jdtech.jellyfin.core.R as CoreR @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/ServerItem.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/ServerItem.kt index a4ce9cfb4b..4e86adb1d6 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/ServerItem.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/ServerItem.kt @@ -22,9 +22,9 @@ import androidx.tv.material3.ClickableSurfaceDefaults import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer @Composable fun ServerItem( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/UserItem.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/UserItem.kt index 025a218f6e..330174e3ff 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/UserItem.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/components/UserItem.kt @@ -26,10 +26,10 @@ import androidx.tv.material3.Surface import androidx.tv.material3.Text import coil.compose.AsyncImage import coil.request.ImageRequest +import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import dev.jdtech.jellyfin.models.User import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import org.jellyfin.sdk.model.api.ImageType import dev.jdtech.jellyfin.core.R as CoreR diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/servers/ServerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/servers/ServerScreen.kt index 65855f2eb8..aae798beb2 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/servers/ServerScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/servers/ServerScreen.kt @@ -25,6 +25,8 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.tv.material3.MaterialTheme import androidx.tv.material3.OutlinedButton import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer +import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer import dev.jdtech.jellyfin.models.ServerAddress import dev.jdtech.jellyfin.models.ServerWithAddresses import dev.jdtech.jellyfin.presentation.setup.components.ServerItem @@ -35,8 +37,6 @@ import dev.jdtech.jellyfin.setup.presentation.servers.ServersAction import dev.jdtech.jellyfin.setup.presentation.servers.ServersEvent import dev.jdtech.jellyfin.setup.presentation.servers.ServersState import dev.jdtech.jellyfin.setup.presentation.servers.ServersViewModel -import dev.jdtech.jellyfin.core.presentation.dummy.dummyDiscoveredServer -import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer import dev.jdtech.jellyfin.utils.ObserveAsEvents import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/users/UsersScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/users/UsersScreen.kt index d087bed382..c7b0e1a0e4 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/users/UsersScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/presentation/setup/users/UsersScreen.kt @@ -28,6 +28,7 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.OutlinedButton import androidx.tv.material3.Text import dev.jdtech.jellyfin.api.JellyfinApi +import dev.jdtech.jellyfin.core.presentation.dummy.dummyUsers import dev.jdtech.jellyfin.presentation.setup.components.UserItem import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings @@ -35,7 +36,6 @@ import dev.jdtech.jellyfin.setup.presentation.users.UsersAction import dev.jdtech.jellyfin.setup.presentation.users.UsersEvent import dev.jdtech.jellyfin.setup.presentation.users.UsersState import dev.jdtech.jellyfin.setup.presentation.users.UsersViewModel -import dev.jdtech.jellyfin.core.presentation.dummy.dummyUsers import dev.jdtech.jellyfin.utils.ObserveAsEvents import dev.jdtech.jellyfin.setup.R as SetupR diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt index fea3251cb2..cceb4e255d 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt @@ -18,13 +18,13 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.tv.material3.MaterialTheme +import dev.jdtech.jellyfin.core.presentation.dummy.dummyCollections import dev.jdtech.jellyfin.models.CollectionType import dev.jdtech.jellyfin.models.FindroidCollection import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings import dev.jdtech.jellyfin.ui.components.Direction import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.core.presentation.dummy.dummyCollections import dev.jdtech.jellyfin.viewmodels.MediaViewModel import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt index 37bfe0bed5..afdc3a02fb 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt @@ -20,6 +20,7 @@ import androidx.paging.PagingData import androidx.paging.compose.collectAsLazyPagingItems import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovies import dev.jdtech.jellyfin.models.CollectionType import dev.jdtech.jellyfin.models.FindroidFolder import dev.jdtech.jellyfin.models.FindroidItem @@ -29,7 +30,6 @@ import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings import dev.jdtech.jellyfin.ui.components.Direction import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovies import dev.jdtech.jellyfin.viewmodels.LibraryViewModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt index 467896e9c7..85c04def2f 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt @@ -37,6 +37,8 @@ import androidx.tv.material3.TabDefaults import androidx.tv.material3.TabRow import androidx.tv.material3.TabRowDefaults import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer +import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import dev.jdtech.jellyfin.models.CollectionType import dev.jdtech.jellyfin.models.PlayerItem import dev.jdtech.jellyfin.models.User @@ -46,8 +48,6 @@ import dev.jdtech.jellyfin.presentation.theme.spacings import dev.jdtech.jellyfin.ui.components.LoadingIndicator import dev.jdtech.jellyfin.ui.components.PillBorderIndicator import dev.jdtech.jellyfin.ui.components.ProfileButton -import dev.jdtech.jellyfin.core.presentation.dummy.dummyServer -import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import dev.jdtech.jellyfin.viewmodels.MainViewModel import java.util.UUID import dev.jdtech.jellyfin.core.R as CoreR diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt index ace0e5161a..44095d701c 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt @@ -45,6 +45,7 @@ import androidx.tv.material3.LocalContentColor import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import coil.compose.AsyncImage +import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovie import dev.jdtech.jellyfin.core.presentation.theme.Yellow import dev.jdtech.jellyfin.models.AudioChannel import dev.jdtech.jellyfin.models.AudioCodec @@ -54,7 +55,6 @@ import dev.jdtech.jellyfin.models.Resolution import dev.jdtech.jellyfin.models.VideoMetadata import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovie import dev.jdtech.jellyfin.utils.ObserveAsEvents import dev.jdtech.jellyfin.viewmodels.MovieViewModel import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt index bea1372af8..8d3021af9f 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt @@ -20,13 +20,13 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisodeItems import dev.jdtech.jellyfin.models.EpisodeItem import dev.jdtech.jellyfin.models.FindroidEpisode import dev.jdtech.jellyfin.models.PlayerItem import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings import dev.jdtech.jellyfin.ui.components.EpisodeCard -import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisodeItems import dev.jdtech.jellyfin.utils.ObserveAsEvents import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent import dev.jdtech.jellyfin.viewmodels.PlayerViewModel diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt index ca6f80b779..488f4a04e6 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt @@ -55,6 +55,7 @@ import androidx.tv.material3.LocalContentColor import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import coil.compose.AsyncImage +import dev.jdtech.jellyfin.core.presentation.dummy.dummyShow import dev.jdtech.jellyfin.core.presentation.theme.Yellow import dev.jdtech.jellyfin.models.FindroidSeason import dev.jdtech.jellyfin.models.PlayerItem @@ -62,7 +63,6 @@ import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings import dev.jdtech.jellyfin.ui.components.Direction import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.core.presentation.dummy.dummyShow import dev.jdtech.jellyfin.utils.ObserveAsEvents import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent import dev.jdtech.jellyfin.viewmodels.PlayerViewModel diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt index d01a8619df..b875edd700 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt @@ -26,10 +26,10 @@ import androidx.tv.material3.ClickableSurfaceScale import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode import dev.jdtech.jellyfin.models.FindroidEpisode import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode @Composable fun EpisodeCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt index a1236bcfd3..e94aa4048e 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt @@ -25,12 +25,12 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text import dev.jdtech.jellyfin.core.R +import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode +import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovie import dev.jdtech.jellyfin.models.FindroidEpisode import dev.jdtech.jellyfin.models.FindroidItem import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode -import dev.jdtech.jellyfin.core.presentation.dummy.dummyMovie @Composable fun ItemCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt index 4bcf4f75ec..0639224e78 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt @@ -23,9 +23,9 @@ import coil.compose.AsyncImage import coil.request.ImageRequest import dev.jdtech.jellyfin.api.JellyfinApi import dev.jdtech.jellyfin.core.R +import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import dev.jdtech.jellyfin.models.User import dev.jdtech.jellyfin.presentation.theme.FindroidTheme -import dev.jdtech.jellyfin.core.presentation.dummy.dummyUser import org.jellyfin.sdk.model.api.ImageType @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt index f2685f8640..019f9bd6cc 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt @@ -17,11 +17,11 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.Icon import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text +import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode +import dev.jdtech.jellyfin.core.presentation.dummy.dummyShow import dev.jdtech.jellyfin.models.FindroidItem import dev.jdtech.jellyfin.presentation.theme.FindroidTheme import dev.jdtech.jellyfin.presentation.theme.spacings -import dev.jdtech.jellyfin.core.presentation.dummy.dummyEpisode -import dev.jdtech.jellyfin.core.presentation.dummy.dummyShow import dev.jdtech.jellyfin.core.R as CoreR @Composable