diff --git a/screen/home/src/main/java/com/ivy/home/HomeMoreMenu.kt b/screen/home/src/main/java/com/ivy/home/HomeMoreMenu.kt
index 5811048a69..b41d8b7903 100644
--- a/screen/home/src/main/java/com/ivy/home/HomeMoreMenu.kt
+++ b/screen/home/src/main/java/com/ivy/home/HomeMoreMenu.kt
@@ -445,25 +445,25 @@ private fun QuickAccess(
icon = when (theme) {
Theme.LIGHT -> R.drawable.home_more_menu_light_mode
Theme.DARK -> R.drawable.home_more_menu_dark_mode
- Theme.TRUE_BLACK -> R.drawable.home_more_menu_dark_mode
+ Theme.AMOLED_DARK -> R.drawable.home_more_menu_amoled_dark_mode
Theme.AUTO -> R.drawable.home_more_menu_auto_mode
},
label = when (theme) {
Theme.LIGHT -> stringResource(R.string.light_mode)
Theme.DARK -> stringResource(R.string.dark_mode)
- Theme.TRUE_BLACK -> stringResource(R.string.amoled_mode)
+ Theme.AMOLED_DARK -> stringResource(R.string.amoled_mode)
Theme.AUTO -> stringResource(R.string.auto_mode)
},
backgroundColor = when (theme) {
Theme.LIGHT -> UI.colors.pure
Theme.DARK -> UI.colors.pureInverse
- Theme.TRUE_BLACK -> UI.colors.pureInverse
+ Theme.AMOLED_DARK -> UI.colors.pureInverse
Theme.AUTO -> UI.colors.pure
},
tint = when (theme) {
Theme.LIGHT -> UI.colors.pureInverse
Theme.DARK -> UI.colors.pure
- Theme.TRUE_BLACK -> UI.colors.pure
+ Theme.AMOLED_DARK -> UI.colors.pure
Theme.AUTO -> UI.colors.pureInverse
}
) {
diff --git a/screen/settings/src/main/java/com/ivy/settings/SettingsScreen.kt b/screen/settings/src/main/java/com/ivy/settings/SettingsScreen.kt
index 33f673746d..033be64c08 100644
--- a/screen/settings/src/main/java/com/ivy/settings/SettingsScreen.kt
+++ b/screen/settings/src/main/java/com/ivy/settings/SettingsScreen.kt
@@ -281,13 +281,13 @@ private fun BoxWithConstraintsScope.UI(
icon = when (theme) {
Theme.LIGHT -> R.drawable.home_more_menu_light_mode
Theme.DARK -> R.drawable.home_more_menu_dark_mode
- Theme.TRUE_BLACK -> R.drawable.home_more_menu_dark_mode
+ Theme.AMOLED_DARK -> R.drawable.home_more_menu_amoled_dark_mode
Theme.AUTO -> R.drawable.home_more_menu_auto_mode
},
label = when (theme) {
Theme.LIGHT -> stringResource(R.string.light_mode)
Theme.DARK -> stringResource(R.string.dark_mode)
- Theme.TRUE_BLACK -> stringResource(R.string.amoled_mode)
+ Theme.AMOLED_DARK -> stringResource(R.string.amoled_mode)
Theme.AUTO -> stringResource(R.string.auto_mode)
}
) {
diff --git a/shared/base/src/main/java/com/ivy/base/legacy/Theme.kt b/shared/base/src/main/java/com/ivy/base/legacy/Theme.kt
index 21f2b001ea..7dd2780e62 100644
--- a/shared/base/src/main/java/com/ivy/base/legacy/Theme.kt
+++ b/shared/base/src/main/java/com/ivy/base/legacy/Theme.kt
@@ -5,5 +5,5 @@ import androidx.compose.runtime.Immutable
@Deprecated("Old design system. Use `:ivy-design` and Material3")
@Immutable
enum class Theme {
- LIGHT, DARK, AUTO, TRUE_BLACK
+ LIGHT, DARK, AUTO, AMOLED_DARK
}
diff --git a/shared/ui/core/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt b/shared/ui/core/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt
index b9e086f30c..799b456579 100644
--- a/shared/ui/core/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt
+++ b/shared/ui/core/src/main/java/com/ivy/design/system/IvyMaterial3Theme.kt
@@ -72,15 +72,15 @@ private fun ivyDarkColorScheme(isTrueBlack: Boolean): ColorScheme = ColorScheme(
errorContainer = IvyColors.Red.light,
onErrorContainer = IvyColors.White,
- background = if(isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
+ background = if (isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
onBackground = IvyColors.White,
- surface = if(isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
+ surface = if (isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
onSurface = IvyColors.White,
surfaceVariant = IvyColors.ExtraDarkGray,
onSurfaceVariant = IvyColors.White,
surfaceTint = IvyColors.White,
inverseSurface = IvyColors.LightGray,
- inverseOnSurface = if(isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
+ inverseOnSurface = if (isTrueBlack) IvyColors.TrueBlack else IvyColors.Black,
outline = IvyColors.Gray,
outlineVariant = IvyColors.LightGray,
diff --git a/shared/ui/core/src/main/res/drawable/home_more_menu_amoled_dark_mode.xml b/shared/ui/core/src/main/res/drawable/home_more_menu_amoled_dark_mode.xml
new file mode 100644
index 0000000000..f71daa9e24
--- /dev/null
+++ b/shared/ui/core/src/main/res/drawable/home_more_menu_amoled_dark_mode.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/shared/ui/core/src/main/res/values/strings.xml b/shared/ui/core/src/main/res/values/strings.xml
index cb541dda71..4b9184a7e1 100644
--- a/shared/ui/core/src/main/res/values/strings.xml
+++ b/shared/ui/core/src/main/res/values/strings.xml
@@ -103,7 +103,7 @@
Settings
Light mode
Dark mode
- Black mode
+ Amoled Dark mode
Auto mode
Planned\nPayments
Share Ivy
diff --git a/shared/ui/core/src/test/java/com/ivy/ui/PaparazziScreenshotTest.kt b/shared/ui/core/src/test/java/com/ivy/ui/PaparazziScreenshotTest.kt
index 38d20f2a22..a7455d21ab 100644
--- a/shared/ui/core/src/test/java/com/ivy/ui/PaparazziScreenshotTest.kt
+++ b/shared/ui/core/src/test/java/com/ivy/ui/PaparazziScreenshotTest.kt
@@ -20,7 +20,8 @@ open class PaparazziScreenshotTest {
dark = when (theme) {
PaparazziTheme.Light -> false
PaparazziTheme.Dark -> true
- }
+ },
+ isTrueBlack = false
) {
content()
}
diff --git a/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt b/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt
index d89d843239..da9fa8a35d 100644
--- a/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt
+++ b/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt
@@ -28,7 +28,8 @@ open class PaparazziScreenshotTest {
dark = when (theme) {
PaparazziTheme.Light -> false
PaparazziTheme.Dark -> true
- }
+ },
+ isTrueBlack = false
) {
content()
}
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt
index 8286dd0658..fa3484e7b1 100644
--- a/temp/legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt
+++ b/temp/legacy-code/src/main/java/com/ivy/legacy/domain/action/settings/SettingsAct.kt
@@ -19,8 +19,8 @@ class SettingsAct @Inject constructor(
val currentSettings = this(Unit)
val newTheme = when (currentSettings.theme) {
Theme.LIGHT -> Theme.DARK
- Theme.DARK -> Theme.TRUE_BLACK
- Theme.TRUE_BLACK -> Theme.AUTO
+ Theme.DARK -> Theme.AMOLED_DARK
+ Theme.AMOLED_DARK -> Theme.AUTO
Theme.AUTO -> Theme.LIGHT
}
return currentSettings.copy(theme = newTheme)
diff --git a/temp/old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt b/temp/old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt
index 58d94afe5d..43bc175a81 100644
--- a/temp/old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt
+++ b/temp/old-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt
@@ -161,7 +161,7 @@ abstract class IvyWalletDesign : IvyDesign {
override val isLight = false
}
- Theme.TRUE_BLACK -> object : IvyColors {
+ Theme.AMOLED_DARK -> object : IvyColors {
override val pure = TrueBlack
override val pureInverse = White
override val gray = Gray
diff --git a/temp/old-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt b/temp/old-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt
index 98dd28c541..bd392652d5 100644
--- a/temp/old-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt
+++ b/temp/old-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt
@@ -70,7 +70,7 @@ fun IvyTheme(
IvyMaterial3Theme(
dark = !colors.isLight,
- isTrueBlack = theme == Theme.TRUE_BLACK,
+ isTrueBlack = theme == Theme.AMOLED_DARK,
content = content,
)
}