Fixed Issue #602:Add auto dark theme

Ivy-Apps · Mar 26, 2022 · 83d50db · 83d50db
1 parent 5b89814
commit 83d50db
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/home/HomeMoreMenu.kt b/app/src/main/java/com/ivy/wallet/ui/home/HomeMoreMenu.kt
@@ -404,18 +404,22 @@ 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.AUTO -> R.drawable.home_more_menu_auto_mode
             },
             label = when (theme) {
                 Theme.LIGHT -> "Light mode"
                 Theme.DARK -> "Dark mode"
+                Theme.AUTO -> "Auto mode"
             },
             backgroundColor = when (theme) {
                 Theme.LIGHT -> UI.colors.pure
                 Theme.DARK -> UI.colors.pureInverse
+                Theme.AUTO -> UI.colors.pure
             },
             tint = when (theme) {
                 Theme.LIGHT -> UI.colors.pureInverse
                 Theme.DARK -> UI.colors.pure
+                Theme.AUTO -> UI.colors.pureInverse
             }
         ) {
             onSwitchTheme()

diff --git a/app/src/main/java/com/ivy/wallet/ui/home/HomeViewModel.kt b/app/src/main/java/com/ivy/wallet/ui/home/HomeViewModel.kt
@@ -241,7 +241,8 @@ class HomeViewModel @Inject constructor(
                 val newSettings = currentSettings.copy(
                     theme = when (currentSettings.theme) {
                         Theme.LIGHT -> Theme.DARK
-                        Theme.DARK -> Theme.LIGHT
+                        Theme.DARK -> Theme.AUTO
+                        Theme.AUTO -> Theme.LIGHT
                     }
                 )
                 settingsDao.save(newSettings)

diff --git a/ivy-design/src/main/java/com/ivy/design/api/IvyDesign.kt b/ivy-design/src/main/java/com/ivy/design/api/IvyDesign.kt
@@ -11,7 +11,7 @@ interface IvyDesign {
 
     fun typography(): IvyTypography
 
-    fun colors(theme: Theme): IvyColors
+    fun colors(theme: Theme,isDarkModeEnabled: Boolean): IvyColors
 
     fun shapes(): IvyShapes
 }
diff --git a/ivy-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt b/ivy-design/src/main/java/com/ivy/design/api/systems/IvyWalletDesign.kt
@@ -110,7 +110,7 @@ abstract class IvyWalletDesign : IvyDesign {
         }
     }
 
-    override fun colors(theme: Theme): IvyColors {
+    override fun colors(theme: Theme, isDarkModeEnabled: Boolean): IvyColors {
         return when (theme) {
             Theme.LIGHT -> object : IvyColors {
                 override val pure = White
@@ -154,6 +154,7 @@ abstract class IvyWalletDesign : IvyDesign {
 
                 override val isLight = false
             }
+            Theme.AUTO -> if(isDarkModeEnabled) colors(Theme.DARK,true) else colors(Theme.LIGHT,false)
         }
     }
 

diff --git a/ivy-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt b/ivy-design/src/main/java/com/ivy/design/l0_system/IvyTheme.kt
@@ -1,5 +1,6 @@
 package com.ivy.design.l0_system
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Shapes
@@ -38,7 +39,7 @@ fun IvyTheme(
     design: IvyDesign,
     content: @Composable () -> Unit
 ) {
-    val colors = design.colors(theme)
+    val colors = design.colors(theme, isSystemInDarkTheme())
     val typography = design.typography()
     val shapes = design.shapes()
 

diff --git a/ivy-design/src/main/java/com/ivy/design/l0_system/Theme.kt b/ivy-design/src/main/java/com/ivy/design/l0_system/Theme.kt
@@ -1,12 +1,13 @@
 package com.ivy.design.l0_system
 
 enum class Theme {
-    LIGHT, DARK;
+    LIGHT, DARK, AUTO;
 
     fun inverted(): Theme {
         return when (this) {
             LIGHT -> DARK
             DARK -> LIGHT
+            AUTO -> AUTO
         }
     }
 }