From cd511e71dfeb38139f69b11f25ba4e2bebf5de79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Thu, 17 Mar 2022 13:11:44 +0100 Subject: [PATCH] Remove Ukraine support motive --- .../android/nrftoolbox/view/FeatureButton.kt | 46 +++++-------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt index 6a5b6769..0dfdbd22 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.nrftoolbox.R +import no.nordicsemi.android.material.you.ScreenSection @Composable fun FeatureButton( @@ -43,39 +43,17 @@ fun FeatureButton( MaterialTheme.colorScheme.secondary } - Box { - if (isRunning == true) { - Image( - painter = painterResource(iconId), - contentDescription = stringResource(id = name), - contentScale = ContentScale.Crop, - colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary), - modifier = Modifier - .size(64.dp) - .clip(CircleShape) - .background(color) - .padding(16.dp) - ) - } else { - Image( - painter = painterResource(R.drawable.ic_ukraine_flag), - contentDescription = stringResource(id = name), - contentScale = ContentScale.Crop, - modifier = Modifier - .size(64.dp) - .clip(CircleShape) - ) - Image( - painter = painterResource(iconId), - contentDescription = stringResource(id = name), - contentScale = ContentScale.Crop, - colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary), - modifier = Modifier - .size(64.dp) - .padding(16.dp) - ) - } - } + Image( + painter = painterResource(iconId), + contentDescription = stringResource(id = name), + contentScale = ContentScale.Crop, + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondary), + modifier = Modifier + .size(64.dp) + .clip(CircleShape) + .background(color) + .padding(16.dp) + ) Spacer(modifier = Modifier.size(16.dp))