Fix legacy and m3 theme arrangement for pickers

Ivy-Apps · Sep 23, 2024 · 5c45f05 · 5c45f05
1 parent f65fde2
commit 5c45f05
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/RootActivity.kt b/app/src/main/java/com/ivy/wallet/RootActivity.kt
@@ -31,6 +31,7 @@ import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import com.google.android.play.core.review.ReviewManagerFactory
 import com.ivy.IvyNavGraph
+import com.ivy.base.legacy.Theme
 import com.ivy.base.time.TimeConverter
 import com.ivy.base.time.TimeProvider
 import com.ivy.design.api.IvyUI
@@ -157,7 +158,10 @@ class RootActivity : AppCompatActivity(), RootScreen {
                 }
             }
 
-            dateTimePicker.Content()
+            dateTimePicker.Content(
+                isDark = appDesign(ivyContext).context().theme != Theme.LIGHT && isSystemInDarkTheme,
+                isTrueBlack = appDesign(ivyContext).context().theme == Theme.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
@@ -1,14 +1,15 @@
 package com.ivy.design.system
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import com.ivy.design.system.colors.IvyColors
 
 @Composable
 fun IvyMaterial3Theme(
-    dark: Boolean,
     isTrueBlack: Boolean,
+    dark: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit
 ) {
     MaterialTheme(

diff --git a/shared/ui/core/src/main/java/com/ivy/ui/time/impl/DateTimePicker.kt b/shared/ui/core/src/main/java/com/ivy/ui/time/impl/DateTimePicker.kt
@@ -9,7 +9,7 @@ import java.time.LocalTime
 @Stable
 interface DateTimePicker {
     @Composable
-    fun Content()
+    fun Content(isDark: Boolean, isTrueBlack: Boolean)
 
     fun pickDate(
         initialDate: Instant?,

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
@@ -47,9 +47,10 @@ object UI {
 fun IvyTheme(
     theme: Theme,
     design: IvyDesign,
+    isDarkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit
 ) {
-    val colors = design.colors(theme, isSystemInDarkTheme())
+    val colors = design.colors(theme, isDarkTheme)
     val typography = design.typography()
     val shapes = design.shapes()