Skip to content

Add new colors #352

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

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add new colors #352

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
3 changes: 3 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -91,6 +92,7 @@ fun InitScreen(
Text(
text = stringResource(id = R.string.digidoc_all_caps),
style = MaterialTheme.typography.displayLarge,
color = Color.White,
modifier =
modifier
.padding(bottom = LPadding)
Expand All @@ -110,6 +112,7 @@ fun InitScreen(
Text(
text = stringResource(id = R.string.ria),
style = MaterialTheme.typography.displaySmall,
color = Color.White,
modifier =
modifier
.padding(bottom = MPadding)
Expand Down
10 changes: 4 additions & 6 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/crypto/ColoredRecipientStatusText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ package ee.ria.DigiDoc.ui.component.crypto
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import ee.ria.DigiDoc.ui.component.shared.TagBadge
import ee.ria.DigiDoc.ui.theme.Green_2_50
import ee.ria.DigiDoc.ui.theme.Green_2_700
import ee.ria.DigiDoc.ui.theme.Red50
import ee.ria.DigiDoc.ui.theme.Red800
import ee.ria.DigiDoc.ui.theme.extendedColorScheme

@OptIn(ExperimentalLayoutApi::class)
@Composable
Expand All @@ -40,8 +38,8 @@ fun ColoredRecipientStatusText(
modifier: Modifier = Modifier,
expired: Boolean = false,
) {
val tagBackgroundColor = if (!expired) Green_2_50 else Red50
val tagContentColor = if (!expired) Green_2_700 else Red800
val tagBackgroundColor = if (!expired) MaterialTheme.extendedColorScheme.successContainer else MaterialTheme.colorScheme.errorContainer
val tagContentColor = if (!expired) MaterialTheme.extendedColorScheme.onSuccessContainer else MaterialTheme.colorScheme.onErrorContainer

FlowRow(
modifier = modifier,
Expand Down
52 changes: 15 additions & 37 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/home/ActionButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.Card
Expand All @@ -62,11 +60,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.constraintlayout.compose.ConstraintLayout
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.component.shared.MiddleEllipsizeMultilineText
import ee.ria.DigiDoc.ui.theme.Dimensions.MSCornerRadius
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.buttonShadowElevation
import ee.ria.DigiDoc.ui.theme.Dimensions.XXSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeXXS
import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.ui.theme.buttonRoundedCornerShape

Expand All @@ -83,35 +79,18 @@ fun ActionButton(
) {
val titleText = stringResource(id = title)

Box(
modifier =
modifier
.fillMaxWidth()
.padding(vertical = XSPadding),
contentAlignment = Alignment.Center,
Card(
shape = buttonRoundedCornerShape,
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
),
elevation =
CardDefaults.elevatedCardElevation(
defaultElevation = XXSPadding,
),
modifier = modifier.fillMaxWidth().padding(vertical = XSPadding),
) {
Box(
modifier =
modifier
.matchParentSize()
.offset(y = buttonShadowElevation)
.background(
color = MaterialTheme.colorScheme.primaryContainer,
shape = RoundedCornerShape(MSCornerRadius),
),
)
Card(
shape = buttonRoundedCornerShape,
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
),
elevation =
CardDefaults.elevatedCardElevation(
defaultElevation = buttonShadowElevation,
),
modifier = modifier.padding(bottom = zeroPadding),
) {
Button(
modifier =
modifier
Expand Down Expand Up @@ -157,7 +136,7 @@ fun ActionButton(
Modifier
.wrapContentHeight()
.background(
color = MaterialTheme.colorScheme.primaryContainer,
color = MaterialTheme.colorScheme.primary,
shape = CircleShape,
),
) {
Expand Down Expand Up @@ -189,7 +168,7 @@ fun ActionButton(
text = titleText,
modifier =
modifier
.padding(bottom = XSPadding / 2)
.padding(start = XXSPadding, bottom = XSPadding / 2)
.wrapContentHeight(align = Alignment.CenterVertically)
.semantics {
this.contentDescription = contentDescription
Expand All @@ -201,7 +180,7 @@ fun ActionButton(
MiddleEllipsizeMultilineText(
modifier =
modifier
.padding(zeroPadding)
.padding(horizontal = XXSPadding)
.wrapContentHeight(align = Alignment.CenterVertically)
.focusable(false)
.semantics {
Expand All @@ -215,7 +194,6 @@ fun ActionButton(
}
}
}
}
}
}

Expand Down
9 changes: 3 additions & 6 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
Expand All @@ -57,7 +57,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeXXS
import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding
import ee.ria.DigiDoc.ui.theme.OnPrimary
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme

@OptIn(ExperimentalComposeUiApi::class)
Expand All @@ -82,11 +81,9 @@ fun LanguageButton(
shape = RectangleShape,
onClick = onClickItem,
colors =
ButtonColors(
ButtonDefaults.buttonColors(
containerColor = Color.Transparent,
contentColor = OnPrimary,
disabledContainerColor = Color.Transparent,
disabledContentColor = Color.Transparent,
contentColor = Color.White
),
contentPadding =
PaddingValues(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/MyEidScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,4 +670,4 @@ fun MyEidScreen(
)
}

fun getAlphaForBlockedState(isBlocked: Boolean) = if (!isBlocked) 1f else 0.7f
fun getAlphaForBlockedState(isBlocked: Boolean) = if (!isBlocked) 1f else 0.8f
13 changes: 5 additions & 8 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/mydata/MyEidMyDataItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ import androidx.compose.ui.tooling.preview.Preview
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.component.shared.TagBadge
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Green_2_50
import ee.ria.DigiDoc.ui.theme.Green_2_700
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.ui.theme.Red50
import ee.ria.DigiDoc.ui.theme.Red500
import ee.ria.DigiDoc.ui.theme.extendedColorScheme
import ee.ria.DigiDoc.utils.extensions.notAccessible

@OptIn(ExperimentalComposeUiApi::class)
Expand Down Expand Up @@ -130,15 +127,15 @@ fun MyEidMyDataItem(
text = status.getLocalized(context),
backgroundColor =
if (status == MyEidDocumentStatus.VALID) {
Green_2_50
MaterialTheme.extendedColorScheme.successContainer
} else {
Red500
MaterialTheme.colorScheme.errorContainer
},
contentColor =
if (status == MyEidDocumentStatus.VALID) {
Green_2_700
MaterialTheme.extendedColorScheme.onSuccessContainer
} else {
Red50
MaterialTheme.colorScheme.onErrorContainer
},
)
}
Expand Down
11 changes: 2 additions & 9 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/PrimaryButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -85,23 +85,16 @@ fun PrimaryButton(
contentPadding = PaddingValues(zeroPadding),
enabled = enabled,
colors =
ButtonColors(
ButtonDefaults.buttonColors(
containerColor = containerColor,
contentColor = contentColor,
disabledContainerColor = MaterialTheme.colorScheme.background,
disabledContentColor = MaterialTheme.colorScheme.tertiary,
),
border =
if (isSubButton) {
BorderStroke(
width = SBorder,
color = contentColor,
)
} else if (!enabled) {
BorderStroke(
width = SBorder,
color = MaterialTheme.colorScheme.tertiary,
)
} else {
BorderStroke(noBorderStroke, Transparent)
},
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/PrimaryOutlinedButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
Expand Down Expand Up @@ -91,11 +91,9 @@ fun PrimaryOutlinedButton(
contentPadding = PaddingValues(zeroPadding),
enabled = enabled,
colors =
ButtonColors(
ButtonDefaults.buttonColors(
containerColor = containerColor,
contentColor = contentColor,
disabledContainerColor = MaterialTheme.colorScheme.background,
disabledContentColor = MaterialTheme.colorScheme.tertiary,
),
onClick = onClickItem,
) {
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/TagBadge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,15 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Green_2_50
import ee.ria.DigiDoc.ui.theme.Green_2_700
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.ui.theme.extendedColorScheme

@Composable
fun TagBadge(
text: String,
modifier: Modifier = Modifier,
backgroundColor: Color = Green_2_50,
contentColor: Color = Green_2_700,
backgroundColor: Color = MaterialTheme.extendedColorScheme.successContainer,
contentColor: Color = MaterialTheme.extendedColorScheme.onSuccessContainer,
) {
Box(
modifier =
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/TopBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.focusTarget
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalContext
Expand All @@ -65,7 +64,6 @@ import androidx.core.net.toUri
import androidx.lifecycle.asFlow
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeXXS
import ee.ria.DigiDoc.ui.theme.Red500
import ee.ria.DigiDoc.utilsLib.text.TextUtil
import ee.ria.DigiDoc.viewmodel.shared.SharedMenuViewModel
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -212,8 +210,8 @@ fun TopBar(
badge = {
if (extraButtonItemCount > 0) {
Badge(
containerColor = Red500,
contentColor = Color.White,
containerColor = MaterialTheme.colorScheme.error,
contentColor = MaterialTheme.colorScheme.onError,
) {
Text("$extraButtonItemCount")
}
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/VerticalButtonColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -41,8 +42,8 @@ data class VerticalButtonConfig(
val contentDescription: String = "",
val isEnabled: Boolean = true,
val isSubButton: Boolean = true,
val containerColor: Color = Color.White,
val contentColor: Color = Color.Blue,
val containerColor: Color,
val contentColor: Color,
val onClick: () -> Unit = {},
val testTag: String = "",
)
Expand Down Expand Up @@ -85,9 +86,13 @@ fun VerticalButtonColumnPreview() {
listOf(
VerticalButtonConfig(
title = R.string.ok_button,
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
),
VerticalButtonConfig(
title = R.string.cancel_button,
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
),
),
)
Expand Down
11 changes: 4 additions & 7 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/ColoredSignedStatusText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import ee.ria.DigiDoc.libdigidoclib.domain.model.ValidatorInterface
import ee.ria.DigiDoc.ui.component.shared.TagBadge
import ee.ria.DigiDoc.ui.theme.Green_2_50
import ee.ria.DigiDoc.ui.theme.Green_2_700
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.ui.theme.Red50
import ee.ria.DigiDoc.ui.theme.Red800
import ee.ria.DigiDoc.ui.theme.extendedColorScheme

@OptIn(ExperimentalLayoutApi::class)
@Composable
Expand All @@ -54,11 +51,11 @@ fun ColoredSignedStatusText(
status == ValidatorInterface.Status.Warning ||
status == ValidatorInterface.Status.NonQSCD

val tagBackgroundColor = if (isSignatureValidOrWarning) Green_2_50 else Red50
val tagContentColor = if (isSignatureValidOrWarning) Green_2_700 else Red800
val tagBackgroundColor = if (isSignatureValidOrWarning) MaterialTheme.extendedColorScheme.successContainer else MaterialTheme.colorScheme.errorContainer
val tagContentColor = if (isSignatureValidOrWarning) MaterialTheme.extendedColorScheme.onSuccessContainer else MaterialTheme.colorScheme.onErrorContainer
val additionalTextColor =
if (status == ValidatorInterface.Status.Valid) {
Red800
MaterialTheme.extendedColorScheme.onWarningContainer
} else {
MaterialTheme.colorScheme.onErrorContainer
}
Expand Down
Loading
Loading