From 2564116341b6ae77db5457fb408401e4fe3f14fa Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 26 Mar 2022 09:39:45 -0500 Subject: [PATCH] Fix banner text buttons --- app/src/main/java/org/tasks/compose/Banner.kt | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/tasks/compose/Banner.kt b/app/src/main/java/org/tasks/compose/Banner.kt index 1d5a308b2..5b1a4252b 100644 --- a/app/src/main/java/org/tasks/compose/Banner.kt +++ b/app/src/main/java/org/tasks/compose/Banner.kt @@ -93,17 +93,13 @@ fun SubscriptionNagBanner( ) }, buttons = { - TextButton(onClick = subscribe) { - Text(text = stringResource(id = R.string.dismiss)) - } - TextButton(onClick = dismiss) { - val res = if (Tasks.IS_GENERIC) { - R.string.TLA_menu_donate - } else { - R.string.button_subscribe - } - Text(text = stringResource(id = res)) + BannerTextButton(text = R.string.dismiss, dismiss) + val res = if (Tasks.IS_GENERIC) { + R.string.TLA_menu_donate + } else { + R.string.button_subscribe } + BannerTextButton(text = res, subscribe) } ) } @@ -131,16 +127,24 @@ fun BeastModeBanner( ) }, buttons = { - TextButton(onClick = dismiss) { - Text(text = stringResource(id = R.string.dismiss)) - } - TextButton(onClick = showSettings) { - Text(text = stringResource(id = R.string.TLA_menu_settings)) - } + BannerTextButton(text = R.string.dismiss, onClick = dismiss) + BannerTextButton(text = R.string.TLA_menu_settings, onClick = showSettings) } ) } +@Composable +fun BannerTextButton(text: Int, onClick: () -> Unit) { + TextButton(onClick = onClick) { + Text( + text = stringResource(id = text), + style = MaterialTheme.typography.button.copy( + color = MaterialTheme.colors.secondary + ), + ) + } +} + @ExperimentalAnimationApi @Preview(showBackground = true) @Preview(showBackground = true, backgroundColor = 0x202124, uiMode = Configuration.UI_MODE_NIGHT_YES)