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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import coil3.request.crossfade
import coil3.svg.SvgDecoder
import com.google.android.material.color.DynamicColors
import dagger.hilt.android.HiltAndroidApp
import dev.jdtech.jellyfin.network.ProxyOkHttpClientFactory
import dev.jdtech.jellyfin.settings.domain.AppPreferences
import okio.Path.Companion.toOkioPath
import timber.log.Timber
Expand All @@ -28,6 +29,9 @@ class BaseApplication : Application(), Configuration.Provider, SingletonImageLoa
@Inject
lateinit var appPreferences: AppPreferences

@Inject
lateinit var proxyOkHttpClientFactory: ProxyOkHttpClientFactory

@Inject
lateinit var workerFactory: HiltWorkerFactory

Expand Down Expand Up @@ -60,10 +64,14 @@ class BaseApplication : Application(), Configuration.Provider, SingletonImageLoa

@OptIn(ExperimentalCoilApi::class, ExperimentalTime::class)
override fun newImageLoader(context: PlatformContext): ImageLoader {
// Create proxy-configured OkHttpClient for image loading
val okHttpClient = proxyOkHttpClientFactory.createClient()

return ImageLoader.Builder(context)
.components {
add(
OkHttpNetworkFetcherFactory(
callFactory = { okHttpClient },
cacheStrategy = { CacheControlCacheStrategy() },
),
)
Expand Down
4 changes: 4 additions & 0 deletions app/phone/src/main/java/dev/jdtech/jellyfin/NavigationRoot.kt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import dev.jdtech.jellyfin.presentation.setup.welcome.WelcomeScreen
import kotlinx.serialization.Serializable
import java.util.UUID
import dev.jdtech.jellyfin.core.R as CoreR
import dev.jdtech.jellyfin.settings.R as SettingsR

@Serializable
data object WelcomeRoute
Expand Down Expand Up @@ -267,6 +268,9 @@ fun NavigationRoot(
onBackClick = {
navController.safePopBackStack()
},
onProxySettingsClick = {
navController.safeNavigate(SettingsRoute(indexes = intArrayOf(CoreR.string.title_settings, SettingsR.string.settings_category_network)))
},
)
}
composable<ServerAddressesRoute> { backStackEntry ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import dev.jdtech.jellyfin.settings.presentation.models.PreferenceLongInput
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceMultiSelect
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceSelect
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceSwitch
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceTextInput
import dev.jdtech.jellyfin.settings.presentation.settings.SettingsAction
import dev.jdtech.jellyfin.settings.R as SettingsR

Expand Down Expand Up @@ -120,6 +121,18 @@ fun SettingsGroupCard(
modifier = Modifier
.fillMaxWidth(),
)
is PreferenceTextInput -> SettingsTextInputCard(
preference = preference,
onUpdate = { value ->
onAction(
SettingsAction.OnUpdate(
preference.copy(value = value),
),
)
},
modifier = Modifier
.fillMaxWidth(),
)
is PreferenceAppLanguage -> SettingsAppLanguageCard(
preference = preference,
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
package dev.jdtech.jellyfin.presentation.settings.components

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
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.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import dev.jdtech.jellyfin.presentation.theme.FindroidTheme
import dev.jdtech.jellyfin.presentation.theme.spacings
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceTextInput
import dev.jdtech.jellyfin.settings.R as SettingsR
import dev.jdtech.jellyfin.settings.domain.models.Preference as PreferenceBackend

@Composable
fun SettingsTextInputCard(
preference: PreferenceTextInput,
onUpdate: (value: String) -> Unit,
modifier: Modifier = Modifier,
) {
var showDialog by remember {
mutableStateOf(false)
}

val displayValue = if (preference.isPassword && preference.value.isNotEmpty()) {
"••••••••"
} else if (preference.value.isEmpty()) {
preference.hintRes?.let { stringResource(it) } ?: ""
} else {
preference.value
}

SettingsBaseCard(
preference = preference,
onClick = {
showDialog = true
},
modifier = modifier,
) {
Row(
modifier = Modifier.padding(MaterialTheme.spacings.medium),
verticalAlignment = Alignment.CenterVertically,
) {
if (preference.iconDrawableId != null) {
Icon(
painter = painterResource(preference.iconDrawableId!!),
contentDescription = null,
)
Spacer(modifier = Modifier.width(MaterialTheme.spacings.default))
}
Column(
modifier = Modifier.weight(1f),
) {
Text(
text = stringResource(preference.nameStringResource),
style = MaterialTheme.typography.titleMedium,
)
Spacer(modifier = Modifier.height(MaterialTheme.spacings.extraSmall))
Text(
text = displayValue,
style = MaterialTheme.typography.bodyMedium,
color = if (preference.value.isEmpty()) {
MaterialTheme.colorScheme.onSurfaceVariant
} else {
MaterialTheme.colorScheme.onSurface
},
)
}
}
}

if (showDialog) {
SettingsTextInputDialog(
preference = preference,
onUpdate = { value ->
showDialog = false
onUpdate(value)
},
onDismissRequest = {
showDialog = false
},
)
}
}

@Preview
@Composable
private fun SettingsTextInputCardPreview() {
FindroidTheme {
SettingsTextInputCard(
preference = PreferenceTextInput(
nameStringResource = SettingsR.string.settings_proxy_host,
hintRes = SettingsR.string.settings_proxy_host_hint,
backendPreference = PreferenceBackend("", ""),
value = "proxy.example.com",
),
onUpdate = {},
)
}
}

@Preview
@Composable
private fun SettingsTextInputCardPasswordPreview() {
FindroidTheme {
SettingsTextInputCard(
preference = PreferenceTextInput(
nameStringResource = SettingsR.string.settings_proxy_password,
backendPreference = PreferenceBackend("", ""),
isPassword = true,
value = "secret",
),
onUpdate = {},
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
package dev.jdtech.jellyfin.presentation.settings.components

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.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.tooling.preview.Preview
import dev.jdtech.jellyfin.presentation.components.BaseDialog
import dev.jdtech.jellyfin.presentation.theme.FindroidTheme
import dev.jdtech.jellyfin.presentation.theme.spacings
import dev.jdtech.jellyfin.settings.presentation.models.PreferenceTextInput
import dev.jdtech.jellyfin.core.R as CoreR
import dev.jdtech.jellyfin.settings.R as SettingsR
import dev.jdtech.jellyfin.settings.domain.models.Preference as PreferenceBackend

@Composable
fun SettingsTextInputDialog(
preference: PreferenceTextInput,
onUpdate: (value: String) -> Unit,
onDismissRequest: () -> Unit,
) {
var textFieldValue by remember {
mutableStateOf(
TextFieldValue(
text = preference.value,
selection = TextRange(preference.value.length),
),
)
}

var passwordVisible by remember { mutableStateOf(false) }

val focusRequester = remember { FocusRequester() }

LaunchedEffect(true) {
focusRequester.requestFocus()
}

BaseDialog(
title = stringResource(preference.nameStringResource),
onDismiss = onDismissRequest,
negativeButton = {
TextButton(
onClick = onDismissRequest,
) {
Text(
text = stringResource(SettingsR.string.cancel),
)
}
},
positiveButton = {
TextButton(
onClick = { onUpdate(textFieldValue.text) },
) {
Text(
text = stringResource(SettingsR.string.save),
)
}
},
) { contentPadding ->
Column(
modifier = Modifier.padding(contentPadding),
) {
preference.descriptionStringRes?.let {
Text(
text = stringResource(it),
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodyMedium,
)
Spacer(modifier = Modifier.height(MaterialTheme.spacings.medium))
}
OutlinedTextField(
value = textFieldValue,
onValueChange = {
textFieldValue = it
},
modifier = Modifier
.fillMaxWidth()
.focusRequester(focusRequester),
placeholder = {
preference.hintRes?.let {
Text(text = stringResource(it))
}
},
visualTransformation = if (preference.isPassword && !passwordVisible) {
PasswordVisualTransformation()
} else {
VisualTransformation.None
},
trailingIcon = if (preference.isPassword) {
{
IconButton(onClick = { passwordVisible = !passwordVisible }) {
Icon(
painter = painterResource(
if (passwordVisible) CoreR.drawable.ic_eye_off else CoreR.drawable.ic_eye,
),
contentDescription = null,
)
}
}
} else {
null
},
keyboardOptions = KeyboardOptions(
keyboardType = if (preference.isPassword) KeyboardType.Password else KeyboardType.Text,
imeAction = ImeAction.Done,
),
keyboardActions = KeyboardActions(
onDone = {
onUpdate(textFieldValue.text)
},
),
singleLine = true,
)
}
}
}

@Preview
@Composable
private fun SettingsTextInputDialogPreview() {
FindroidTheme {
SettingsTextInputDialog(
preference = PreferenceTextInput(
nameStringResource = SettingsR.string.settings_proxy_host,
hintRes = SettingsR.string.settings_proxy_host_hint,
backendPreference = PreferenceBackend("", ""),
value = "",
),
onUpdate = {},
onDismissRequest = {},
)
}
}

@Preview
@Composable
private fun SettingsTextInputDialogPasswordPreview() {
FindroidTheme {
SettingsTextInputDialog(
preference = PreferenceTextInput(
nameStringResource = SettingsR.string.settings_proxy_password,
backendPreference = PreferenceBackend("", ""),
isPassword = true,
value = "secret",
),
onUpdate = {},
onDismissRequest = {},
)
}
}
Loading