From 09be3be3a555a1cfc8f5389d46f7cb0c16ad49a2 Mon Sep 17 00:00:00 2001 From: Jos Vooges | STH Date: Mon, 31 Aug 2026 01:32:09 +0200 Subject: [PATCH] Fix McButton parameter order for Compose trailing lambdas. --- .../java/nl/vonas/mediacluster/tv/ui/McNav.kt | 16 ++++++++-------- .../mediacluster/tv/ui/components/Components.kt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/McNav.kt b/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/McNav.kt index 36af7ba..7f67bc9 100644 --- a/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/McNav.kt +++ b/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/McNav.kt @@ -418,11 +418,11 @@ private fun HeroHeader( } Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { if (hero != null) { - McButton(if ((hero.positionMs) > 30_000) "Verder kijken" else "Afspelen", onPlayHero, primary = true) - McButton("Details", onOpenHero) + McButton(if ((hero.positionMs) > 30_000) "Verder kijken" else "Afspelen", primary = true, onClick = onPlayHero) + McButton("Details", onClick = onOpenHero) } - McButton("Planken", onSettings) - McButton("Uitloggen", onLogout) + McButton("Planken", onClick = onSettings) + McButton("Uitloggen", onClick = onLogout) } } } @@ -497,7 +497,7 @@ private fun MovieDetailScreen( .padding(40.dp), verticalArrangement = Arrangement.spacedBy(14.dp), ) { - McButton("Terug", onBack) + McButton("Terug", onClick = onBack) Spacer(Modifier.height(8.dp)) Text(title, color = McColors.Text, fontSize = 36.sp, fontWeight = FontWeight.Bold, maxLines = 3) if (year != null) Text(year.toString(), color = McColors.TextDim, fontSize = 16.sp) @@ -506,7 +506,7 @@ private fun MovieDetailScreen( Spacer(Modifier.height(8.dp)) Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { files.firstOrNull()?.let { (id, _) -> - McButton("Afspelen", { onPlay(id, title, 0) }, primary = true) + McButton("Afspelen", primary = true) { onPlay(id, title, 0) } } McButton("Als gekeken") { scope.launch { @@ -576,7 +576,7 @@ private fun SeriesDetailScreen( verticalArrangement = Arrangement.spacedBy(10.dp), ) { item { - McButton("Terug", onBack) + McButton("Terug", onClick = onBack) Spacer(Modifier.height(12.dp)) Text(title, color = McColors.Text, fontSize = 34.sp, fontWeight = FontWeight.Bold) Spacer(Modifier.height(6.dp)) @@ -623,7 +623,7 @@ private fun SettingsScreen(api: ApiClient, onBack: () -> Unit) { verticalArrangement = Arrangement.spacedBy(12.dp), ) { item { - McButton("Terug", onBack) + McButton("Terug", onClick = onBack) Spacer(Modifier.height(12.dp)) Text("Planken", color = McColors.Text, fontSize = 30.sp, fontWeight = FontWeight.Bold) Text("Kies wat je op home ziet en in welke volgorde.", color = McColors.TextDim, fontSize = 15.sp) diff --git a/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/components/Components.kt b/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/components/Components.kt index 58af783..6dd286d 100644 --- a/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/components/Components.kt +++ b/apps/android-tv/app/src/main/java/nl/vonas/mediacluster/tv/ui/components/Components.kt @@ -34,9 +34,9 @@ import nl.vonas.mediacluster.tv.ui.theme.McColors @Composable fun McButton( label: String, - onClick: () -> Unit, modifier: Modifier = Modifier, primary: Boolean = false, + onClick: () -> Unit, ) { Surface( onClick = onClick,