Skip to content

Fix Monochrome theme read colors #1646

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
jocmp merged 1 commit into from
Jan 2, 2026
Merged

Fix Monochrome theme read colors #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions app/src/main/java/com/capyreader/app/ui/articles/ArticleRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import androidx.compose.material3.ListItem
import androidx.compose.material3.ListItemColors
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MaterialTheme.colorScheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand Down Expand Up @@ -51,12 +50,14 @@ import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import com.capyreader.app.R
import com.capyreader.app.common.ImagePreview
import com.capyreader.app.preferences.AppTheme
import com.capyreader.app.ui.articles.list.ArticleActionMenu
import com.capyreader.app.ui.articles.list.ArticleListItem
import com.capyreader.app.ui.articles.list.ArticleRowSwipeBox
import com.capyreader.app.ui.fixtures.ArticleSample
import com.capyreader.app.ui.fixtures.PreviewKoinApplication
import com.capyreader.app.ui.theme.CapyTheme
import com.capyreader.app.ui.theme.LocalAppTheme
import com.jocmp.capy.Article
import com.jocmp.capy.MarkRead
import com.jocmp.capy.articles.relativeTime
Expand Down Expand Up @@ -85,6 +86,8 @@ fun ArticleRow(
options: ArticleRowOptions = ArticleRowOptions(),
) {
val imageURL = article.imageURL
val isMonochrome = LocalAppTheme.current == AppTheme.MONOCHROME
val deEmphasizeFontWeight = article.read && isMonochrome
val colors = listItemColors(
selected = selected,
read = article.read
Expand All @@ -111,7 +114,7 @@ fun ArticleRow(
article.title,
maxLines = if (options.shortenTitles) 3 else Int.MAX_VALUE,
overflow = TextOverflow.Ellipsis,
fontWeight = FontWeight.Bold,
fontWeight = if (deEmphasizeFontWeight) FontWeight.Light else FontWeight.Bold,
)
}
},
Expand All @@ -129,7 +132,8 @@ fun ArticleRow(
color = feedNameColor,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f)
modifier = Modifier.weight(1f),
fontWeight = if (deEmphasizeFontWeight) FontWeight.Light else null,
)
Spacer(Modifier.width(16.dp))
}
Expand Down Expand Up @@ -163,7 +167,8 @@ fun ArticleRow(
text = article.summary,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
fontWeight = if (deEmphasizeFontWeight) FontWeight.Light else null,
)
}
if (imageURL != null && options.imagePreview == ImagePreview.LARGE) {
ArticleImage(imageURL = imageURL, imagePreview = options.imagePreview)
Expand Down Expand Up @@ -282,20 +287,22 @@ private fun listItemColors(
read: Boolean,
): ListItemColors {
val defaults = ListItemDefaults.colors()
val colorScheme = MaterialTheme.colorScheme
val isMonochrome = LocalAppTheme.current == AppTheme.MONOCHROME
val dimColors = read && !isMonochrome

return ListItemDefaults.colors(
containerColor = if (selected) colorScheme.surfaceVariant else defaults.containerColor,
headlineColor = if (read) defaults.disabledHeadlineColor else defaults.headlineColor,
supportingColor = if (read) defaults.disabledHeadlineColor else defaults.supportingTextColor
headlineColor = if (dimColors) defaults.disabledContentColor else defaults.headlineColor,
supportingColor = if (dimColors) defaults.disabledContentColor else defaults.supportingTextColor
)
}

@Composable
fun findFeedNameColor(read: Boolean): Color {
val defaults = ListItemDefaults.colors()
val isMonochrome = LocalAppTheme.current == AppTheme.MONOCHROME

return if (read) {
return if (read && !isMonochrome) {
defaults.disabledHeadlineColor
} else {
defaults.overlineColor
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/java/com/capyreader/app/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
Expand All @@ -24,6 +26,8 @@ import com.capyreader.app.ui.theme.colorschemes.NewsprintColorScheme
import com.capyreader.app.ui.theme.colorschemes.SunsetColorScheme
import com.capyreader.app.ui.theme.colorschemes.TachiyomiColorScheme

val LocalAppTheme = staticCompositionLocalOf { AppTheme.DEFAULT }

@Composable
fun CapyTheme(
appTheme: AppTheme = AppTheme.DEFAULT,
Expand All @@ -49,10 +53,12 @@ fun CapyTheme(
StatusBarColorListener(colorScheme, themeMode, pureBlack)
}

MaterialTheme(
colorScheme = colorScheme,
content = content,
)
CompositionLocalProvider(LocalAppTheme provides appTheme) {
MaterialTheme(
colorScheme = colorScheme,
content = content,
)
}
}

@Composable
Expand Down