GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2023-09-11 16:57:06 +04:00
parent 42e2ed6309
commit e817699522
17 changed files with 103 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/ui/src/main/java/com/tangem/core/ui/res/IconColorType.kt
View file

@ -4,6 +4,7 @@ import androidx.compose.material.Colors
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import com.tangem.core.ui.res.TangemColorPalette.Amaranth
import com.tangem.core.ui.res.TangemColorPalette.Azure
import com.tangem.core.ui.res.TangemColorPalette.Black
import com.tangem.core.ui.res.TangemColorPalette.Dark1
import com.tangem.core.ui.res.TangemColorPalette.Dark2
@ -11,7 +12,6 @@ import com.tangem.core.ui.res.TangemColorPalette.Dark4
import com.tangem.core.ui.res.TangemColorPalette.Dark6
import com.tangem.core.ui.res.TangemColorPalette.Light4
import com.tangem.core.ui.res.TangemColorPalette.Light5
import com.tangem.core.ui.res.TangemColorPalette.Meadow
import com.tangem.core.ui.res.TangemColorPalette.Tangerine
import com.tangem.core.ui.res.TangemColorPalette.White
@ -22,7 +22,7 @@ enum class IconColorType(val lightColor: Color, val darkColor: Color) {
SECONDARY(lightColor = Dark2, darkColor = Dark1),
INFORMATIVE(lightColor = Light5, darkColor = Dark2),
INACTIVE(lightColor = Light4, darkColor = Dark4),
ACCENT(lightColor = Meadow, darkColor = Meadow),
ACCENT(lightColor = Azure, darkColor = Azure),
WARNING(lightColor = Amaranth, darkColor = Amaranth),
ATTENTION(lightColor = Tangerine, darkColor = Tangerine),
}

8
core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
View file

@ -33,16 +33,16 @@ object TangemColorPalette {
// endregion Green
// region Blue
val Cobalt = Color(0xFF0029FF)
val Azure = Color(0xFF007AFF)
val Azure = Color(0xFF0099FF)
// endregion Blue
// region Red
val Amaranth = Color(0xFFDE1010)
val Flamingo = Color(0xFFED7979)
val Amaranth = Color(0xFFFF3333)
val Flamingo = Color(0xFFFF5B5B)
// endregion Red
// region Yellow
val Tangerine = Color(0xFFFFB71B)
val Mustard = Color(0xFFFDDE55)
// endregion Yellow
}

12
core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
View file

@ -39,9 +39,9 @@ class TangemColors internal constructor(
secondary: Color,
tertiary: Color,
disabled: Color,
accent: Color = TangemColorPalette.Meadow,
warning: Color = TangemColorPalette.Amaranth,
attention: Color = TangemColorPalette.Tangerine,
warning: Color,
attention: Color,
accent: Color = TangemColorPalette.Azure,
constantWhite: Color = TangemColorPalette.White,
) {
var primary1 by mutableStateOf(primary1)
@ -80,9 +80,9 @@ class TangemColors internal constructor(
secondary: Color,
informative: Color,
inactive: Color,
accent: Color = TangemColorPalette.Meadow,
warning: Color = TangemColorPalette.Amaranth,
attention: Color = TangemColorPalette.Tangerine,
warning: Color,
attention: Color,
accent: Color = TangemColorPalette.Azure,
) {
var primary1 by mutableStateOf(primary1)
private set

8
core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
View file

@ -98,6 +98,8 @@ private fun lightThemeColors(): TangemColors {
secondary = TangemColorPalette.Dark2,
tertiary = TangemColorPalette.Dark1,
disabled = TangemColorPalette.Light4,
warning = TangemColorPalette.Amaranth,
attention = TangemColorPalette.Tangerine,
),
icon = TangemColors.Icon(
primary1 = TangemColorPalette.Black,
@ -105,6 +107,8 @@ private fun lightThemeColors(): TangemColors {
secondary = TangemColorPalette.Dark2,
informative = TangemColorPalette.Light5,
inactive = TangemColorPalette.Light4,
warning = TangemColorPalette.Amaranth,
attention = TangemColorPalette.Tangerine,
),
button = TangemColors.Button(
primary = TangemColorPalette.Dark6,
@ -146,6 +150,8 @@ private fun darkThemeColors(): TangemColors {
secondary = TangemColorPalette.Light5,
tertiary = TangemColorPalette.Dark1,
disabled = TangemColorPalette.Dark3,
warning = TangemColorPalette.Flamingo,
attention = TangemColorPalette.Mustard,
),
icon = TangemColors.Icon(
primary1 = TangemColorPalette.White,
@ -153,6 +159,8 @@ private fun darkThemeColors(): TangemColors {
secondary = TangemColorPalette.Dark1,
informative = TangemColorPalette.Dark2,
inactive = TangemColorPalette.Dark4,
warning = TangemColorPalette.Flamingo,
attention = TangemColorPalette.Mustard,
),
button = TangemColors.Button(
primary = TangemColorPalette.Light1,