From 3c2b751df283dc35902ed493a1dff6a067287639 Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Sat, 11 Feb 2023 12:09:51 +0100 Subject: [PATCH] lint: fix errors --- .../dev/jdtech/jellyfin/fragments/CollectionFragment.kt | 2 +- .../dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt | 2 +- .../dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt | 7 +++---- .../dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt | 7 ++++++- data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt | 2 +- .../jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt | 1 - .../jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt | 6 +++--- .../src/main/java/dev/jdtech/jellyfin/AppPreferences.kt | 1 - 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt index 0da20fcc..6b8a1d14 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt @@ -120,4 +120,4 @@ class CollectionFragment : Fragment() { ) ) } -} \ No newline at end of file +} diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt index 7a62ba46..260c03f3 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt @@ -35,11 +35,11 @@ import dev.jdtech.jellyfin.utils.setTintColorAttribute import dev.jdtech.jellyfin.viewmodels.MediaInfoViewModel import dev.jdtech.jellyfin.viewmodels.PlayerViewModel import java.util.UUID +import javax.inject.Inject import kotlinx.coroutines.launch import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemKind import timber.log.Timber -import javax.inject.Inject @AndroidEntryPoint class MediaInfoFragment : Fragment() { diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt b/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt index 15cd2a43..f812bbac 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt +++ b/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt @@ -8,14 +8,14 @@ import dev.jdtech.jellyfin.core.R import dev.jdtech.jellyfin.models.FavoriteSection import dev.jdtech.jellyfin.models.UiText import dev.jdtech.jellyfin.repository.JellyfinRepository +import java.util.UUID +import javax.inject.Inject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.jellyfin.sdk.model.api.BaseItemKind -import java.util.UUID -import javax.inject.Inject @HiltViewModel class CollectionViewModel @@ -81,6 +81,5 @@ constructor( _uiState.emit(UiState.Error(e)) } } - } -} \ No newline at end of file +} diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt b/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt index f125e514..3fd6f5f5 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt +++ b/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt @@ -26,7 +26,12 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.jellyfin.sdk.api.client.exception.ApiClientException -import org.jellyfin.sdk.model.api.* +import org.jellyfin.sdk.model.api.BaseItemDto +import org.jellyfin.sdk.model.api.BaseItemKind +import org.jellyfin.sdk.model.api.BaseItemPerson +import org.jellyfin.sdk.model.api.MediaStream +import org.jellyfin.sdk.model.api.MediaStreamType +import org.jellyfin.sdk.model.api.PlayAccess import timber.log.Timber @HiltViewModel diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt b/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt index 3faf8fa6..ae698c49 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt +++ b/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt @@ -13,4 +13,4 @@ data class Intro( val showSkipPromptAt: Double, @SerialName("HideSkipPromptAt") val hideSkipPromptAt: Double -) \ No newline at end of file +) diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt b/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt index 976e23ab..7e338f9c 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt +++ b/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt @@ -10,7 +10,6 @@ import java.util.UUID import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext -import org.jellyfin.sdk.api.client.exception.InvalidStatusException import org.jellyfin.sdk.api.client.extensions.get import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemKind diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt index 27dc1dbd..c23e3a24 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt +++ b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt @@ -24,6 +24,8 @@ import dev.jdtech.jellyfin.mpv.MPVPlayer import dev.jdtech.jellyfin.mpv.TrackType import dev.jdtech.jellyfin.repository.JellyfinRepository import dev.jdtech.jellyfin.utils.postDownloadPlaybackProgress +import java.util.UUID +import javax.inject.Inject import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -31,8 +33,6 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import timber.log.Timber -import java.util.UUID -import javax.inject.Inject @HiltViewModel class PlayerActivityViewModel @@ -153,7 +153,7 @@ constructor( Timber.e(e) } - player.setMediaItems(mediaItems, currentMediaItemIndex, items.getOrNull(currentMediaItemIndex)?.playbackPosition?: C.TIME_UNSET) + player.setMediaItems(mediaItems, currentMediaItemIndex, items.getOrNull(currentMediaItemIndex)?.playbackPosition ?: C.TIME_UNSET) if (appPreferences.playerMpv && playFromDownloads) { // For some reason, adding a 1ms delay between these two lines fixes a crash when playing with mpv from downloads withContext(Dispatchers.IO) { Thread.sleep(1) diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt index b07107b1..2bad305b 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt +++ b/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt @@ -133,5 +133,4 @@ constructor( putString(Constants.PREF_SORT_ORDER, value) } } - }