refactor: clean up

This commit is contained in:
jarnedemeulemeester 2023-10-23 13:24:26 +02:00
parent e210691705
commit e32b4eec7d
No known key found for this signature in database
GPG key ID: 1E5C6AFBD622E9F5
13 changed files with 5 additions and 13 deletions

View file

@ -22,7 +22,7 @@ fun getStorageSelectionDialog(
.setItems(locations) { _, which -> .setItems(locations) { _, which ->
onItemSelected(which) onItemSelected(which)
} }
.setOnCancelListener() { .setOnCancelListener {
onCancel() onCancel()
}.create() }.create()
return dialog return dialog

View file

@ -7,7 +7,6 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreferenceCompat import androidx.preference.SwitchPreferenceCompat
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsAppearanceFragment : PreferenceFragmentCompat() { class SettingsAppearanceFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_appearance, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_appearance, rootKey)

View file

@ -6,7 +6,6 @@ import androidx.preference.EditTextPreference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsCacheFragment : PreferenceFragmentCompat() { class SettingsCacheFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_cache, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_cache, rootKey)

View file

@ -9,7 +9,6 @@ import dev.jdtech.jellyfin.viewmodels.SettingsDeviceViewModel
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@AndroidEntryPoint @AndroidEntryPoint
@Suppress("unused")
class SettingsDeviceFragment : PreferenceFragmentCompat() { class SettingsDeviceFragment : PreferenceFragmentCompat() {
private val viewModel: SettingsDeviceViewModel by viewModels() private val viewModel: SettingsDeviceViewModel by viewModels()

View file

@ -4,7 +4,6 @@ import android.os.Bundle
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsDownloadsFragment : PreferenceFragmentCompat() { class SettingsDownloadsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_downloads, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_downloads, rootKey)

View file

@ -9,7 +9,6 @@ import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsLanguageFragment : PreferenceFragmentCompat() { class SettingsLanguageFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_language, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_language, rootKey)

View file

@ -7,7 +7,6 @@ import androidx.preference.PreferenceFragmentCompat
import dev.jdtech.jellyfin.Constants import dev.jdtech.jellyfin.Constants
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsNetworkFragment : PreferenceFragmentCompat() { class SettingsNetworkFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_network, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_network, rootKey)

View file

@ -9,7 +9,6 @@ import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import dev.jdtech.jellyfin.core.R as CoreR import dev.jdtech.jellyfin.core.R as CoreR
@Suppress("unused")
class SettingsPlayerFragment : PreferenceFragmentCompat() { class SettingsPlayerFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(CoreR.xml.fragment_settings_player, rootKey) setPreferencesFromResource(CoreR.xml.fragment_settings_player, rootKey)

View file

@ -3,7 +3,7 @@ package dev.jdtech.jellyfin.models
import java.util.UUID import java.util.UUID
sealed class HomeItem { sealed class HomeItem {
object OfflineCard : HomeItem() { data object OfflineCard : HomeItem() {
override val id: UUID = UUID.fromString("dbfef8a9-7ff0-4c36-9e36-81dfd65fdd46") override val id: UUID = UUID.fromString("dbfef8a9-7ff0-4c36-9e36-81dfd65fdd46")
} }

View file

@ -33,7 +33,7 @@ constructor(
data class Error(val error: Exception) : UiState() data class Error(val error: Exception) : UiState()
} }
lateinit var season: FindroidSeason private lateinit var season: FindroidSeason
fun loadEpisodes(seriesId: UUID, seasonId: UUID, offline: Boolean) { fun loadEpisodes(seriesId: UUID, seasonId: UUID, offline: Boolean) {
viewModelScope.launch { viewModelScope.launch {

View file

@ -1,6 +1,6 @@
package dev.jdtech.jellyfin.models package dev.jdtech.jellyfin.models
enum class SortBy(val SortString: String) { enum class SortBy(val sortString: String) {
NAME("SortName"), NAME("SortName"),
IMDB_RATING("CommunityRating"), IMDB_RATING("CommunityRating"),
PARENTAL_RATING("CriticRating"), PARENTAL_RATING("CriticRating"),

View file

@ -125,7 +125,7 @@ class JellyfinRepositoryImpl(
parentId = parentId, parentId = parentId,
includeItemTypes = includeTypes, includeItemTypes = includeTypes,
recursive = recursive, recursive = recursive,
sortBy = listOf(sortBy.SortString), sortBy = listOf(sortBy.sortString),
sortOrder = listOf(sortOrder), sortOrder = listOf(sortOrder),
startIndex = startIndex, startIndex = startIndex,
limit = limit, limit = limit,

View file

@ -29,7 +29,6 @@ object Constants {
const val PREF_PLAYER_INTRO_SKIPPER = "pref_player_intro_skipper" const val PREF_PLAYER_INTRO_SKIPPER = "pref_player_intro_skipper"
const val PREF_PLAYER_TRICK_PLAY = "pref_player_trick_play" const val PREF_PLAYER_TRICK_PLAY = "pref_player_trick_play"
const val PREF_PLAYER_PIP_GESTURE = "pref_player_picture_in_picture_gesture" const val PREF_PLAYER_PIP_GESTURE = "pref_player_picture_in_picture_gesture"
const val PREF_PLAYER_PIP_ASPECT_RATIO = "pref_player_picture_in_picture_aspect_ratio"
const val PREF_AUDIO_LANGUAGE = "pref_audio_language" const val PREF_AUDIO_LANGUAGE = "pref_audio_language"
const val PREF_SUBTITLE_LANGUAGE = "pref_subtitle_language" const val PREF_SUBTITLE_LANGUAGE = "pref_subtitle_language"
const val PREF_IMAGE_CACHE = "pref_image_cache" const val PREF_IMAGE_CACHE = "pref_image_cache"