Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ fun VideoPlayerControls(
onSeek = { player.seekTo(player.duration.times(it).toLong()) },
contentProgress = contentCurrentPosition.milliseconds,
contentDuration = player.duration.milliseconds,
seekBackIncrement = player.seekBackIncrement.milliseconds,
seekForwardIncrement = player.seekForwardIncrement.milliseconds,
)
},
mediaActions = {
Expand Down
78 changes: 62 additions & 16 deletions app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
Expand All @@ -25,6 +25,7 @@ import androidx.compose.ui.res.stringArrayResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.media3.common.C.DEFAULT_SEEK_BACK_INCREMENT_MS
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.ramcosta.composedestinations.annotation.Destination
Expand All @@ -34,12 +35,18 @@ import com.ramcosta.composedestinations.generated.destinations.SettingsScreenDes
import com.ramcosta.composedestinations.generated.destinations.UserSelectScreenDestination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import dev.jdtech.jellyfin.Constants
import dev.jdtech.jellyfin.core.R
import dev.jdtech.jellyfin.models.Preference
import dev.jdtech.jellyfin.models.PreferenceCategory
import dev.jdtech.jellyfin.models.PreferenceCategoryLabel
import dev.jdtech.jellyfin.models.PreferenceLong
import dev.jdtech.jellyfin.models.PreferenceSelect
import dev.jdtech.jellyfin.models.PreferenceSwitch
import dev.jdtech.jellyfin.ui.components.SettingsCategoryCard
import dev.jdtech.jellyfin.ui.components.SettingsDetailsCard
import dev.jdtech.jellyfin.ui.components.SettingsCategoryLabel
import dev.jdtech.jellyfin.ui.components.SettingsDetailsLongCard
import dev.jdtech.jellyfin.ui.components.SettingsDetailsSelectCard
import dev.jdtech.jellyfin.ui.components.SettingsLongCard
import dev.jdtech.jellyfin.ui.components.SettingsSelectCard
import dev.jdtech.jellyfin.ui.components.SettingsSwitchCard
import dev.jdtech.jellyfin.ui.theme.FindroidTheme
Expand Down Expand Up @@ -85,6 +92,9 @@ fun SettingsSubScreen(
is PreferenceSelect -> {
settingsViewModel.setString(preference.backendName, preference.value)
}
is PreferenceLong -> {
settingsViewModel.setString(preference.backendName, preference.value.toString())
}
}
settingsViewModel.loadPreferences(indexes)
}
Expand Down Expand Up @@ -139,8 +149,11 @@ private fun SettingsSubScreenLayout(
.weight(1f)
.focusRequester(focusRequester),
) {
items(uiState.preferences) { preference ->
itemsIndexed(uiState.preferences) { index, preference ->
when (preference) {
is PreferenceCategoryLabel -> SettingsCategoryLabel(
preference = preference,
)
is PreferenceCategory -> SettingsCategoryCard(
preference = preference,
modifier = Modifier.onFocusChanged {
Expand Down Expand Up @@ -184,25 +197,50 @@ private fun SettingsSubScreenLayout(
}
}
}
is PreferenceLong -> {
SettingsLongCard(
preference = preference,
modifier = Modifier.onFocusChanged {
if (it.isFocused) {
focusedPreference = preference
}
},
) {
onUpdate(preference.copy(value = preference.value))
}
}
}
}
}
Box(
modifier = Modifier.weight(2f),
) {
(focusedPreference as? PreferenceSelect)?.let {
SettingsDetailsCard(
preference = it,
modifier = Modifier
.fillMaxSize()
.padding(bottom = MaterialTheme.spacings.large),
onOptionSelected = { value ->
println(value)
val newPreference = it.copy(value = value)
onUpdate(newPreference)
focusedPreference = newPreference
},
)
focusedPreference.let {
when (it) {
is PreferenceSelect -> SettingsDetailsSelectCard(
preference = it,
modifier = Modifier
.fillMaxSize()
.padding(bottom = MaterialTheme.spacings.large),
onOptionSelected = { value ->
println(value)
val newPreference = it.copy(value = value)
onUpdate(newPreference)
focusedPreference = newPreference
},
)
is PreferenceLong -> SettingsDetailsLongCard(
preference = it,
modifier = Modifier
.fillMaxSize()
.padding(bottom = MaterialTheme.spacings.large),
onValueUpdate = { value ->
val newPreference = it.copy(value = value)
onUpdate(newPreference)
focusedPreference = newPreference
},
)
}
}
}
}
Expand All @@ -224,13 +262,21 @@ private fun SettingsSubScreenLayoutPreview() {
SettingsSubScreenLayout(
uiState = SettingsViewModel.UiState.Normal(
listOf(
PreferenceCategoryLabel(nameStringResource = R.string.mpv_player),
PreferenceSelect(
nameStringResource = CoreR.string.pref_player_mpv_hwdec,
backendName = Constants.PREF_PLAYER_MPV_HWDEC,
backendDefaultValue = "mediacodec",
options = CoreR.array.mpv_hwdec,
optionValues = CoreR.array.mpv_hwdec,
),
PreferenceCategoryLabel(nameStringResource = R.string.seeking),
PreferenceLong(
nameStringResource = R.string.seek_back_increment,
backendName = Constants.PREF_PLAYER_SEEK_BACK_INC,
backendDefaultValue = DEFAULT_SEEK_BACK_INCREMENT_MS,
value = DEFAULT_SEEK_BACK_INCREMENT_MS,
),
),
),
title = CoreR.string.settings_category_player,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package dev.jdtech.jellyfin.ui.components

import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import dev.jdtech.jellyfin.models.PreferenceCategoryLabel
import dev.jdtech.jellyfin.ui.theme.FindroidTheme
import dev.jdtech.jellyfin.core.R as CoreR

@Composable
fun SettingsCategoryLabel(
preference: PreferenceCategoryLabel,
modifier: Modifier = Modifier,
) {
Text(
text = stringResource(id = preference.nameStringResource),
style = MaterialTheme.typography.titleSmall,
modifier = modifier.fillMaxWidth(),
)
}

@Preview
@Composable
private fun SettingsLabelPreview() {
FindroidTheme {
SettingsCategoryLabel(
preference = PreferenceCategoryLabel(nameStringResource = CoreR.string.mpv_player),
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package dev.jdtech.jellyfin.ui.components

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.OutlinedTextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.tooling.preview.Preview
import androidx.core.text.isDigitsOnly
import androidx.media3.common.C.DEFAULT_SEEK_BACK_INCREMENT_MS
import androidx.tv.material3.Button
import androidx.tv.material3.ButtonScale
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import dev.jdtech.jellyfin.Constants
import dev.jdtech.jellyfin.models.PreferenceLong
import dev.jdtech.jellyfin.ui.theme.FindroidTheme
import dev.jdtech.jellyfin.ui.theme.spacings
import dev.jdtech.jellyfin.core.R as CoreR

@Composable
fun SettingsDetailsLongCard(
preference: PreferenceLong,
modifier: Modifier = Modifier,
onValueUpdate: (Long) -> Unit,
) {
Surface(modifier = modifier) {
Column(
modifier = Modifier.padding(
horizontal = MaterialTheme.spacings.default,
vertical = MaterialTheme.spacings.medium,
),
) {
Text(
text = stringResource(id = preference.nameStringResource),
style = MaterialTheme.typography.headlineMedium,
)
preference.descriptionStringRes?.let {
Spacer(modifier = Modifier.height(MaterialTheme.spacings.small))
Text(text = stringResource(id = it), style = MaterialTheme.typography.bodyMedium)
}
Spacer(modifier = Modifier.height(MaterialTheme.spacings.default))
Column(modifier = Modifier.padding(vertical = MaterialTheme.spacings.medium)) {
var text by remember(preference.value) { mutableStateOf(preference.value.toString()) }
OutlinedTextField(
value = text,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
onValueChange = {
if (it.isDigitsOnly()) {
text = it
}
},
singleLine = true,
modifier = Modifier.fillMaxWidth(),
)
Spacer(modifier = Modifier.height(MaterialTheme.spacings.medium))
Box {
Button(
onClick = {
onValueUpdate(text.toLongOrNull() ?: return@Button)
},
enabled = text.isNotEmpty(),
scale = ButtonScale.None,
) {
Box(
modifier = Modifier.fillMaxWidth(),
) {
Text(
text = stringResource(id = android.R.string.ok),
modifier = Modifier.align(Alignment.Center),
)
}
}
}
}
}
}
}

@Preview
@Composable
private fun SettingsDetailLongCardPreview() {
FindroidTheme {
SettingsDetailsLongCard(
preference = PreferenceLong(
nameStringResource = CoreR.string.seek_back_increment,
backendName = Constants.PREF_PLAYER_SEEK_BACK_INC,
backendDefaultValue = DEFAULT_SEEK_BACK_INCREMENT_MS,
value = DEFAULT_SEEK_BACK_INCREMENT_MS,
),
onValueUpdate = {},
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import dev.jdtech.jellyfin.ui.theme.spacings
import dev.jdtech.jellyfin.core.R as CoreR

@Composable
fun SettingsDetailsCard(
fun SettingsDetailsSelectCard(
preference: PreferenceSelect,
modifier: Modifier = Modifier,
onOptionSelected: (String) -> Unit,
Expand Down Expand Up @@ -100,9 +100,9 @@ fun SettingsDetailsCard(

@Preview
@Composable
private fun SettingsDetailCardPreview() {
private fun SettingsDetailsSelectCardPreview() {
FindroidTheme {
SettingsDetailsCard(
SettingsDetailsSelectCard(
preference = PreferenceSelect(
nameStringResource = CoreR.string.settings_preferred_audio_language,
backendName = Constants.PREF_AUDIO_LANGUAGE,
Expand Down
Loading