Skip to content

Feature/translate settings #1947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tlaster merged 2 commits into from
Apr 1, 2026
Merged

Feature/translate settings #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34990cb
move translate to new settings
Tlaster Mar 31, 2026
885318d
add translate to rss detail
Tlaster Mar 31, 2026
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
3 changes: 3 additions & 0 deletions app/src/main/java/dev/dimension/flare/ui/route/Route.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ internal sealed interface Route : NavKey {
@Serializable
data object AiConfig : Settings

@Serializable
data object TranslationConfig : Settings

@Serializable
data object ColorPicker : Settings

Expand Down
97 changes: 94 additions & 3 deletions app/src/main/java/dev/dimension/flare/ui/screen/rss/RssDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@ import dev.dimension.flare.ui.component.FlareTopAppBar
import dev.dimension.flare.ui.component.RssRichText
import dev.dimension.flare.ui.component.listCard
import dev.dimension.flare.ui.component.placeholder
import dev.dimension.flare.ui.model.UiState
import dev.dimension.flare.ui.model.collectAsUiState
import dev.dimension.flare.ui.model.flatMap
import dev.dimension.flare.ui.model.onError
import dev.dimension.flare.ui.model.onLoading
import dev.dimension.flare.ui.model.onSuccess
import dev.dimension.flare.ui.presenter.home.rss.RssDetailPresenter
import dev.dimension.flare.ui.presenter.home.rss.RssDetailTranslatePresenter
import dev.dimension.flare.ui.presenter.invoke
import dev.dimension.flare.ui.presenter.server.AiTLDRPresenter
import dev.dimension.flare.ui.theme.screenHorizontalPadding
Expand Down Expand Up @@ -139,20 +141,39 @@ internal fun RssDetailScreen(
) {
state.data
.onSuccess {
// Show translated title if available, otherwise original
val displayTitle =
state.translateState?.translatedTitle?.let { titleState ->
when (titleState) {
is UiState.Success -> titleState.data
else -> it.title
}
} ?: it.title
Text(
text = it.title,
text = displayTitle,
style = MaterialTheme.typography.titleLarge,
modifier =
Modifier
.padding(horizontal = screenHorizontalPadding),
)
Row(
verticalAlignment = Alignment.Bottom,
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = screenHorizontalPadding),
) {
Spacer(modifier = Modifier.weight(1f))
// Show translate button only when auto-translate is off
if (!state.isAutoTranslate && !state.enableTranslate) {
FilledTonalButton(
onClick = {
state.setEnableTranslate(true)
},
) {
Text(stringResource(R.string.rss_detail_translate))
}
}
state.enableTldr.onSuccess {
if (it) {
FilledTonalButton(
Expand Down Expand Up @@ -232,18 +253,48 @@ internal fun RssDetailScreen(
}
}
}
// Show translation loading indicator
state.translateState?.translatedHtml?.onLoading {
LinearWavyProgressIndicator(
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = screenHorizontalPadding),
)
}
SelectionContainer(
modifier =
Modifier
.listCard()
.background(MaterialTheme.colorScheme.surface)
.padding(horizontal = screenHorizontalPadding, vertical = 8.dp),
) {
// Use translated content if available by creating a new DocumentData
// whose lazy .element will re-parse the translated HTML
val displayData =
state.translateState?.translatedHtml?.let { htmlState ->
when (htmlState) {
is UiState.Success -> data.copy(content = htmlState.data)
else -> data
}
} ?: data
RssRichText(
element = data.element,
element = displayData.element,
imageHeader = state.headers,
)
}
// Show translation error if any
state.translateState?.translatedHtml?.onError {
Text(
text = stringResource(R.string.rss_detail_translate_error),
color = MaterialTheme.colorScheme.error,
style = MaterialTheme.typography.bodySmall,
modifier =
Modifier
.padding(horizontal = screenHorizontalPadding)
.clickable { state.refreshTranslate() },
)
}
}.onLoading {
Text(
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam elementum eget dui a bibendum. Fusce eget porttitor est, et rhoncus massa. Etiam cursus urna at odio vulputate semper. Interdum et malesuada fames ac ante ipsum primis in faucibus. Quisque tincidunt rhoncus massa sed volutpat. Nulla porta orci et finibus accumsan. Duis maximus diam quis congue suscipit. Suspendisse velit enim, mollis non tellus eu, auctor vulputate diam. Sed ut purus eleifend, tempor lectus ac, imperdiet tellus. Proin eleifend lorem ut risus gravida, id bibendum metus posuere. Cras pretium tortor mi. Quisque ac congue urna. Morbi posuere ac orci vestibulum euismod. Maecenas venenatis, justo at aliquet venenatis, arcu mauris sodales ligula, a iaculis nulla eros at turpis. Quisque varius lobortis porttitor.",
Expand Down Expand Up @@ -279,8 +330,13 @@ private fun presenter(
val enableTldr by remember {
settingsRepository.appSettings.map { it.aiConfig.tldr }
}.collectAsUiState()
val preTranslate by remember {
settingsRepository.appSettings.map { it.translateConfig.preTranslate }
}.collectAsUiState()
var showTldr by remember { mutableStateOf(false) }
var tldrRefreshKey by remember { mutableIntStateOf(0) }
var enableTranslate by remember { mutableStateOf(false) }
var translateRefreshKey by remember { mutableIntStateOf(0) }
val tldrState =
if (showTldr) {
key(tldrRefreshKey, state.data) {
Expand All @@ -294,11 +350,38 @@ private fun presenter(
} else {
null
}
// Determine if translation should be active:
// auto-translate (preTranslate=true) or manually triggered
val isAutoTranslate = preTranslate is UiState.Success && (preTranslate as UiState.Success<Boolean>).data
val shouldTranslate = isAutoTranslate || enableTranslate
val translateState: RssDetailTranslatePresenter.State? =
if (shouldTranslate) {
when (val dataState = state.data) {
is UiState.Success -> {
key(translateRefreshKey) {
remember(dataState.data.content, dataState.data.title) {
RssDetailTranslatePresenter(
htmlContent = dataState.data.content,
title = dataState.data.title,
targetLanguage = Locale.current.toLanguageTag(),
)
}.invoke()
}
}
else -> null
}
} else {
null
}
object : RssDetailPresenter.State by state {
val headers = headers
val enableTldr = enableTldr
val preTranslate = preTranslate
val isAutoTranslate = isAutoTranslate
val tldrState = tldrState
val showTldr = showTldr
val translateState = translateState
val enableTranslate = enableTranslate

fun setShowTldr(value: Boolean) {
showTldr = value
Expand All @@ -307,5 +390,13 @@ private fun presenter(
fun refreshTldr() {
tldrRefreshKey++
}

fun setEnableTranslate(value: Boolean) {
enableTranslate = value
}

fun refreshTranslate() {
translateRefreshKey++
}
}
}
Loading
Loading